diff --git a/lib/mesh/regular_grid.cpp b/lib/mesh/regular_grid.cpp index c9bbc97..d482a53 100644 --- a/lib/mesh/regular_grid.cpp +++ b/lib/mesh/regular_grid.cpp @@ -192,6 +192,7 @@ int gctl::regular_grid::view(std::string datname) { meshdata &data = get_data(datname); + mathgl_dens plt; ///< mathgl绘图对象 plt.range(rg_xmin, rg_xmin + (rg_xnum - 1)*rg_dx, rg_ymin, rg_ymin + (rg_ynum - 1)*rg_dy); plt.demension(rg_xnum, rg_ynum); plt.add_dens(data.datval_, datname); @@ -211,8 +212,9 @@ int gctl::regular_grid::view(std::string datname) void gctl::regular_grid::plot(std::string datname) { - meshdata data = get_data(datname); + meshdata &data = get_data(datname); + gmt_JX_single pic; pic.set_command("psconvert", "-A -TG -E300"); pic.plot(datname, data.datval_, rg_xmin, rg_xmin + (rg_xnum - 1)*rg_dx, @@ -329,7 +331,7 @@ void gctl::regular_grid::load_netcdf_grid(std::string filename, mesh_data_type_e new_data.create(NodeData, Scalar, node_num_, in_name[i], true, GCTL_BDL_MAX); for (size_t j = 0; j < node_num_; j++) { - new_data.datval_[i] = in_arr[i][j]; + new_data.datval_[j] = in_arr[i][j]; } datalist_.push_back(new_data); @@ -348,7 +350,7 @@ void gctl::regular_grid::load_netcdf_grid(std::string filename, mesh_data_type_e new_data.create(ElemData, Scalar, ele_num_, in_name[i], true, GCTL_BDL_MAX); for (size_t j = 0; j < ele_num_; j++) { - new_data.datval_[i] = in_arr[i][j]; + new_data.datval_[j] = in_arr[i][j]; } datalist_.push_back(new_data); diff --git a/lib/mesh/regular_grid.h b/lib/mesh/regular_grid.h index b575609..4885950 100644 --- a/lib/mesh/regular_grid.h +++ b/lib/mesh/regular_grid.h @@ -342,14 +342,6 @@ namespace gctl double rg_xmin, rg_ymin; ///< 规则网格的x方向最小值和y方向最小值 double rg_dx, rg_dy; ///< 规则网格的x方向单元长度和y方向单元长度 -#ifdef GCTL_GRAPHIC_MATHGL - mathgl_dens plt; ///< mathgl绘图对象 -#endif // GCTL_GRAPHIC_MATHGL - -#ifdef GCTL_GRAPHIC_GMT - gmt_JX_single pic; ///< gmt绘图对象 -#endif // GCTL_GRAPHIC_GMT - array nodes; ///< 规则网格的节点数组 array elements; ///< 规则网格的单元数组 };