From bad10fb6f4cae1a77ddd37d22cdc00ed50897c0b Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Sun, 12 Jan 2025 23:39:36 +0800 Subject: [PATCH 01/14] redesigned meshdata and mesh --- backup/mesh.cpp | 864 ++++++++++++++++++++ backup/mesh.h | 579 +++++++++++++ backup/meshdata.cpp | 94 +++ backup/meshdata.h | 158 ++++ {lib/mesh => backup}/meshdata_scalar.cpp | 0 {lib/mesh => backup}/meshdata_scalar.h | 0 {lib/mesh => backup}/meshdata_tensor.cpp | 0 {lib/mesh => backup}/meshdata_tensor.h | 0 {lib/mesh => backup}/meshdata_vector.cpp | 0 {lib/mesh => backup}/meshdata_vector.h | 0 example/CMakeLists.txt | 2 +- example/mesh_ex1.cpp | 28 +- example/mesh_ex10.cpp | 4 +- example/mesh_ex2.cpp | 17 +- example/mesh_ex3.cpp | 94 +-- example/mesh_ex4.cpp | 51 +- example/mesh_ex5.cpp | 21 +- example/mesh_ex6.cpp | 62 +- example/mesh_ex7.cpp | 42 +- example/mesh_ex8.cpp | 29 +- example/mesh_ex9.cpp | 62 +- lib/mesh/linear_mesh_2d.cpp | 114 +-- lib/mesh/linear_mesh_2d.h | 6 +- lib/mesh/linear_mesh_3d.cpp | 146 ++-- lib/mesh/linear_mesh_3d.h | 7 +- lib/mesh/mesh.cpp | 994 ++++++++--------------- lib/mesh/mesh.h | 450 +++------- lib/mesh/meshdata.cpp | 249 ++++-- lib/mesh/meshdata.h | 134 ++- lib/mesh/regular_grid.cpp | 582 ++++++------- lib/mesh/regular_grid.h | 2 +- lib/mesh/regular_mesh_2d.cpp | 90 +- lib/mesh/regular_mesh_2d.h | 4 +- lib/mesh/regular_mesh_3d.cpp | 109 +-- lib/mesh/regular_mesh_3d.h | 4 +- lib/mesh/regular_mesh_sph_3d.cpp | 108 +-- lib/mesh/regular_mesh_sph_3d.h | 4 +- lib/mesh/tet_mesh.cpp | 91 +-- lib/mesh/tet_mesh.h | 4 +- lib/mesh/tri_mesh.cpp | 92 +-- lib/mesh/tri_mesh.h | 4 +- tool/gridmanager/gridmanager.cpp | 26 +- 42 files changed, 3204 insertions(+), 2123 deletions(-) create mode 100644 backup/mesh.cpp create mode 100644 backup/mesh.h create mode 100644 backup/meshdata.cpp create mode 100644 backup/meshdata.h rename {lib/mesh => backup}/meshdata_scalar.cpp (100%) rename {lib/mesh => backup}/meshdata_scalar.h (100%) rename {lib/mesh => backup}/meshdata_tensor.cpp (100%) rename {lib/mesh => backup}/meshdata_tensor.h (100%) rename {lib/mesh => backup}/meshdata_vector.cpp (100%) rename {lib/mesh => backup}/meshdata_vector.h (100%) diff --git a/backup/mesh.cpp b/backup/mesh.cpp new file mode 100644 index 0000000..4b98173 --- /dev/null +++ b/backup/mesh.cpp @@ -0,0 +1,864 @@ +/******************************************************** + * ██████╗ ██████╗████████╗██╗ + * ██╔════╝ ██╔════╝╚══██╔══╝██║ + * ██║ ███╗██║ ██║ ██║ + * ██║ ██║██║ ██║ ██║ + * ╚██████╔╝╚██████╗ ██║ ███████╗ + * ╚═════╝ ╚═════╝ ╚═╝ ╚══════╝ + * Geophysical Computational Tools & Library (GCTL) + * + * Copyright (c) 2023 Yi Zhang (yizhang-geo@zju.edu.cn) + * + * GCTL is distributed under a dual licensing scheme. You can redistribute + * it and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation, either version 2 + * of the License, or (at your option) any later version. You should have + * received a copy of the GNU Lesser General Public License along with this + * program. If not, see . + * + * If the terms and conditions of the LGPL v.2. would prevent you from using + * the GCTL, please consider the option to obtain a commercial license for a + * fee. These licenses are offered by the GCTL's original author. As a rule, + * licenses are provided "as-is", unlimited in time for a one time fee. Please + * send corresponding requests to: yizhang-geo@zju.edu.cn. Please do not forget + * to include some description of your company and the realm of its activities. + * Also add information on how to contact you by electronic and paper mail. + ******************************************************/ + +#include "mesh.h" + +gctl::base_mesh::base_mesh() +{ + initialized = false; + //std::clog << "A new mesh object is created." << std::endl; +} + +gctl::base_mesh::~base_mesh() +{ + clear(); + //std::clog << "A mesh object is destroyed." << std::endl; +} + +void gctl::base_mesh::clear() +{ + meshdata *data_ptr; + if (!saved_data.empty()) + { + for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) + { + data_ptr = *iter; + meshdata::destroy(data_ptr); + } + saved_data.clear(); + } + + initialized = false; + return; +} + +bool gctl::base_mesh::initiated() const +{ + return initialized; +} + +bool gctl::base_mesh::saved(std::string datname) const +{ + if (saved_data.empty()) + { + return false; + } + else + { + meshdata *data_ptr = nullptr; + // 这里我们需要使用常量迭代器 + std::list::const_iterator c_iter; + for (c_iter = saved_data.begin(); c_iter != saved_data.end(); ++c_iter) + { + data_ptr = *c_iter; + if (data_ptr->get_datname() == datname) + { + return true; + } + } + return false; + } +} + +gctl::meshdata *gctl::base_mesh::get_data(std::string datname) const +{ + if (saved_data.empty()) + { + throw std::runtime_error("[gctl::base_mesh] No data saved."); + } + + meshdata *curr_data = nullptr; + std::list::const_iterator c_iter; + for (c_iter = saved_data.begin(); c_iter != saved_data.end(); ++c_iter) + { + curr_data = *c_iter; + if (curr_data->get_datname() == datname) + { + return curr_data; + } + } + + throw gctl::runtime_error("[gctl::base_mesh] No data found by the name: " + datname); +} + +void gctl::base_mesh::get_all_data(array& out_list) const +{ + if (saved_data.empty()) + { + throw runtime_error("[gctl::base_mesh] No data saved."); + } + + int c_count = 0; + out_list.resize(saved_data.size()); + + meshdata *curr_data = nullptr; + std::list::const_iterator c_iter; + for (c_iter = saved_data.begin(); c_iter != saved_data.end(); ++c_iter) + { + curr_data = *c_iter; + out_list[c_count] = curr_data; + c_count++; + } + return; +} + +void *gctl::base_mesh::get_datval(std::string datname) const +{ + meshdata *curr_data = get_data(datname); + return curr_data->get_datval_ptr(); +} + +void gctl::base_mesh::remove_data(std::string datname) +{ + if (saved_data.empty()) + { + throw runtime_error("[gctl::base_mesh] No data saved."); + } + + meshdata *curr_data; + for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) + { + curr_data = *iter; + if (curr_data->get_datname() == datname) + { + meshdata::destroy(curr_data); + iter = saved_data.erase(iter); + //std::clog << "Meshdata: " << datname << " is destroyed." << std::endl; + break; + } + } + return; +} + +void gctl::base_mesh::show_info(std::ostream &os) const +{ + if (meshtype == REGULAR_MESH) os << "Mesh: Regular | "; + if (meshtype == LINEAR_MESH) os << "Mesh: Linear | "; + if (meshtype == TRI_TET_MESH) os << "Mesh: Unstructured | "; + if (meshtype == REGULAR_MESH_SPH) os << "Mesh: Regular (spherical) | "; + if (meshtype == LINEAR_MESH_SPH) os << "Mesh: Linear (spherical) | "; + if (meshtype == TRI_TET_MESH_SPH) os << "Mesh: Unstructured (spherical) | "; + if (meshtype == REGULAR_GRID) os << "Mesh: Grid | "; + + if (meshdim == MESH_2D) os << "2D" << std::endl; + else if (meshdim == MESH_3D) os << "3D" << std::endl; + + os << "Name: " << meshname << std::endl; + os << "Info: " << meshinfo << std::endl; + + show_mesh_dimension(os); + + meshdata *curr_data; + std::list::const_iterator c_iter; + for (c_iter = saved_data.begin(); c_iter != saved_data.end(); ++c_iter) + { + curr_data = *c_iter; + curr_data->show_info(); + } + return; +} + +void gctl::base_mesh::rename_data(std::string oldname, std::string newname) +{ + meshdata *curr_data = get_data(oldname); + curr_data->set_datname(newname); + return; +} + +gctl::mesh_type_e gctl::base_mesh::get_meshtype() const +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + return meshtype; +} + +gctl::mesh_dim_e gctl::base_mesh::get_meshdim() const +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + return meshdim; +} + +int gctl::base_mesh::get_nodenum() const +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + return node_num; +} + +int gctl::base_mesh::get_elenum() const +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + return ele_num; +} + +int gctl::base_mesh::get_datanum() const +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + return saved_data.size(); +} + +std::string gctl::base_mesh::get_meshname() const +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + return meshname; +} + +void gctl::base_mesh::set_meshname(std::string in_name) +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + if (in_name.empty()) + { + throw std::runtime_error("[gctl::base_mesh] The input name is empty."); + } + + meshname = in_name; + return; +} + +std::string gctl::base_mesh::get_meshinfo() const +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + return meshinfo; +} + +void gctl::base_mesh::set_meshinfo(std::string in_info) +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + if (in_info == "") + { + throw runtime_error("[gctl::base_mesh] The input info. is empty."); + } + + meshinfo = in_info; + return; +} + +gctl::meshdata *gctl::base_mesh::add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, double init_val) +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + meshdata *data_ptr; + if(saved(in_name)) + { + data_ptr = get_data(in_name); + if (data_ptr->get_valtype() != Scalar || data_ptr->get_dattype() != in_type) + { + throw gctl::runtime_error("[gctl::base_mesh] A data object is already created with a different data or value type by the name:" + in_name); + } + + // 存在一个同名 同数据类型 同赋值类型的数据 则将其数据设置为初始值 + array* val_ptr = (array*) data_ptr->get_datval_ptr(); + val_ptr->assign_all(init_val); + return data_ptr; + } + + if (in_type == NodeData) + { + data_ptr = meshdata_scalar::create(in_name, in_type, node_num, if_output, init_val); + } + else if (in_type == ElemData || in_type == ElemData2D || in_type == ElemData3D) + { + data_ptr = meshdata_scalar::create(in_name, in_type, ele_num, if_output, init_val); + } + + saved_data.push_back(data_ptr); + return data_ptr; +} + +gctl::meshdata *gctl::base_mesh::add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, gctl::point3dc init_val) +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + meshdata *data_ptr; + if(saved(in_name)) + { + data_ptr = get_data(in_name); + if (data_ptr->get_valtype() != Scalar || data_ptr->get_dattype() != in_type) + { + throw gctl::runtime_error("[gctl::base_mesh] A data object is already created with a different data or value type by the name:" + in_name); + } + + // 存在一个同名 同数据类型 同赋值类型的数据 则将其数据设置为初始值 + array* val_ptr = (array*) data_ptr->get_datval_ptr(); + val_ptr->assign_all(init_val); + return data_ptr; + } + + if (in_type == NodeData) + { + data_ptr = meshdata_vector::create(in_name, in_type, node_num, if_output, init_val); + } + else if (in_type == ElemData || in_type == ElemData2D || in_type == ElemData3D) + { + data_ptr = meshdata_vector::create(in_name, in_type, ele_num, if_output, init_val); + } + + saved_data.push_back(data_ptr); + return data_ptr; +} + +gctl::meshdata *gctl::base_mesh::add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, gctl::tensor init_val) +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + meshdata *data_ptr; + if(saved(in_name)) + { + data_ptr = get_data(in_name); + if (data_ptr->get_valtype() != Scalar || data_ptr->get_dattype() != in_type) + { + throw gctl::runtime_error("[gctl::base_mesh] A data object is already created with a different data or value type by the name:" + in_name); + } + + // 存在一个同名 同数据类型 同赋值类型的数据 则将其数据设置为初始值 + array* val_ptr = (array*) data_ptr->get_datval_ptr(); + val_ptr->assign_all(init_val); + return data_ptr; + } + + if (in_type == NodeData) + { + data_ptr = meshdata_tensor::create(in_name, in_type, node_num, if_output, init_val); + } + else if (in_type == ElemData || in_type == ElemData2D || in_type == ElemData3D) + { + data_ptr = meshdata_tensor::create(in_name, in_type, ele_num, if_output, init_val); + } + + saved_data.push_back(data_ptr); + return data_ptr; +} + +gctl::meshdata *gctl::base_mesh::add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, mesh_data_value_e val_type) +{ + if (!initialized) + { + throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + } + + meshdata *data_ptr; + if(saved(in_name)) + { + data_ptr = get_data(in_name); + if (data_ptr->get_valtype() != Scalar || data_ptr->get_dattype() != in_type) + { + throw gctl::runtime_error("[gctl::base_mesh] A data object is already created with a different data or value type by the name:" + in_name); + } + + return data_ptr; + } + + if (val_type == Scalar && in_type == NodeData) + { + data_ptr = meshdata_scalar::create(in_name, in_type, node_num, if_output, 0.0); + } + else if (val_type == Scalar && in_type == ElemData) + { + data_ptr = meshdata_scalar::create(in_name, in_type, ele_num, if_output, 0.0); + } + else if (val_type == Vector && in_type == NodeData) + { + point3dc init_val = {0.0, 0.0, 0.0}; + data_ptr = meshdata_vector::create(in_name, in_type, node_num, if_output, init_val); + } + else if (val_type == Vector && in_type == ElemData) + { + point3dc init_val = {0.0, 0.0, 0.0}; + data_ptr = meshdata_vector::create(in_name, in_type, ele_num, if_output, init_val); + } + else if (val_type == Tensor && in_type == NodeData) + { + tensor init_val = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + data_ptr = meshdata_tensor::create(in_name, in_type, node_num, if_output, init_val); + } + else if (val_type == Tensor && in_type == ElemData) + { + tensor init_val = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + data_ptr = meshdata_tensor::create(in_name, in_type, ele_num, if_output, init_val); + } + + + saved_data.push_back(data_ptr); + return data_ptr; +} + +void gctl::base_mesh::init(std::string in_name, std::string in_info, int xnum, int ynum, + double xmin, double ymin, double dx, double dy) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::init(std::string in_name, std::string in_info, int xbnum, int ybnum, int zbnum, + double xmin, double ymin, double zmin, double xsize, double ysize, double zsize) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::init(std::string in_name, std::string in_info, double lon_min, double lat_min, + double rad_min, double lon_size, double lat_size, double rad_size, int lon_bnum, int lat_bnum, int rad_bnum) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::init(std::string in_name, std::string in_info, double xmin, double ymin, + const gctl::array &xsizes, const gctl::array &ysizes) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::init(std::string in_name, std::string in_info, double xmin, double ymin, + double zmin, const gctl::array &xsizes, const gctl::array &ysizes, + const gctl::array &zsizes) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::init(std::string in_name, std::string in_info, const gctl::array &in_nodes, + const gctl::array &in_triangles) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::init(std::string in_name, std::string in_info, const gctl::array &in_nodes, + const gctl::array &in_tets) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::show_mesh_dimension(std::ostream &os) const +{ + return; +} + +void gctl::base_mesh::save_gmsh(std::string filename, index_packed_e packed) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed) +{ + if (out_mode == OverWrite) save_gmsh(filename, packed); + + std::ofstream outfile; + gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); + + meshdata *curr_data; + for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) + { + curr_data = *iter; + if (curr_data->get_dattype() == d_type && d_type == NodeData && + curr_data->get_valtype() == Scalar && curr_data->get_output()) + { + gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); + gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::NodeData, packed); + } + else if (curr_data->get_dattype() == d_type && d_type == ElemData && + curr_data->get_valtype() == Scalar && curr_data->get_output()) + { + gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); + gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::ElemData, packed); + } + else if (curr_data->get_dattype() == d_type && d_type == NodeData && + curr_data->get_valtype() == Vector && curr_data->get_output()) + { + gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); + gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::NodeData, packed); + } + else if (curr_data->get_dattype() == d_type && d_type == ElemData && + curr_data->get_valtype() == Vector && curr_data->get_output()) + { + gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); + gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::ElemData, packed); + } + } + + outfile.close(); + return; +} + +void gctl::base_mesh::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) +{ + meshdata *curr_data = get_data(datname); + + if (!curr_data->get_output()) + { + throw gctl::runtime_error("[gctl::base_mesh] Output is disabled for the data:" + datname); + } + + if (out_mode == OverWrite) save_gmsh(filename, packed); + + std::ofstream outfile; + gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); + + if (curr_data->get_valtype() == Scalar) + { + gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); + if (curr_data->get_dattype() == NodeData) + { + gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::NodeData, packed); + } + else if (curr_data->get_dattype() == ElemData) + { + gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::ElemData, packed); + } + } + else if (curr_data->get_valtype() == Vector) + { + gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); + if (curr_data->get_dattype() == NodeData) + { + gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::NodeData, packed); + } + else if (curr_data->get_dattype() == ElemData) + { + gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::ElemData, packed); + } + } + else if (curr_data->get_valtype() == Tensor) + { + gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); + if (curr_data->get_dattype() == NodeData) + { + array v(data_ptr->size()); + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[0][0]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txx", v, gctl::NodeData, packed); + + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[0][1]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txy", v, gctl::NodeData, packed); + + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[0][2]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txz", v, gctl::NodeData, packed); + + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[1][1]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tyy", v, gctl::NodeData, packed); + + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[1][2]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tyz", v, gctl::NodeData, packed); + + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[2][2]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tzz", v, gctl::NodeData, packed); + } + else if (curr_data->get_dattype() == ElemData) + { + array v(data_ptr->size()); + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[0][0]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txx", v, gctl::ElemData, packed); + + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[0][1]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txy", v, gctl::ElemData, packed); + + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[0][2]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txz", v, gctl::ElemData, packed); + + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[1][1]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tyy", v, gctl::ElemData, packed); + + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[1][2]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tyz", v, gctl::ElemData, packed); + + for (size_t i = 0; i < v.size(); i++) + { + v[i] = data_ptr->at(i).val[2][2]; + } + gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tzz", v, gctl::ElemData, packed); + } + } + + outfile.close(); + return; +} + +void gctl::base_mesh::load_data_cloud(const array &in_posi, const array &in_val, + double search_xlen, double search_ylen, double search_deg, std::string datname, mesh_data_type_e d_type) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::load_data_cloud(const array &in_posi, const array &in_val, + double search_xlen, double search_ylen, double search_deg, std::string datname, mesh_data_type_e d_type) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::extract_points(std::string datname, const array &in_posi, array &out_val) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::extract_points(std::string datname, const array &in_posi, array &out_val) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::extract_profile(std::string datname, const point2dc &start_p, const point2dc &end_p, int size_p, + array &out_posi, array &out_val) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::extract_profile(std::string datname, const point3dc &start_p, const point3dc &end_p, int size_p, + double dh, array &out_posi, array &out_val) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, double in_val) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, point3dc in_val) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, tensor in_val) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::purge_data(std::string datname, double in_val) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::purge_data(std::string datname, point3dc in_val) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +void gctl::base_mesh::purge_data(std::string datname, tensor in_val) +{ + throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); + return; +} + +/** + * 以下是类的私有函数，可以简单一些 + */ + +void gctl::base_mesh::init(mesh_type_e in_type, mesh_dim_e in_dim, std::string in_name, std::string in_info) +{ + if (in_name == "") + { + throw std::runtime_error("[gctl::base_mesh] The input name is empty."); + } + + if (in_info == "") + { + throw std::runtime_error("[gctl::base_mesh] The input info. is empty."); + } + + meshname = in_name; + meshinfo = in_info; + meshtype = in_type; + meshdim = in_dim; + return; +} + +void gctl::base_mesh::load_headinfo(std::ifstream &infile, mesh_type_e expected_type, mesh_dim_e expected_dim) +{ + // 读入网格头信息 + infile.read((char*)&meshtype, sizeof(int)); + infile.read((char*)&meshdim, sizeof(int)); + if (meshdim != expected_dim || meshtype != expected_type) + { + infile.close(); + throw std::runtime_error("[gctl::base_mesh] Invalid input mesh type."); + } + + int info_size; + infile.read((char*)&info_size, sizeof(int)); + meshname.resize(info_size); + infile.read((char*)meshname.c_str(), info_size); + + infile.read((char*)&info_size, sizeof(int)); + meshinfo.resize(info_size); + infile.read((char*)meshinfo.c_str(), info_size); + return; +} + +void gctl::base_mesh::load_datablock(std::ifstream &infile) +{ + meshdata *new_data; + int in_num, info_size; + mesh_data_type_e in_dattype; + mesh_data_value_e in_valtype; + std::string in_name; + + infile.read((char*)&in_num, sizeof(int)); + for (int i = 0; i < in_num; i++) + { + // 首先读入三个整形和数据名称 + infile.read((char*)&in_dattype, sizeof(int)); + infile.read((char*)&in_valtype, sizeof(int)); + infile.read((char*)&info_size, sizeof(int)); + + in_name.resize(info_size); + infile.read((char*)in_name.c_str(), info_size); + + new_data = add_data(in_name, in_dattype, true, in_valtype); + new_data->load_binary(infile); + } + return; +} + +void gctl::base_mesh::save_headinfo(std::ofstream &outfile) +{ + // 首先输出网格的类型和维度 + outfile.write((char*)&meshtype, sizeof(int)); + outfile.write((char*)&meshdim, sizeof(int)); + // 输出网格名称与信息 + int info_size = meshname.size(); + outfile.write((char*)&info_size, sizeof(int)); + outfile.write((char*)meshname.c_str(), info_size); + info_size = meshinfo.size(); + outfile.write((char*)&info_size, sizeof(int)); + outfile.write((char*)meshinfo.c_str(), info_size); + return; +} + +void gctl::base_mesh::save_datablock(std::ofstream &outfile) +{ + // 统计输出的模型数量 + int out_num = 0; + meshdata *curr_data = nullptr; + for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) + { + curr_data = *iter; + if (curr_data->get_output()) + { + out_num++; + } + } + outfile.write((char*)&out_num, sizeof(int)); + + for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) + { + curr_data = *iter; + if (curr_data->get_output()) + { + curr_data->save_binary(outfile); + } + } + return; +} \ No newline at end of file diff --git a/backup/mesh.h b/backup/mesh.h new file mode 100644 index 0000000..2c10e8f --- /dev/null +++ b/backup/mesh.h @@ -0,0 +1,579 @@ +/******************************************************** + * ██████╗ ██████╗████████╗██╗ + * ██╔════╝ ██╔════╝╚══██╔══╝██║ + * ██║ ███╗██║ ██║ ██║ + * ██║ ██║██║ ██║ ██║ + * ╚██████╔╝╚██████╗ ██║ ███████╗ + * ╚═════╝ ╚═════╝ ╚═╝ ╚══════╝ + * Geophysical Computational Tools & Library (GCTL) + * + * Copyright (c) 2023 Yi Zhang (yizhang-geo@zju.edu.cn) + * + * GCTL is distributed under a dual licensing scheme. You can redistribute + * it and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation, either version 2 + * of the License, or (at your option) any later version. You should have + * received a copy of the GNU Lesser General Public License along with this + * program. If not, see . + * + * If the terms and conditions of the LGPL v.2. would prevent you from using + * the GCTL, please consider the option to obtain a commercial license for a + * fee. These licenses are offered by the GCTL's original author. As a rule, + * licenses are provided "as-is", unlimited in time for a one time fee. Please + * send corresponding requests to: yizhang-geo@zju.edu.cn. Please do not forget + * to include some description of your company and the realm of its activities. + * Also add information on how to contact you by electronic and paper mail. + ******************************************************/ + +#ifndef _GCTL_BASE_MESH_H +#define _GCTL_BASE_MESH_H + +#include "list" + +#include "new_meshdata.h" +//#include "meshdata.h" +//#include "meshdata_scalar.h" +//#include "meshdata_vector.h" +//#include "meshdata_tensor.h" + +#include "gctl/io.h" +#include "gctl/algorithm.h" + +namespace gctl +{ + enum mesh_type_e + { + REGULAR_MESH, + LINEAR_MESH, + TRI_TET_MESH, + REGULAR_MESH_SPH, + LINEAR_MESH_SPH, + TRI_TET_MESH_SPH, + REGULAR_GRID, + }; + + enum mesh_dim_e + { + MESH_2D, + MESH_3D, + }; + + /** + * @brief 网格对象（纯虚类）。此类为所有具体网格类型的基类 + */ + class base_mesh + { + public: + base_mesh(); + virtual ~base_mesh(); + + /** + * @brief 清除所有网格数据。 + * + */ + void clear(); + + /** + * @brief 检查网格是否已经初始化。 + * + */ + bool initiated() const; + + /** + * @brief 检查是否存在对应名称的数据。 + * + * @param datname 数据名 + */ + bool saved(std::string datname) const; + + /** + * @brief 返回对应名称的数据对象指针。 + * + * @param datname 数据名 + * @return 数据指针 + */ + meshdata *get_data(std::string datname) const; + + /** + * @brief 返回所有数据指针。 + * + * @param out_list 数据指针列表 + */ + void get_all_data(array &out_list) const; + + /** + * @brief 返回对应名称的数据对象的数组指针。 + * + * @param datname 数据名 + * @return 数组指针（注意需要转换为对应的数组指针类型） + */ + void *get_datval(std::string datname) const; + + /** + * @brief 删除对应名称的数据对象。 + * + * @param datname 数据名 + */ + void remove_data(std::string datname); + + /** + * @brief 显示网格与数据信息。 + * + * @param os 输出流 + */ + void show_info(std::ostream &os = std::clog) const; + + /** + * @brief 重命名数据对象。 + * + * @param oldname 旧名称 + * @param newname 新名称 + */ + void rename_data(std::string oldname, std::string newname); + + /** + * @brief 返回网格类型 + * + * @return 网格类型 + */ + mesh_type_e get_meshtype() const; + + /** + * @brief 返回网格维度类型 + * + * @return 网格维度 + */ + mesh_dim_e get_meshdim() const; + + /** + * @brief 返回顶点数量 + * + * @return 顶点数量 + */ + int get_nodenum() const; + + /** + * @brief 返回网格单元数量 + * + * @return 单元数量 + */ + int get_elenum() const; + + /** + * @brief 返回数据对象数量 + * + * @return 数据对象数量 + */ + int get_datanum() const; + + /** + * @brief 返回网格名称 + * + * @return 网格名称 + */ + std::string get_meshname() const; + + /** + * @brief 设置网格名称 + * + * @param in_name 网格名称 + */ + void set_meshname(std::string in_name); + + /** + * @brief 返回网格说明信息 + * + * @return 说明信息 + */ + std::string get_meshinfo() const; + + /** + * @brief 设置网格说明信息 + * + * @param in_info 说明信息 + */ + void set_meshinfo(std::string in_info); + + /** + * @brief 添加标量网格数据对象并赋初始值，如果对象已经存在则赋初始值 + * + * @param in_name 数据对象名称 + * @param in_type 数据对象类型 + * @param if_output 数据对象是否可输出 + * @param init_val 初始值 + * @return 新建的数据对象指针 + */ + meshdata *add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, double init_val); + + /** + * @brief 添加适量网格数据对象并赋初始值，如果对象已经存在则赋初始值 + * + * @param in_name 数据对象名称 + * @param in_type 数据对象类型 + * @param if_output 数据对象是否可输出 + * @param init_val 初始值 + * @return 新建的数据对象指针 + */ + meshdata *add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, gctl::point3dc init_val); + + /** + * @brief 添加张量网格数据对象并赋初始值，如果对象已经存在则赋初始值 + * + * @param in_name 数据对象名称 + * @param in_type 数据对象类型 + * @param if_output 数据对象是否可输出 + * @param init_val 初始值 + * @return 新建的数据对象指针 + */ + meshdata *add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, gctl::tensor init_val); + + /** + * @brief 添加张量网格数据对象并初始为0值 + * + * @param in_name 数据对象名称 + * @param in_type 数据对象类型 + * @param if_output 数据对象是否可输出 + * @param init_val 初始值 + * @return 新建的数据对象指针 + */ + meshdata *add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, mesh_data_value_e val_type); + + /** + * @brief （基类虚函数）初始化规则网格 + * + * @param in_name 网格名称 + * @param in_info 网格说明信息 + * @param xnum 网格x轴数量 + * @param ynum 网格y轴数量 + * @param xmin 网格x轴最小值 + * @param ymin 网格y轴最小值 + * @param dx 网格x轴间隔 + * @param dy 网格y轴间隔 + */ + virtual void init(std::string in_name, std::string in_info, int xnum, int ynum, + double xmin, double ymin, double dx, double dy); + + /** + * @brief + * + * @param in_name + * @param in_info + * @param xbnum + * @param ybnum + * @param zbnum + * @param xmin + * @param ymin + * @param zmin + * @param xsize + * @param ysize + * @param zsize + */ + virtual void init(std::string in_name, std::string in_info, int xbnum, int ybnum, int zbnum, + double xmin, double ymin, double zmin, double xsize, double ysize, double zsize); + + /** + * @brief + * + * @param in_name + * @param in_info + * @param lon_min + * @param lat_min + * @param rad_min + * @param lon_size + * @param lat_size + * @param rad_size + * @param lon_bnum + * @param lat_bnum + * @param rad_bnum + */ + virtual void init(std::string in_name, std::string in_info, double lon_min, double lat_min, + double rad_min, double lon_size, double lat_size, double rad_size, int lon_bnum, int lat_bnum, int rad_bnum); + + /** + * @brief + * + * @param in_name + * @param in_info + * @param xmin + * @param ymin + * @param xsizes + * @param ysizes + */ + virtual void init(std::string in_name, std::string in_info, double xmin, double ymin, + const gctl::array &xsizes, const gctl::array &ysizes); + + /** + * @brief + * + * @param in_name + * @param in_info + * @param xmin + * @param ymin + * @param zmin + * @param xsizes + * @param ysizes + * @param zsizes + */ + virtual void init(std::string in_name, std::string in_info, double xmin, double ymin, + double zmin, const gctl::array &xsizes, const gctl::array &ysizes, + const gctl::array &zsizes); + + /** + * @brief + * + * @param in_name + * @param in_info + * @param in_nodes + * @param in_triangles + */ + virtual void init(std::string in_name, std::string in_info, const gctl::array &in_nodes, + const gctl::array &in_triangles); + + /** + * @brief + * + * @param in_name + * @param in_info + * @param in_nodes + * @param in_tets + */ + virtual void init(std::string in_name, std::string in_info, const gctl::array &in_nodes, + const gctl::array &in_tets); + + /** + * @brief 显示网格的维度信息 + * + */ + virtual void show_mesh_dimension(std::ostream &os) const; + + /** + * @brief （基类纯虚函数）读入二进制网格文件 + * + * @param filename 文件名 + */ + virtual void load_binary(std::string filename) = 0; + + /** + * @brief （基类纯虚函数）写入二进制网格文件 + * + * @param filename 文件名 + */ + virtual void save_binary(std::string filename) = 0; + + /** + * @brief （基类虚函数）保存网格到Gmsh文件。 + * + * @param filename 文件名 + * @param packed 索引是否为紧凑（从0开始） + */ + virtual void save_gmsh(std::string filename, index_packed_e packed = Packed); + + /** + * @brief + * + * @param filename + * @param d_type + * @param out_mode + * @param packed + */ + void save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed = Packed); + + /** + * @brief + * + * @param filename + * @param datname + * @param out_mode + * @param packed + */ + void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); + + /** + * @brief 将输入的自由点位上的浮点数据插值为规则网络的顶点或者块体数据 + * + * @param in_posi 输入的自由点位的坐标 + * @param in_val 输入的自由点位的数值 + * @param[in] search_xlen 插值搜索区域的x半径 + * @param[in] search_ylen 插值搜索区域的y半径 + * @param[in] search_deg 插值搜索区域的x半径绕x轴正方向逆时针旋转的角度（弧度） + * @param[in] datname 网格后的数据名称 + * @param[in] d_type 网格后的数据类型 + */ + virtual void load_data_cloud(const array &in_posi, const array &in_val, double search_xlen, + double search_ylen, double search_deg, std::string datname, mesh_data_type_e d_type = NodeData); + + /** + * @brief + * + * @param in_posi + * @param in_val + * @param search_xlen + * @param search_ylen + * @param search_deg + * @param datname + * @param d_type + */ + virtual void load_data_cloud(const array &in_posi, const array &in_val, double search_xlen, + double search_ylen, double search_deg, std::string datname, mesh_data_type_e d_type = NodeData); + + /** + * @brief + * + * @param datname + * @param in_posi + * @param out_val + */ + virtual void extract_points(std::string datname, const array &in_posi, array &out_val); + + /** + * @brief + * + * @param datname + * @param in_posi + * @param out_val + */ + virtual void extract_points(std::string datname, const array &in_posi, array &out_val); + + /** + * @brief + * + * @param datname + * @param start_p + * @param end_p + * @param size_p + * @param out_posi + * @param out_val + */ + virtual void extract_profile(std::string datname, const point2dc &start_p, const point2dc &end_p, int size_p, + array &out_posi, array &out_val); + + /** + * @brief + * + * @param datname + * @param start_p + * @param end_p + * @param size_p + * @param dh + * @param out_posi + * @param out_val + */ + virtual void extract_profile(std::string datname, const point3dc &start_p, const point3dc &end_p, int size_p, + double dh, array &out_posi, array &out_val); + + /** + * @brief + * + * @param datname + * @param p_type + * @param v_type + * @param para_str + * @param in_val + */ + virtual void edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, double in_val); + + /** + * @brief + * + * @param datname + * @param p_type + * @param v_type + * @param para_str + * @param in_val + */ + virtual void edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, point3dc in_val); + + /** + * @brief + * + * @param datname + * @param p_type + * @param v_type + * @param para_str + * @param in_val + */ + virtual void edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, tensor in_val); + + /** + * @brief + * + * @param datname + * @param in_val + */ + virtual void purge_data(std::string datname, double in_val); + + /** + * @brief + * + * @param datname + * @param in_val + */ + virtual void purge_data(std::string datname, point3dc in_val); + + /** + * @brief + * + * @param datname + * @param in_val + */ + virtual void purge_data(std::string datname, tensor in_val); + + protected: + mesh_type_e meshtype; + mesh_dim_e meshdim; + std::string meshname; + std::string meshinfo; + + int node_num, ele_num; + bool initialized; + + std::list saved_data; + std::list::iterator iter; + + /** + * 以下为类的私有函数 只能被类的公共函数调用 + */ + + /** + * @brief 初始化网格 + * + * @param in_type + * @param in_dim + * @param in_name + * @param in_info + */ + void init(mesh_type_e in_type, mesh_dim_e in_dim, std::string in_name, std::string in_info); + + /** + * @brief 读入二进制网格头信息 + * + * @param infile 输入流 + * @param expected_type 预期获取的网格类型 + * @param expected_dim 预期获得的网格维度类型 + */ + void load_headinfo(std::ifstream &infile, mesh_type_e expected_type, mesh_dim_e expected_dim); + + /** + * @brief 读入二进制数据块 + * + * @param infile 输入流 + */ + void load_datablock(std::ifstream &infile); + + /** + * @brief 写入二进制网格头信息 + * + * @param outfile 输出流 + */ + void save_headinfo(std::ofstream &outfile); + + /** + * @brief 写入二进制数据块 + * + * @param outfile 输出流 + */ + void save_datablock(std::ofstream &outfile); + }; +} + +#endif //_GCTL_BASE_MESH_H \ No newline at end of file diff --git a/backup/meshdata.cpp b/backup/meshdata.cpp new file mode 100644 index 0000000..725f02a --- /dev/null +++ b/backup/meshdata.cpp @@ -0,0 +1,94 @@ +/******************************************************** + * ██████╗ ██████╗████████╗██╗ + * ██╔════╝ ██╔════╝╚══██╔══╝██║ + * ██║ ███╗██║ ██║ ██║ + * ██║ ██║██║ ██║ ██║ + * ╚██████╔╝╚██████╗ ██║ ███████╗ + * ╚═════╝ ╚═════╝ ╚═╝ ╚══════╝ + * Geophysical Computational Tools & Library (GCTL) + * + * Copyright (c) 2023 Yi Zhang (yizhang-geo@zju.edu.cn) + * + * GCTL is distributed under a dual licensing scheme. You can redistribute + * it and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation, either version 2 + * of the License, or (at your option) any later version. You should have + * received a copy of the GNU Lesser General Public License along with this + * program. If not, see . + * + * If the terms and conditions of the LGPL v.2. would prevent you from using + * the GCTL, please consider the option to obtain a commercial license for a + * fee. These licenses are offered by the GCTL's original author. As a rule, + * licenses are provided "as-is", unlimited in time for a one time fee. Please + * send corresponding requests to: yizhang-geo@zju.edu.cn. Please do not forget + * to include some description of your company and the realm of its activities. + * Also add information on how to contact you by electronic and paper mail. + ******************************************************/ + +#include "meshdata.h" + +gctl::meshdata::meshdata(std::string in_name, mesh_data_type_e in_type, bool if_output) +{ + if (in_name == "") + { + throw std::runtime_error("[gctl::meshdata] The input name is empty."); + } + + datname = in_name; + dattype = in_type; + output_ok = if_output; +} + +gctl::meshdata::~meshdata(){} + +void gctl::meshdata::set_datname(std::string in_name) +{ + if (in_name == "") + { + throw std::runtime_error("[gctl::meshdata] The input name is empty."); + } + + datname = in_name; + return; +} + +std::string gctl::meshdata::get_datname() +{ + return datname; +} + +gctl::mesh_data_type_e gctl::meshdata::get_dattype() +{ + return dattype; +} + +gctl::mesh_data_value_e gctl::meshdata::get_valtype() +{ + return valtype; +} + +void gctl::meshdata::set_output(bool if_output) +{ + output_ok = if_output; + return; +} + +bool gctl::meshdata::get_output() +{ + return output_ok; +} + +void gctl::meshdata::show_info(std::ostream &os) +{ + os << "Data: " << datname << " | "; + if (dattype == NodeData) os << "Type: Node data | "; + if (dattype == ElemData) os << "Type: Element data | "; + if (dattype == ElemData2D) os << "Type: 2D element data | "; + if (dattype == ElemData3D) os << "Type: 3D element data | "; + if (valtype == Scalar) os << "Value: Scalar | "; + if (valtype == Vector) os << "Value: Vector | "; + if (valtype == Tensor) os << "Value: Tensor | "; + if (output_ok) os << "Output: Yes" << std::endl; + else os<< "Output: No" << std::endl; + return; +} \ No newline at end of file diff --git a/backup/meshdata.h b/backup/meshdata.h new file mode 100644 index 0000000..217aea1 --- /dev/null +++ b/backup/meshdata.h @@ -0,0 +1,158 @@ +/******************************************************** + * ██████╗ ██████╗████████╗██╗ + * ██╔════╝ ██╔════╝╚══██╔══╝██║ + * ██║ ███╗██║ ██║ ██║ + * ██║ ██║██║ ██║ ██║ + * ╚██████╔╝╚██████╗ ██║ ███████╗ + * ╚═════╝ ╚═════╝ ╚═╝ ╚══════╝ + * Geophysical Computational Tools & Library (GCTL) + * + * Copyright (c) 2023 Yi Zhang (yizhang-geo@zju.edu.cn) + * + * GCTL is distributed under a dual licensing scheme. You can redistribute + * it and/or modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation, either version 2 + * of the License, or (at your option) any later version. You should have + * received a copy of the GNU Lesser General Public License along with this + * program. If not, see . + * + * If the terms and conditions of the LGPL v.2. would prevent you from using + * the GCTL, please consider the option to obtain a commercial license for a + * fee. These licenses are offered by the GCTL's original author. As a rule, + * licenses are provided "as-is", unlimited in time for a one time fee. Please + * send corresponding requests to: yizhang-geo@zju.edu.cn. Please do not forget + * to include some description of your company and the realm of its activities. + * Also add information on how to contact you by electronic and paper mail. + ******************************************************/ + +#ifndef _GCTL_MESHDATA_H +#define _GCTL_MESHDATA_H + +#include "gctl_mesh_config.h" +#include "gctl/core.h" +#include "gctl/geometry.h" + +namespace gctl +{ + /** + * @brief 网格数据的数值类型 + */ + enum mesh_data_value_e + { + Scalar, ///< 标量数据 + Vector, ///< 矢量数据 + Tensor, ///< 张量数据 + }; + + /** + * @brief 网格文件中的数据对象（纯虚类）。此类为具体类型的数据对象的基类 + */ + class meshdata + { + protected: + std::string datname; // 数据的名称 + mesh_data_type_e dattype; // 数据的赋值属性 顶点或是元素（设置后不可更改） + mesh_data_value_e valtype; // 数据的类型（设置后不可更改） + bool output_ok; // 是否可输出数据 + + public: + // 构造函数 + meshdata(std::string in_name, mesh_data_type_e in_type, bool if_output); + + // 析构函数 + virtual ~meshdata(); + + /** + * @brief 设置数据名称 + * + * @param[in] in_name 名称字符串 + */ + void set_datname(std::string in_name); + + /** + * @brief 返回数据的名称 + * + * @return 名称字符串 + */ + std::string get_datname(); + + /** + * @brief 返回数据的赋值类型 + * + * @return 数据赋值类型的枚举 + */ + mesh_data_type_e get_dattype(); + + /** + * @brief 返回数据值的类型 + * + * @return 数据值类型的枚举 + */ + mesh_data_value_e get_valtype(); + + /** + * @brief 设置数据对象输出状态的设置情况 + * + * @param[in] if_output 是否可输出此对象 + */ + void set_output(bool if_output); + + /** + * @brief 返回数据对象输出状态的设置情况 + * + * @return 是否可输出此对象 + */ + bool get_output(); + + /** + * @brief 显示数据对象的头信息 + */ + void show_info(std::ostream &os = std::clog); + + /** + * @brief 显示数据统计参数 + */ + virtual void show_stats(std::ostream &os = std::clog) = 0; + + /** + * @brief 返回数据块的指针 所有子类的数据块均为gctl::array类型，这是一个通用的接口。 + * + * @note 注意因为具体的返回类型未知 因此需在调用后按实际数据类型转换指针 + * + * @return 数据块的指针 + */ + virtual void *get_datval_ptr() = 0; + + /** + * @brief 载入二进制文件 + * + * @warning 不要直接调用此函数，应该在网格类型的相应函数中调用 + * + * @param infile 输入文件的流（以二进制方式打开） + */ + virtual void load_binary(std::ifstream &infile) = 0; + + /** + * @brief 保存二进制文件 + * + * @warning 不要直接调用此函数，应该在网格类型的相应函数中调用 + * + * @param outfile 输出的文件流（以二进制方式打开） + */ + virtual void save_binary(std::ofstream &outfile) = 0; + + /** + * @brief 销毁指针的对象 可销毁此基类或子类指针指向的对象 + * + * @param obj_ptr 网格数据指针 + */ + static void destroy(meshdata *obj_ptr) + { + delete obj_ptr; + obj_ptr = nullptr; + return; + } + }; +} + +#endif //_GCTL_MESHDATA_H \ No newline at end of file diff --git a/lib/mesh/meshdata_scalar.cpp b/backup/meshdata_scalar.cpp similarity index 100% rename from lib/mesh/meshdata_scalar.cpp rename to backup/meshdata_scalar.cpp diff --git a/lib/mesh/meshdata_scalar.h b/backup/meshdata_scalar.h similarity index 100% rename from lib/mesh/meshdata_scalar.h rename to backup/meshdata_scalar.h diff --git a/lib/mesh/meshdata_tensor.cpp b/backup/meshdata_tensor.cpp similarity index 100% rename from lib/mesh/meshdata_tensor.cpp rename to backup/meshdata_tensor.cpp diff --git a/lib/mesh/meshdata_tensor.h b/backup/meshdata_tensor.h similarity index 100% rename from lib/mesh/meshdata_tensor.h rename to backup/meshdata_tensor.h diff --git a/lib/mesh/meshdata_vector.cpp b/backup/meshdata_vector.cpp similarity index 100% rename from lib/mesh/meshdata_vector.cpp rename to backup/meshdata_vector.cpp diff --git a/lib/mesh/meshdata_vector.h b/backup/meshdata_vector.h similarity index 100% rename from lib/mesh/meshdata_vector.h rename to backup/meshdata_vector.h diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index dc56351..63c8227 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -21,7 +21,7 @@ add_example(mesh_ex1 ON) add_example(mesh_ex2 ON) add_example(mesh_ex3 ON) add_example(mesh_ex4 ON) -add_example(mesh_ex5 ON) +add_example(mesh_ex5 OFF) add_example(mesh_ex6 ON) add_example(mesh_ex7 ON) add_example(mesh_ex8 ON) diff --git a/example/mesh_ex1.cpp b/example/mesh_ex1.cpp index 5129bff..3963ab5 100644 --- a/example/mesh_ex1.cpp +++ b/example/mesh_ex1.cpp @@ -32,26 +32,20 @@ int main(int argc, char *argv[]) gctl::regular_grid rgd; rgd.init("grid-1", "null", 4, 4, 0.0, 0.0, 1.0, 1.0); - gctl::meshdata *data = rgd.add_data("data-1", gctl::NodeData, true, 2.5); - gctl::meshdata *data2= rgd.add_data("data-2", gctl::ElemData, false, 1.2); - gctl::meshdata *data3= rgd.add_data("data-3", gctl::NodeData, true, gctl::Scalar); + rgd.add_data(gctl::NodeData, gctl::Scalar, "data-1", 2.5); + rgd.add_data(gctl::ElemData, gctl::Scalar, "data-2", 1.2, false); + rgd.add_data(gctl::NodeData, gctl::Scalar, "data-3", 1.0); + rgd.show_info(); - std::cout << "data name: " << data2->get_datname() << std::endl; - //gctl::array *data_ptr = (gctl::array*) rgd.get_datval(data2->get_name()); - gctl::array *data_ptr = (gctl::array*) data2->get_datval_ptr(); - for (int i = 0; i < data_ptr->size(); i++) - { - std::cout << data_ptr->at(i) << std::endl; - } + gctl::meshdata data2 = rgd.get_data("data-2"); + std::cout << "data name: " << data2.name_ << std::endl; + data2.datval_.show(); - std::cout << "data name: " << data3->get_datname() << std::endl; - gctl::array *data_ptr2 = (gctl::array*) rgd.get_datval(data3->get_datname()); - for (int i = 0; i < data_ptr2->size(); i++) - { - std::cout << data_ptr2->at(i) << std::endl; - } + gctl::meshdata data3 = rgd.get_data("data-3"); + std::cout << "data name: " << data3.name_ << std::endl; + data3.datval_.show(); rgd.remove_data("data-1"); - + rgd.show_info(); return 0; } \ No newline at end of file diff --git a/example/mesh_ex10.cpp b/example/mesh_ex10.cpp index c02df14..cbf2dd2 100644 --- a/example/mesh_ex10.cpp +++ b/example/mesh_ex10.cpp @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) { gctl::regular_mesh_sph_3d rm_3ds; rm_3ds.init("mesh-1", "null", 30.25, 30.25, 2005, 0.5, 0.5, 10, 40, 40, 50); - rm_3ds.add_data("data-1", gctl::ElemData, true, 2.5); - rm_3ds.save_gmsh("data/out/mesh_sample10", gctl::ElemData, gctl::OverWrite, gctl::NotPacked); + rm_3ds.add_data(gctl::ElemData, gctl::Scalar, "data-1", 2.5); + rm_3ds.save_gmsh("mesh_sample10",gctl::OverWrite, gctl::NotPacked); return 0; } \ No newline at end of file diff --git a/example/mesh_ex2.cpp b/example/mesh_ex2.cpp index e613611..3e05cb4 100644 --- a/example/mesh_ex2.cpp +++ b/example/mesh_ex2.cpp @@ -34,32 +34,29 @@ int main(int argc, char *argv[]) gctl::regular_grid rgd; rgd.init("grid-1", "null", 15, 10, 0.0, 0.0, 1.0, 1.0); - rgd.add_data(dname, gctl::NodeData, true, gctl::Scalar); - gctl::array *data_ptr = (gctl::array*) rgd.get_datval(dname); + gctl::meshdata &data = rgd.add_data(gctl::NodeData, gctl::Scalar, dname, 0.0); for (int j = 0; j < rgd.get_ydim(); j++) { for (int i = 0; i < rgd.get_xdim(); i++) { - data_ptr->at(i + j*rgd.get_xdim()) = i; + data.datval_[i + j*rgd.get_xdim()] = i; } } - rgd.add_data(dname2, gctl::NodeData, true, gctl::Scalar); - data_ptr = (gctl::array*) rgd.get_datval(dname2); + gctl::meshdata &data2 = rgd.add_data(gctl::NodeData, gctl::Scalar, dname2, 0.0); for (int j = 0; j < rgd.get_ydim(); j++) { for (int i = 0; i < rgd.get_xdim(); i++) { - data_ptr->at(i + j*rgd.get_xdim()) = j; + data2.datval_[i + j*rgd.get_xdim()] = j; } } // disable the output of data object named dname2 - gctl::meshdata *data2 = rgd.get_data(dname2); - data2->set_output(false); - - rgd.save_netcdf_grid("data/out/sample2-out", gctl::NodeData); + //data2.output_ok_ = false; + rgd.show_info(); + rgd.save_netcdf_grid("sample2-out", gctl::NodeData); return 0; } \ No newline at end of file diff --git a/example/mesh_ex3.cpp b/example/mesh_ex3.cpp index 83c64ca..bac21f8 100644 --- a/example/mesh_ex3.cpp +++ b/example/mesh_ex3.cpp @@ -27,62 +27,56 @@ #include "../lib/mesh.h" -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) try { - try + std::string dname = "example"; + std::string dname2= "another-example"; + + gctl::regular_grid rgd; + rgd.init("grid-1", "this is a test message.", 15, 10, 0.0, 0.0, 1.0, 1.0); + + gctl::meshdata &data = rgd.add_data(gctl::NodeData, gctl::Scalar, dname, 0.0); + for (int j = 0; j < rgd.get_ydim(); j++) { - std::string dname = "example"; - std::string dname2= "another-example"; - - gctl::regular_grid rgd; - rgd.init("grid-1", "this is a test message.", 15, 10, 0.0, 0.0, 1.0, 1.0); - rgd.add_data(dname, gctl::NodeData, true, gctl::Scalar); - - gctl::array *data_ptr = (gctl::array*) rgd.get_datval(dname); - for (int j = 0; j < rgd.get_ydim(); j++) + for (int i = 0; i < rgd.get_xdim(); i++) { - for (int i = 0; i < rgd.get_xdim(); i++) - { - data_ptr->at(i + j*rgd.get_xdim()) = i; - } + data.datval_[i + j*rgd.get_xdim()] = i; } - - rgd.add_data(dname2, gctl::ElemData, true, gctl::Scalar); - data_ptr = (gctl::array*) rgd.get_datval(dname2); - for (int j = 0; j < rgd.get_ydim()-1; j++) - { - for (int i = 0; i < rgd.get_xdim()-1; i++) - { - data_ptr->at(i + j*(rgd.get_xdim()-1)) = j; - } - } - - rgd.save_binary("data/out/sample3-out"); - rgd.save_netcdf_grid("data/out/sample3-out1", dname); - rgd.save_netcdf_grid("data/out/sample3-out2", dname2); - - gctl::regular_grid rgd2; - rgd2.load_binary("data/out/sample3-out"); - - rgd2.show_info(); - - data_ptr = (gctl::array*) rgd2.get_datval(dname); - for (int i = 0; i < data_ptr->size(); i++) - { - std::cout << data_ptr->at(i) << " "; - } - std::cout << std::endl; - - data_ptr = (gctl::array*) rgd2.get_datval(dname2); - for (int i = 0; i < data_ptr->size(); i++) - { - std::cout << data_ptr->at(i) << " "; - } - std::cout << std::endl; } - catch(std::exception &e) + + gctl::meshdata &data2 = rgd.add_data(gctl::ElemData, gctl::Scalar, dname2, 0.0); + for (int j = 0; j < rgd.get_ydim()-1; j++) { - GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); + for (int i = 0; i < rgd.get_xdim()-1; i++) + { + data2.datval_[i + j*(rgd.get_xdim()-1)] = j; + } } + + rgd.save_binary("sample3-out"); + rgd.save_netcdf_grid("sample3-out1", dname); + rgd.save_netcdf_grid("sample3-out2", dname2); + + gctl::regular_grid rgd2; + rgd2.load_binary("sample3-out"); + rgd2.show_info(); + + gctl::meshdata &data3 = rgd2.get_data(dname); + for (int i = 0; i < data3.datval_.size(); i++) + { + std::cout << data3.datval_[i] << " "; + } + std::cout << std::endl; + + gctl::meshdata &data4 = rgd2.get_data(dname2); + for (int i = 0; i < data4.datval_.size(); i++) + { + std::cout << data4.datval_[i] << " "; + } + std::cout << std::endl; return 0; +} +catch(std::exception &e) +{ + GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); } \ No newline at end of file diff --git a/example/mesh_ex4.cpp b/example/mesh_ex4.cpp index c438760..834cc98 100644 --- a/example/mesh_ex4.cpp +++ b/example/mesh_ex4.cpp @@ -27,37 +27,34 @@ #include "../lib/mesh.h" -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) try { - try + std::string dname = "vector-data"; + + gctl::regular_grid rgd; + rgd.init("grid-example", "this grid can store vectors. Yeah!", 15, 10, 0.0, 0.0, 1.0, 1.0); + + gctl::array init_data(rgd.get_ydim()*rgd.get_xdim()); + for (int j = 0; j < rgd.get_ydim(); j++) { - std::string dname = "vector-data"; - - gctl::regular_grid rgd; - rgd.init("grid-example", "this grid can store vectors. Yeah!", 15, 10, 0.0, 0.0, 1.0, 1.0); - rgd.add_data(dname, gctl::NodeData, true, gctl::Vector); - - gctl::array *data_ptr = (gctl::array*) rgd.get_datval(dname); - for (int j = 0; j < rgd.get_ydim(); j++) + for (int i = 0; i < rgd.get_xdim(); i++) { - for (int i = 0; i < rgd.get_xdim(); i++) - { - data_ptr->at(i + j*rgd.get_xdim()).x = i; - data_ptr->at(i + j*rgd.get_xdim()).y = j; - data_ptr->at(i + j*rgd.get_xdim()).z = i+j; - } + init_data[i + j*rgd.get_xdim()].x = i; + init_data[i + j*rgd.get_xdim()].y = j; + init_data[i + j*rgd.get_xdim()].z = i+j; } - - rgd.save_binary("data/out/sample4-out"); - - gctl::regular_grid rgd2; - rgd2.load_binary("data/out/sample4-out"); - - rgd2.show_info(); - } - catch(std::exception &e) - { - GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); } + + gctl::meshdata data = rgd.add_data(gctl::NodeData, dname, init_data); + + rgd.save_binary("sample4-out"); + + gctl::regular_grid rgd2; + rgd2.load_binary("sample4-out"); + rgd2.show_info(); return 0; +} +catch(std::exception &e) +{ + GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); } \ No newline at end of file diff --git a/example/mesh_ex5.cpp b/example/mesh_ex5.cpp index d4584e8..4f4d8b5 100644 --- a/example/mesh_ex5.cpp +++ b/example/mesh_ex5.cpp @@ -27,20 +27,17 @@ #include "../lib/mesh.h" -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) try { - try - { - gctl::regular_grid rgd; - rgd.load_netcdf_grid("data/out/sample3-out1", gctl::ElemData, "x", "y"); + gctl::regular_grid rgd; + rgd.load_netcdf_grid("data/out/sample3-out1", gctl::ElemData, "x", "y"); - rgd.show_info(); + rgd.show_info(); - rgd.save_netcdf_grid("data/out/sample5-out", "example"); - } - catch(std::exception &e) - { - GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); - } + rgd.save_netcdf_grid("data/out/sample5-out", "example"); return 0; +} +catch(std::exception &e) +{ + GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); } \ No newline at end of file diff --git a/example/mesh_ex6.cpp b/example/mesh_ex6.cpp index a3bf568..53f01b2 100644 --- a/example/mesh_ex6.cpp +++ b/example/mesh_ex6.cpp @@ -27,46 +27,40 @@ #include "../lib/mesh.h" -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) try { - try + gctl::regular_mesh_2d rg_mesh; + rg_mesh.init("mesh-example", "this mesh can store vectors. Yeah!", 15, 10, 0.5, 0.5, 1.0, 1.0); + + int ybnum = rg_mesh.get_ybnum(); + int xbnum = rg_mesh.get_xbnum(); + + gctl::array init_data(ybnum*xbnum); + for (int j = 0; j < ybnum; j++) { - gctl::regular_mesh_2d rg_mesh; - rg_mesh.init("mesh-example", "this mesh can store vectors. Yeah!", 15, 10, 0.5, 0.5, 1.0, 1.0); - - int ybnum = rg_mesh.get_ybnum(); - int xbnum = rg_mesh.get_xbnum(); - - rg_mesh.add_data("vector-data", gctl::ElemData, true, gctl::Vector); - gctl::array *data_ptr = (gctl::array*) rg_mesh.get_datval("vector-data"); - for (int j = 0; j < ybnum; j++) + for (int i = 0; i < xbnum; i++) { - for (int i = 0; i < xbnum; i++) - { - data_ptr->at(i + j*xbnum).x = i; - data_ptr->at(i + j*xbnum).y = j; - data_ptr->at(i + j*xbnum).z = i+j; - } + init_data[i + j*xbnum].x = i; + init_data[i + j*xbnum].y = j; + init_data[i + j*xbnum].z = i+j; } - - rg_mesh.add_data("double-data", gctl::NodeData, true, gctl::Scalar); - gctl::array *data_ptr2 = (gctl::array*) rg_mesh.get_datval("double-data"); - for (int j = 0; j < ybnum+1; j++) - { - for (int i = 0; i < xbnum+1; i++) - { - data_ptr2->at(i + j*(xbnum+1)) = i+j; - } - } - - //rg_mesh.save_gmsh("data/sample6-out", "vector-data"); - //rg_mesh.save_gmsh("data/sample6-out", "double-data", Append); - - rg_mesh.save_gmsh("data/out/sample6-out", gctl::ElemData, gctl::OverWrite); } - catch(std::exception &e) + + rg_mesh.add_data(gctl::ElemData, "vector-data", init_data); + + gctl::meshdata &data2= rg_mesh.add_data(gctl::NodeData, gctl::Scalar, "double-data", 0.0); + for (int j = 0; j < ybnum+1; j++) { - GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); + for (int i = 0; i < xbnum+1; i++) + { + data2.datval_[i + j*(xbnum+1)] = i+j; + } } + + rg_mesh.save_gmsh("sample6-out", gctl::OverWrite); return 0; +} +catch(std::exception &e) +{ + GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); } \ No newline at end of file diff --git a/example/mesh_ex7.cpp b/example/mesh_ex7.cpp index 095de7b..3750a5e 100644 --- a/example/mesh_ex7.cpp +++ b/example/mesh_ex7.cpp @@ -27,35 +27,31 @@ #include "../lib/mesh.h" -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) try { - try + gctl::regular_mesh_3d rg_mesh; + rg_mesh.init("mesh-example", "this mesh can store vectors. Yeah!", 15, 10, 10, 0.5, 0.5, 0.5, 1.0, 1.0, 1.0); + + int ybnum = rg_mesh.get_ybnum(); + int xbnum = rg_mesh.get_xbnum(); + int zbnum = rg_mesh.get_zbnum(); + + gctl::meshdata &data = rg_mesh.add_data(gctl::NodeData, gctl::Scalar, "double-data", 0.0); + for (int k = 0; k < zbnum+1; k++) { - gctl::regular_mesh_3d rg_mesh; - rg_mesh.init("mesh-example", "this mesh can store vectors. Yeah!", 15, 10, 10, 0.5, 0.5, 0.5, 1.0, 1.0, 1.0); - - int ybnum = rg_mesh.get_ybnum(); - int xbnum = rg_mesh.get_xbnum(); - int zbnum = rg_mesh.get_zbnum(); - - rg_mesh.add_data("double-data", gctl::NodeData, gctl::Packed, gctl::Scalar); - gctl::array *data_ptr = (gctl::array*) rg_mesh.get_datval("double-data"); - for (int k = 0; k < zbnum+1; k++) + for (int j = 0; j < ybnum+1; j++) { - for (int j = 0; j < ybnum+1; j++) + for (int i = 0; i < xbnum+1; i++) { - for (int i = 0; i < xbnum+1; i++) - { - data_ptr->at(i + j*(xbnum+1) + k*(xbnum+1)*(ybnum+1)) = i+j+k; - } + data.datval_[i + j*(xbnum+1) + k*(xbnum+1)*(ybnum+1)] = i+j+k; } } + } - rg_mesh.save_gmsh("data/out/sample7-out", "double-data", gctl::OverWrite); - } - catch(std::exception &e) - { - GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); - } + rg_mesh.save_gmsh("sample7-out", "double-data", gctl::OverWrite); return 0; +} +catch(std::exception &e) +{ + GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); } \ No newline at end of file diff --git a/example/mesh_ex8.cpp b/example/mesh_ex8.cpp index 6bcf468..46bcfac 100644 --- a/example/mesh_ex8.cpp +++ b/example/mesh_ex8.cpp @@ -27,24 +27,21 @@ #include "../lib/mesh.h" -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) try { - try - { - gctl::triangle_mesh t_mesh; - t_mesh.load_triangle("data/out/sample8", gctl::Packed); - t_mesh.add_data("example", gctl::ElemData, gctl::Packed, 1.0); + gctl::triangle_mesh t_mesh; + t_mesh.load_triangle("sample8", gctl::Packed); + t_mesh.add_data(gctl::ElemData, gctl::Scalar, "example", 1.0); - t_mesh.save_gmsh("data/out/sample8-out", "example", gctl::OverWrite, gctl::NotPacked); - t_mesh.save_binary("data/out/sample8-out"); + t_mesh.save_gmsh("sample8-out", "example", gctl::OverWrite, gctl::NotPacked); + t_mesh.save_binary("sample8-out"); - gctl::triangle_mesh t2_mesh; - t2_mesh.load_binary("data/out/sample8-out"); - t2_mesh.show_info(); - } - catch(std::exception &e) - { - GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); - } + gctl::triangle_mesh t2_mesh; + t2_mesh.load_binary("sample8-out"); + t2_mesh.show_info(); return 0; +} +catch(std::exception &e) +{ + GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); } \ No newline at end of file diff --git a/example/mesh_ex9.cpp b/example/mesh_ex9.cpp index 5305301..611ecf0 100644 --- a/example/mesh_ex9.cpp +++ b/example/mesh_ex9.cpp @@ -27,43 +27,39 @@ #include "../lib/mesh.h" -int main(int argc, char *argv[]) +int main(int argc, char *argv[]) try { - try + gctl::array xs(15); + for (int i = 0; i < 15; i++) { - gctl::array xs(15); - for (int i = 0; i < 15; i++) - { - xs[i] = i+1; - } - - gctl::array ys(10); - for (int i = 0; i < 10; i++) - { - ys[i] = i+1; - } - - gctl::linear_mesh_2d l2d_mesh; - l2d_mesh.init("mesh-example", "This is a linear mesh", 0.5, 0.5, xs, ys); - - int ybnum = l2d_mesh.get_ybnum(); - int xbnum = l2d_mesh.get_xbnum(); - - l2d_mesh.add_data("double-data", gctl::ElemData, gctl::Packed, gctl::Scalar); - gctl::array *data_ptr2 = (gctl::array*) l2d_mesh.get_datval("double-data"); - for (int j = 0; j < ybnum; j++) - { - for (int i = 0; i < xbnum; i++) - { - data_ptr2->at(i + j*xbnum) = i+j; - } - } - - l2d_mesh.save_gmsh("data/out/sample9-out", gctl::ElemData, gctl::OverWrite, gctl::NotPacked); + xs[i] = i+1; } - catch(std::exception &e) + + gctl::array ys(10); + for (int i = 0; i < 10; i++) { - GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); + ys[i] = i+1; } + + gctl::linear_mesh_2d l2d_mesh; + l2d_mesh.init("mesh-example", "This is a linear mesh", 0.5, 0.5, xs, ys); + + int ybnum = l2d_mesh.get_ybnum(); + int xbnum = l2d_mesh.get_xbnum(); + + gctl::meshdata &data = l2d_mesh.add_data(gctl::ElemData, gctl::Scalar, "double-data", 0.0); + for (int j = 0; j < ybnum; j++) + { + for (int i = 0; i < xbnum; i++) + { + data.datval_[i + j*xbnum] = i+j; + } + } + + l2d_mesh.save_gmsh("sample9-out", gctl::OverWrite, gctl::NotPacked); return 0; +} +catch(std::exception &e) +{ + GCTL_ShowWhatError(e.what(), GCTL_ERROR_ERROR, 0, 0, 0); } \ No newline at end of file diff --git a/lib/mesh/linear_mesh_2d.cpp b/lib/mesh/linear_mesh_2d.cpp index 4b18555..03e1294 100644 --- a/lib/mesh/linear_mesh_2d.cpp +++ b/lib/mesh/linear_mesh_2d.cpp @@ -30,11 +30,7 @@ void gctl::linear_mesh_2d::init(std::string in_name, std::string in_info, double xmin, double ymin, const gctl::array &xsizes, const gctl::array &ysizes) { - if (initialized) - { - throw std::runtime_error("[gctl::linear_mesh_2d] The mesh is already initialized."); - } - + check_initiated(true); // 检查网格是否已经初始化 base_mesh::init(LINEAR_MESH, MESH_2D, in_name, in_info); lm_xmin = xmin; @@ -44,8 +40,8 @@ void gctl::linear_mesh_2d::init(std::string in_name, std::string in_info, double lm_xsizes.resize(lm_xbnum); lm_ysizes.resize(lm_ybnum); - node_num = (lm_xbnum+1) * (lm_ybnum+1); - ele_num = lm_xbnum * lm_ybnum; + node_num_ = (lm_xbnum+1) * (lm_ybnum+1); + ele_num_ = lm_xbnum * lm_ybnum; for (int i = 0; i < lm_xbnum; i++) { @@ -57,8 +53,8 @@ void gctl::linear_mesh_2d::init(std::string in_name, std::string in_info, double lm_ysizes[i] = ysizes[i]; } - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); double x_p, y_p = lm_ymin - 0.5*lm_ysizes[0]; for (int j = 0; j < lm_ybnum+1; j++) @@ -88,16 +84,23 @@ void gctl::linear_mesh_2d::init(std::string in_name, std::string in_info, double } } - initialized = true; + initialized_ = true; + return; +} + +void gctl::linear_mesh_2d::show_mesh_dimension(std::ostream &os) const +{ + os << "node num: " << node_num_ << std::endl; + os << "elem num: " << ele_num_ << std::endl; + os << "x-range: " << get_xmin() << " -> " << get_xmax() << "\n"; + os << "y-range: " << get_ymin() << " -> " << get_ymax() << "\n"; + os << "dimension: " << lm_xbnum << ", " << lm_ybnum << "\n"; return; } void gctl::linear_mesh_2d::load_binary(std::string filename) { - if (initialized) - { - throw std::runtime_error("[gctl::linear_mesh_2d] The mesh is already initialized."); - } + check_initiated(true); // 检查网格是否已经初始化 std::ifstream infile; gctl::open_infile(infile, filename, ".2m", std::ios::in|std::ios::binary); @@ -113,8 +116,8 @@ void gctl::linear_mesh_2d::load_binary(std::string filename) lm_xsizes.resize(lm_xbnum); lm_ysizes.resize(lm_ybnum); - node_num = (lm_xbnum+1) * (lm_ybnum+1); - ele_num = lm_xbnum * lm_ybnum; + node_num_ = (lm_xbnum+1) * (lm_ybnum+1); + ele_num_ = lm_xbnum * lm_ybnum; for (int i = 0; i < lm_xbnum; i++) { @@ -126,8 +129,8 @@ void gctl::linear_mesh_2d::load_binary(std::string filename) infile.read((char*)lm_ysizes.get(i), sizeof(double)); } - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); double x_p, y_p = lm_ymin - 0.5*lm_ysizes[0]; for (int j = 0; j < lm_ybnum+1; j++) @@ -157,7 +160,7 @@ void gctl::linear_mesh_2d::load_binary(std::string filename) } } - initialized = true; + initialized_ = true; // 读入模型数据单元 load_datablock(infile); @@ -168,10 +171,7 @@ void gctl::linear_mesh_2d::load_binary(std::string filename) void gctl::linear_mesh_2d::save_binary(std::string filename) { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_2d] The mesh is not initialized."); - } + check_initiated(); // 检查网格是否已经初始化 std::ofstream outfile; gctl::open_outfile(outfile, filename, ".2m", std::ios::out|std::ios::binary); @@ -214,61 +214,63 @@ gctl::linear_mesh_2d::~linear_mesh_2d(){} int gctl::linear_mesh_2d::get_xbnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return lm_xbnum; } int gctl::linear_mesh_2d::get_ybnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return lm_ybnum; } double gctl::linear_mesh_2d::get_xmin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return lm_xmin; } double gctl::linear_mesh_2d::get_ymin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return lm_ymin; } +double gctl::linear_mesh_2d::get_xmax() const +{ + check_initiated(); // 检查网格是否已经初始化 + + double xmax = lm_xmin - 0.5*lm_xsizes[0]; + for (size_t i = 0; i < lm_xsizes.size(); i++) + { + xmax += lm_xsizes[i]; + } + xmax -= 0.5*lm_xsizes.back(); + return xmax; +} + +double gctl::linear_mesh_2d::get_ymax() const +{ + check_initiated(); // 检查网格是否已经初始化 + + double ymax = lm_ymin - 0.5*lm_ysizes[0]; + for (size_t i = 0; i < lm_ysizes.size(); i++) + { + ymax += lm_ysizes[i]; + } + ymax -= 0.5*lm_ysizes.back(); + return ymax; +} + const gctl::array *gctl::linear_mesh_2d::get_xsizes() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return &lm_xsizes; } const gctl::array *gctl::linear_mesh_2d::get_ysizes() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return &lm_ysizes; } @@ -282,14 +284,14 @@ void gctl::linear_mesh_2d::save_gmsh(std::string filename, index_packed_e packed } -void gctl::linear_mesh_2d::save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed) +void gctl::linear_mesh_2d::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, d_type, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, out_mode, packed); return; } void gctl::linear_mesh_2d::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, datname, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); return; } diff --git a/lib/mesh/linear_mesh_2d.h b/lib/mesh/linear_mesh_2d.h index 90623e6..df505ef 100644 --- a/lib/mesh/linear_mesh_2d.h +++ b/lib/mesh/linear_mesh_2d.h @@ -43,6 +43,8 @@ namespace gctl void init(std::string in_name, std::string in_info, double xmin, double ymin, const array &xsizes, const array &ysizes); + void show_mesh_dimension(std::ostream &os) const; + void load_binary(std::string filename); void save_binary(std::string filename); @@ -59,11 +61,13 @@ namespace gctl int get_ybnum() const; double get_xmin() const; double get_ymin() const; + double get_xmax() const; + double get_ymax() const; const array *get_xsizes() const; const array *get_ysizes() const; void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed = Packed); + void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); protected: diff --git a/lib/mesh/linear_mesh_3d.cpp b/lib/mesh/linear_mesh_3d.cpp index 0cabd92..c5df6d9 100644 --- a/lib/mesh/linear_mesh_3d.cpp +++ b/lib/mesh/linear_mesh_3d.cpp @@ -30,11 +30,7 @@ void gctl::linear_mesh_3d::init(std::string in_name, std::string in_info, double xmin, double ymin, double zmin, const array &xsizes, const array &ysizes, const array &zsizes) { - if (initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is already initialized."); - } - + check_initiated(true); // 检查网格是否已经初始化 base_mesh::init(LINEAR_MESH, MESH_3D, in_name, in_info); lm_xmin = xmin; @@ -47,8 +43,8 @@ void gctl::linear_mesh_3d::init(std::string in_name, std::string in_info, double lm_ysizes.resize(lm_ybnum); lm_zsizes.resize(lm_zbnum); - node_num = (lm_xbnum+1) * (lm_ybnum+1) * (lm_zbnum+1); - ele_num = lm_xbnum * lm_ybnum * lm_zbnum; + node_num_ = (lm_xbnum+1) * (lm_ybnum+1) * (lm_zbnum+1); + ele_num_ = lm_xbnum * lm_ybnum * lm_zbnum; for (int i = 0; i < lm_xbnum; i++) { @@ -65,8 +61,8 @@ void gctl::linear_mesh_3d::init(std::string in_name, std::string in_info, double lm_zsizes[i] = zsizes[i]; } - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); int tmp_index; double x_p, y_p, z_p = lm_zmin - 0.5*lm_zsizes[0]; @@ -112,16 +108,24 @@ void gctl::linear_mesh_3d::init(std::string in_name, std::string in_info, double } } - initialized = true; + initialized_ = true; + return; +} + +void gctl::linear_mesh_3d::show_mesh_dimension(std::ostream &os) const +{ + os << "node num: " << node_num_ << std::endl; + os << "elem num: " << ele_num_ << std::endl; + os << "x-range: " << get_xmin() << " -> " << get_xmax() << "\n"; + os << "y-range: " << get_ymin() << " -> " << get_ymax() << "\n"; + os << "z-range: " << get_zmin() << " -> " << get_zmax() << "\n"; + os << "dimension: " << lm_xbnum << ", " << lm_ybnum << ", " << lm_zbnum << "\n"; return; } void gctl::linear_mesh_3d::load_binary(std::string filename) { - if (initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is already initialized."); - } + check_initiated(true); // 检查网格是否已经初始化 std::ifstream infile; gctl::open_infile(infile, filename, ".2m", @@ -141,8 +145,8 @@ void gctl::linear_mesh_3d::load_binary(std::string filename) lm_xsizes.resize(lm_xbnum); lm_ysizes.resize(lm_ybnum); lm_zsizes.resize(lm_zbnum); - node_num = (lm_xbnum+1) * (lm_ybnum+1) * (lm_zbnum+1); - ele_num = lm_xbnum * lm_ybnum * lm_zbnum; + node_num_ = (lm_xbnum+1) * (lm_ybnum+1) * (lm_zbnum+1); + ele_num_ = lm_xbnum * lm_ybnum * lm_zbnum; for (int i = 0; i < lm_xbnum; i++) { @@ -159,8 +163,8 @@ void gctl::linear_mesh_3d::load_binary(std::string filename) infile.read((char*)lm_zsizes.get(i), sizeof(double)); } - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); int tmp_index; double x_p, y_p, z_p = lm_zmin - 0.5*lm_zsizes[0]; @@ -206,7 +210,7 @@ void gctl::linear_mesh_3d::load_binary(std::string filename) } } - initialized = true; + initialized_ = true; // 读入模型数据单元 load_datablock(infile); @@ -217,10 +221,7 @@ void gctl::linear_mesh_3d::load_binary(std::string filename) void gctl::linear_mesh_3d::save_binary(std::string filename) { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is not initialized."); - } + check_initiated(); // 检查网格是否已经初始化 std::ofstream outfile; gctl::open_outfile(outfile, filename, ".2m", @@ -272,91 +273,94 @@ gctl::linear_mesh_3d::~linear_mesh_3d(){} int gctl::linear_mesh_3d::get_xbnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return lm_xbnum; } int gctl::linear_mesh_3d::get_ybnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return lm_ybnum; } int gctl::linear_mesh_3d::get_zbnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return lm_zbnum; } double gctl::linear_mesh_3d::get_xmin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return lm_xmin; } double gctl::linear_mesh_3d::get_ymin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return lm_ymin; } double gctl::linear_mesh_3d::get_zmin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return lm_zmin; } +double gctl::linear_mesh_3d::get_xmax() const +{ + check_initiated(); // 检查网格是否已经初始化 + + double xmax = lm_xmin - 0.5*lm_xsizes[0]; + for (size_t i = 0; i < lm_xsizes.size(); i++) + { + xmax += lm_xsizes[i]; + } + xmax -= 0.5*lm_xsizes.back(); + return xmax; +} + +double gctl::linear_mesh_3d::get_ymax() const +{ + check_initiated(); // 检查网格是否已经初始化 + + double ymax = lm_ymin - 0.5*lm_ysizes[0]; + for (size_t i = 0; i < lm_ysizes.size(); i++) + { + ymax += lm_ysizes[i]; + } + ymax -= 0.5*lm_ysizes.back(); + return ymax; +} + +double gctl::linear_mesh_3d::get_zmax() const +{ + check_initiated(); // 检查网格是否已经初始化 + + double zmax = lm_zmin - 0.5*lm_zsizes[0]; + for (size_t i = 0; i < lm_zsizes.size(); i++) + { + zmax += lm_zsizes[i]; + } + zmax -= 0.5*lm_zsizes.back(); + return zmax; +} + const gctl::array *gctl::linear_mesh_3d::get_xsizes() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return &lm_xsizes; } const gctl::array *gctl::linear_mesh_3d::get_ysizes() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return &lm_ysizes; } const gctl::array *gctl::linear_mesh_3d::get_zsizes() const { - if (!initialized) - { - throw std::runtime_error("[gctl::linear_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return &lm_zsizes; } @@ -369,14 +373,14 @@ void gctl::linear_mesh_3d::save_gmsh(std::string filename, index_packed_e packed return; } -void gctl::linear_mesh_3d::save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed) +void gctl::linear_mesh_3d::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, d_type, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, out_mode, packed); return; } void gctl::linear_mesh_3d::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, datname, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); return; } diff --git a/lib/mesh/linear_mesh_3d.h b/lib/mesh/linear_mesh_3d.h index 981581e..b27b537 100644 --- a/lib/mesh/linear_mesh_3d.h +++ b/lib/mesh/linear_mesh_3d.h @@ -44,6 +44,8 @@ namespace gctl double zmin, const array &xsizes, const array &ysizes, const array &zsizes); + void show_mesh_dimension(std::ostream &os) const; + void load_binary(std::string filename); void save_binary(std::string filename); @@ -63,12 +65,15 @@ namespace gctl double get_xmin() const; double get_ymin() const; double get_zmin() const; + double get_xmax() const; + double get_ymax() const; + double get_zmax() const; const array *get_xsizes() const; const array *get_ysizes() const; const array *get_zsizes() const; void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed = Packed); + void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); protected: diff --git a/lib/mesh/mesh.cpp b/lib/mesh/mesh.cpp index 4b98173..5ae0907 100644 --- a/lib/mesh/mesh.cpp +++ b/lib/mesh/mesh.cpp @@ -1,4 +1,4 @@ -/******************************************************** +/******************************************************** * ██████╗ ██████╗████████╗██╗ * ██╔════╝ ██╔════╝╚══██╔══╝██║ * ██║ ███╗██║ ██║ ██║ @@ -29,758 +29,485 @@ gctl::base_mesh::base_mesh() { - initialized = false; - //std::clog << "A new mesh object is created." << std::endl; + meshtype_ = UNDEFINED; + meshdim_ = MESH_0D; + meshname_ = "Untitled"; + meshinfo_ = "Undefined"; + node_num_ = ele_num_ = 0; + initialized_ = false; } gctl::base_mesh::~base_mesh() { clear(); - //std::clog << "A mesh object is destroyed." << std::endl; } void gctl::base_mesh::clear() { - meshdata *data_ptr; - if (!saved_data.empty()) - { - for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) - { - data_ptr = *iter; - meshdata::destroy(data_ptr); - } - saved_data.clear(); - } - - initialized = false; + meshtype_ = UNDEFINED; + meshdim_ = MESH_0D; + meshname_ = "Untitled"; + meshinfo_ = "Undefined"; + node_num_ = ele_num_ = 0; + initialized_ = false; + destroy_vector(datalist_); return; } bool gctl::base_mesh::initiated() const { - return initialized; + return initialized_; } bool gctl::base_mesh::saved(std::string datname) const { - if (saved_data.empty()) - { - return false; - } + if (datalist_.empty()) return false; else { - meshdata *data_ptr = nullptr; - // 这里我们需要使用常量迭代器 - std::list::const_iterator c_iter; - for (c_iter = saved_data.begin(); c_iter != saved_data.end(); ++c_iter) - { - data_ptr = *c_iter; - if (data_ptr->get_datname() == datname) - { - return true; - } - } + for (size_t i = 0; i < datalist_.size(); i++) + { + if (datalist_[i].name_ == datname) return true; + } + return false; } } -gctl::meshdata *gctl::base_mesh::get_data(std::string datname) const +gctl::meshdata &gctl::base_mesh::get_data(std::string datname) { - if (saved_data.empty()) - { - throw std::runtime_error("[gctl::base_mesh] No data saved."); - } - - meshdata *curr_data = nullptr; - std::list::const_iterator c_iter; - for (c_iter = saved_data.begin(); c_iter != saved_data.end(); ++c_iter) - { - curr_data = *c_iter; - if (curr_data->get_datname() == datname) - { - return curr_data; - } - } - - throw gctl::runtime_error("[gctl::base_mesh] No data found by the name: " + datname); -} - -void gctl::base_mesh::get_all_data(array& out_list) const -{ - if (saved_data.empty()) - { - throw runtime_error("[gctl::base_mesh] No data saved."); - } - - int c_count = 0; - out_list.resize(saved_data.size()); - - meshdata *curr_data = nullptr; - std::list::const_iterator c_iter; - for (c_iter = saved_data.begin(); c_iter != saved_data.end(); ++c_iter) - { - curr_data = *c_iter; - out_list[c_count] = curr_data; - c_count++; - } - return; -} - -void *gctl::base_mesh::get_datval(std::string datname) const -{ - meshdata *curr_data = get_data(datname); - return curr_data->get_datval_ptr(); + return datalist_[data_index(datname)]; } void gctl::base_mesh::remove_data(std::string datname) { - if (saved_data.empty()) - { - throw runtime_error("[gctl::base_mesh] No data saved."); - } - - meshdata *curr_data; - for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) - { - curr_data = *iter; - if (curr_data->get_datname() == datname) - { - meshdata::destroy(curr_data); - iter = saved_data.erase(iter); - //std::clog << "Meshdata: " << datname << " is destroyed." << std::endl; - break; - } - } + int idx = data_index(datname); + datalist_.erase(datalist_.begin() + idx); return; } void gctl::base_mesh::show_info(std::ostream &os) const { - if (meshtype == REGULAR_MESH) os << "Mesh: Regular | "; - if (meshtype == LINEAR_MESH) os << "Mesh: Linear | "; - if (meshtype == TRI_TET_MESH) os << "Mesh: Unstructured | "; - if (meshtype == REGULAR_MESH_SPH) os << "Mesh: Regular (spherical) | "; - if (meshtype == LINEAR_MESH_SPH) os << "Mesh: Linear (spherical) | "; - if (meshtype == TRI_TET_MESH_SPH) os << "Mesh: Unstructured (spherical) | "; - if (meshtype == REGULAR_GRID) os << "Mesh: Grid | "; + if (meshtype_ == UNDEFINED) os << "Undefined | "; + if (meshtype_ == REGULAR_MESH) os << "Regular | "; + if (meshtype_ == LINEAR_MESH) os << "Linear | "; + if (meshtype_ == TRI_TET_MESH) os << "Unstructured | "; + if (meshtype_ == REGULAR_MESH_SPH) os << "Regular (spherical) | "; + if (meshtype_ == LINEAR_MESH_SPH) os << "Linear (spherical) | "; + if (meshtype_ == TRI_TET_MESH_SPH) os << "Unstructured (spherical) | "; + if (meshtype_ == REGULAR_GRID) os << "Grid | "; - if (meshdim == MESH_2D) os << "2D" << std::endl; - else if (meshdim == MESH_3D) os << "3D" << std::endl; + if (meshdim_ == MESH_0D) os << "Unknown" << std::endl; + else if (meshdim_ == MESH_2D) os << "2D" << std::endl; + else if (meshdim_ == MESH_3D) os << "3D" << std::endl; - os << "Name: " << meshname << std::endl; - os << "Info: " << meshinfo << std::endl; + os << "Name: " << meshname_ << std::endl; + os << "Info: " << meshinfo_ << std::endl; show_mesh_dimension(os); - meshdata *curr_data; - std::list::const_iterator c_iter; - for (c_iter = saved_data.begin(); c_iter != saved_data.end(); ++c_iter) - { - curr_data = *c_iter; - curr_data->show_info(); - } - return; -} - -void gctl::base_mesh::rename_data(std::string oldname, std::string newname) -{ - meshdata *curr_data = get_data(oldname); - curr_data->set_datname(newname); + for (size_t i = 0; i < datalist_.size(); i++) + { + datalist_[i].show_info(os); + } return; } gctl::mesh_type_e gctl::base_mesh::get_meshtype() const { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } - - return meshtype; + check_initiated(); + return meshtype_; } gctl::mesh_dim_e gctl::base_mesh::get_meshdim() const { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } - - return meshdim; + check_initiated(); + return meshdim_; } int gctl::base_mesh::get_nodenum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } - - return node_num; + check_initiated(); + return node_num_; } int gctl::base_mesh::get_elenum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } - - return ele_num; + check_initiated(); + return ele_num_; } int gctl::base_mesh::get_datanum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } - - return saved_data.size(); + check_initiated(); + return datalist_.size(); } std::string gctl::base_mesh::get_meshname() const { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } - - return meshname; + check_initiated(); + return meshname_; } void gctl::base_mesh::set_meshname(std::string in_name) { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } - - if (in_name.empty()) - { - throw std::runtime_error("[gctl::base_mesh] The input name is empty."); - } - - meshname = in_name; + check_initiated(); + meshname_ = in_name; return; } std::string gctl::base_mesh::get_meshinfo() const { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } - - return meshinfo; + check_initiated(); + return meshinfo_; } void gctl::base_mesh::set_meshinfo(std::string in_info) { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } - - if (in_info == "") - { - throw runtime_error("[gctl::base_mesh] The input info. is empty."); - } - - meshinfo = in_info; + check_initiated(); + meshinfo_ = in_info; return; } -gctl::meshdata *gctl::base_mesh::add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, double init_val) +gctl::meshdata &gctl::base_mesh::add_data(mesh_data_type_e in_loctype, mesh_data_value_e in_valtype, + std::string name, double init_val, bool if_output, double nan_val) { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } + check_initiated(); + meshdata new_data(in_loctype, in_valtype, 0, name, if_output, nan_val); - meshdata *data_ptr; - if(saved(in_name)) - { - data_ptr = get_data(in_name); - if (data_ptr->get_valtype() != Scalar || data_ptr->get_dattype() != in_type) - { - throw gctl::runtime_error("[gctl::base_mesh] A data object is already created with a different data or value type by the name:" + in_name); - } + if (in_loctype == NodeData && in_valtype == Scalar) new_data.datval_.resize(node_num_, init_val); + else if (in_loctype == ElemData && in_valtype == Scalar) new_data.datval_.resize(ele_num_, init_val); + else if (in_loctype == NodeData && in_valtype == Vector) new_data.datval_.resize(3*node_num_, init_val); + else if (in_loctype == ElemData && in_valtype == Vector) new_data.datval_.resize(3*ele_num_, init_val); + else if (in_loctype == NodeData && in_valtype == Tensor) new_data.datval_.resize(9*node_num_, init_val); + else if (in_loctype == ElemData && in_valtype == Tensor) new_data.datval_.resize(9*ele_num_, init_val); + else throw std::runtime_error("[gctl::base_mesh] Fail to initialize the new data."); - // 存在一个同名 同数据类型 同赋值类型的数据 则将其数据设置为初始值 - array* val_ptr = (array*) data_ptr->get_datval_ptr(); - val_ptr->assign_all(init_val); - return data_ptr; - } - - if (in_type == NodeData) - { - data_ptr = meshdata_scalar::create(in_name, in_type, node_num, if_output, init_val); - } - else if (in_type == ElemData || in_type == ElemData2D || in_type == ElemData3D) - { - data_ptr = meshdata_scalar::create(in_name, in_type, ele_num, if_output, init_val); - } - - saved_data.push_back(data_ptr); - return data_ptr; + datalist_.push_back(new_data); + return datalist_.back(); } -gctl::meshdata *gctl::base_mesh::add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, gctl::point3dc init_val) +gctl::meshdata &gctl::base_mesh::add_data(mesh_data_type_e in_loctype, std::string name, + const array &init_arr, bool if_output, double nan_val) { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } + check_initiated(); + meshdata new_data(in_loctype, Scalar, 0, name, if_output, nan_val); - meshdata *data_ptr; - if(saved(in_name)) - { - data_ptr = get_data(in_name); - if (data_ptr->get_valtype() != Scalar || data_ptr->get_dattype() != in_type) - { - throw gctl::runtime_error("[gctl::base_mesh] A data object is already created with a different data or value type by the name:" + in_name); - } + if (in_loctype == NodeData) + { + if (init_arr.size() != node_num_) throw std::runtime_error("[gctl::base_mesh] Invalid input data size."); + new_data.datval_ = init_arr; + } + else if (in_loctype == ElemData) + { + if (init_arr.size() != ele_num_) throw std::runtime_error("[gctl::base_mesh] Invalid input data size."); + new_data.datval_ = init_arr; + } + else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); - // 存在一个同名 同数据类型 同赋值类型的数据 则将其数据设置为初始值 - array* val_ptr = (array*) data_ptr->get_datval_ptr(); - val_ptr->assign_all(init_val); - return data_ptr; - } - - if (in_type == NodeData) - { - data_ptr = meshdata_vector::create(in_name, in_type, node_num, if_output, init_val); - } - else if (in_type == ElemData || in_type == ElemData2D || in_type == ElemData3D) - { - data_ptr = meshdata_vector::create(in_name, in_type, ele_num, if_output, init_val); - } - - saved_data.push_back(data_ptr); - return data_ptr; + datalist_.push_back(new_data); + return datalist_.back(); } -gctl::meshdata *gctl::base_mesh::add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, gctl::tensor init_val) +gctl::meshdata &gctl::base_mesh::add_data(mesh_data_type_e in_loctype, std::string name, + const array &init_arr, bool if_output, double nan_val) { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } + check_initiated(); + meshdata new_data(in_loctype, Vector, 0, name, if_output, nan_val); - meshdata *data_ptr; - if(saved(in_name)) - { - data_ptr = get_data(in_name); - if (data_ptr->get_valtype() != Scalar || data_ptr->get_dattype() != in_type) - { - throw gctl::runtime_error("[gctl::base_mesh] A data object is already created with a different data or value type by the name:" + in_name); - } + if (in_loctype == NodeData) + { + if (init_arr.size() != node_num_) throw std::runtime_error("[gctl::base_mesh] Invalid input data size."); - // 存在一个同名 同数据类型 同赋值类型的数据 则将其数据设置为初始值 - array* val_ptr = (array*) data_ptr->get_datval_ptr(); - val_ptr->assign_all(init_val); - return data_ptr; - } + new_data.datval_.resize(3*node_num_); + for (size_t i = 0; i < node_num_; i++) + { + new_data.datval_[3*i] = init_arr[i].x; + new_data.datval_[3*i+1] = init_arr[i].y; + new_data.datval_[3*i+2] = init_arr[i].z; + } + } + else if (in_loctype == ElemData) + { + if (init_arr.size() != ele_num_) throw std::runtime_error("[gctl::base_mesh] Invalid input data size."); + + new_data.datval_.resize(3*ele_num_); + for (size_t i = 0; i < ele_num_; i++) + { + new_data.datval_[3*i] = init_arr[i].x; + new_data.datval_[3*i+1] = init_arr[i].y; + new_data.datval_[3*i+2] = init_arr[i].z; + } + } + else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); - if (in_type == NodeData) - { - data_ptr = meshdata_tensor::create(in_name, in_type, node_num, if_output, init_val); - } - else if (in_type == ElemData || in_type == ElemData2D || in_type == ElemData3D) - { - data_ptr = meshdata_tensor::create(in_name, in_type, ele_num, if_output, init_val); - } - - saved_data.push_back(data_ptr); - return data_ptr; + datalist_.push_back(new_data); + return datalist_.back(); } -gctl::meshdata *gctl::base_mesh::add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, mesh_data_value_e val_type) +gctl::meshdata &gctl::base_mesh::add_data(mesh_data_type_e in_loctype, std::string name, + const array &init_arr, bool if_output, double nan_val) { - if (!initialized) - { - throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); - } + check_initiated(); + meshdata new_data(in_loctype, Tensor, 0, name, if_output, nan_val); - meshdata *data_ptr; - if(saved(in_name)) - { - data_ptr = get_data(in_name); - if (data_ptr->get_valtype() != Scalar || data_ptr->get_dattype() != in_type) - { - throw gctl::runtime_error("[gctl::base_mesh] A data object is already created with a different data or value type by the name:" + in_name); - } + if (in_loctype == NodeData) + { + if (init_arr.size() != node_num_) throw std::runtime_error("[gctl::base_mesh] Invalid input data size."); - return data_ptr; - } + new_data.datval_.resize(9*node_num_); + for (size_t i = 0; i < node_num_; i++) + { + new_data.datval_[9*i] = init_arr[i].val[0][0]; + new_data.datval_[9*i+1] = init_arr[i].val[0][1]; + new_data.datval_[9*i+2] = init_arr[i].val[0][2]; + new_data.datval_[9*i+3] = init_arr[i].val[1][0]; + new_data.datval_[9*i+4] = init_arr[i].val[1][1]; + new_data.datval_[9*i+5] = init_arr[i].val[1][2]; + new_data.datval_[9*i+6] = init_arr[i].val[2][0]; + new_data.datval_[9*i+7] = init_arr[i].val[2][1]; + new_data.datval_[9*i+8] = init_arr[i].val[2][2]; + } + } + else if (in_loctype == ElemData) + { + if (init_arr.size() != ele_num_) throw std::runtime_error("[gctl::base_mesh] Invalid input data size."); + + new_data.datval_.resize(9*ele_num_); + for (size_t i = 0; i < ele_num_; i++) + { + new_data.datval_[9*i] = init_arr[i].val[0][0]; + new_data.datval_[9*i+1] = init_arr[i].val[0][1]; + new_data.datval_[9*i+2] = init_arr[i].val[0][2]; + new_data.datval_[9*i+3] = init_arr[i].val[1][0]; + new_data.datval_[9*i+4] = init_arr[i].val[1][1]; + new_data.datval_[9*i+5] = init_arr[i].val[1][2]; + new_data.datval_[9*i+6] = init_arr[i].val[2][0]; + new_data.datval_[9*i+7] = init_arr[i].val[2][1]; + new_data.datval_[9*i+8] = init_arr[i].val[2][2]; + } + } + else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); - if (val_type == Scalar && in_type == NodeData) - { - data_ptr = meshdata_scalar::create(in_name, in_type, node_num, if_output, 0.0); - } - else if (val_type == Scalar && in_type == ElemData) - { - data_ptr = meshdata_scalar::create(in_name, in_type, ele_num, if_output, 0.0); - } - else if (val_type == Vector && in_type == NodeData) - { - point3dc init_val = {0.0, 0.0, 0.0}; - data_ptr = meshdata_vector::create(in_name, in_type, node_num, if_output, init_val); - } - else if (val_type == Vector && in_type == ElemData) - { - point3dc init_val = {0.0, 0.0, 0.0}; - data_ptr = meshdata_vector::create(in_name, in_type, ele_num, if_output, init_val); - } - else if (val_type == Tensor && in_type == NodeData) - { - tensor init_val = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; - data_ptr = meshdata_tensor::create(in_name, in_type, node_num, if_output, init_val); - } - else if (val_type == Tensor && in_type == ElemData) - { - tensor init_val = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; - data_ptr = meshdata_tensor::create(in_name, in_type, ele_num, if_output, init_val); - } - - - saved_data.push_back(data_ptr); - return data_ptr; + datalist_.push_back(new_data); + return datalist_.back(); } -void gctl::base_mesh::init(std::string in_name, std::string in_info, int xnum, int ynum, - double xmin, double ymin, double dx, double dy) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::init(std::string in_name, std::string in_info, int xbnum, int ybnum, int zbnum, - double xmin, double ymin, double zmin, double xsize, double ysize, double zsize) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::init(std::string in_name, std::string in_info, double lon_min, double lat_min, - double rad_min, double lon_size, double lat_size, double rad_size, int lon_bnum, int lat_bnum, int rad_bnum) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::init(std::string in_name, std::string in_info, double xmin, double ymin, - const gctl::array &xsizes, const gctl::array &ysizes) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::init(std::string in_name, std::string in_info, double xmin, double ymin, - double zmin, const gctl::array &xsizes, const gctl::array &ysizes, - const gctl::array &zsizes) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::init(std::string in_name, std::string in_info, const gctl::array &in_nodes, - const gctl::array &in_triangles) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::init(std::string in_name, std::string in_info, const gctl::array &in_nodes, - const gctl::array &in_tets) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::show_mesh_dimension(std::ostream &os) const -{ - return; -} - -void gctl::base_mesh::save_gmsh(std::string filename, index_packed_e packed) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed) +void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out_mode, index_packed_e packed) { if (out_mode == OverWrite) save_gmsh(filename, packed); std::ofstream outfile; gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); - meshdata *curr_data; - for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) + for (size_t i = 0; i < datalist_.size(); i++) { - curr_data = *iter; - if (curr_data->get_dattype() == d_type && d_type == NodeData && - curr_data->get_valtype() == Scalar && curr_data->get_output()) + if (datalist_[i].loctype_ == NodeData) { - gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); - gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::NodeData, packed); + if (datalist_[i].valtype_ == Scalar) gctl::save_gmsh_data(outfile, datalist_[i].name_, datalist_[i].datval_, gctl::NodeData, packed); + else if (datalist_[i].valtype_ == Vector) + { + array vec_data(node_num_); + for (size_t j = 0; j < node_num_; j++) + { + vec_data[j].x = datalist_[i].datval_[3*j]; + vec_data[j].y = datalist_[i].datval_[3*j+1]; + vec_data[j].z = datalist_[i].datval_[3*j+2]; + } + + gctl::save_gmsh_data(outfile, datalist_[i].name_, vec_data, gctl::NodeData, packed); + } + //else if (datalist_[i].valtype_ == Tensor) + //{ + // array ten_data(node_num_); + // for (size_t j = 0; j < node_num_; j++) + // { + // ten_data[j].val[0][0] = datalist_[i].datval_[9*j]; + // ten_data[j].val[0][1] = datalist_[i].datval_[9*j+1]; + // ten_data[j].val[0][2] = datalist_[i].datval_[9*j+2]; + // ten_data[j].val[1][0] = datalist_[i].datval_[9*j+3]; + // ten_data[j].val[1][1] = datalist_[i].datval_[9*j+4]; + // ten_data[j].val[1][2] = datalist_[i].datval_[9*j+5]; + // ten_data[j].val[2][0] = datalist_[i].datval_[9*j+6]; + // ten_data[j].val[2][1] = datalist_[i].datval_[9*j+7]; + // ten_data[j].val[2][2] = datalist_[i].datval_[9*j+8]; + // } + // + // gctl::save_gmsh_data(outfile, datalist_[i].name_, ten_data, gctl::NodeData, packed); + //} + else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } - else if (curr_data->get_dattype() == d_type && d_type == ElemData && - curr_data->get_valtype() == Scalar && curr_data->get_output()) + else if (datalist_[i].loctype_ == ElemData) { - gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); - gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::ElemData, packed); - } - else if (curr_data->get_dattype() == d_type && d_type == NodeData && - curr_data->get_valtype() == Vector && curr_data->get_output()) - { - gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); - gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::NodeData, packed); - } - else if (curr_data->get_dattype() == d_type && d_type == ElemData && - curr_data->get_valtype() == Vector && curr_data->get_output()) - { - gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); - gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::ElemData, packed); + if (datalist_[i].valtype_ == Scalar) gctl::save_gmsh_data(outfile, datalist_[i].name_, datalist_[i].datval_, gctl::ElemData, packed); + else if (datalist_[i].valtype_ == Vector) + { + array vec_data(ele_num_); + for (size_t j = 0; j < ele_num_; j++) + { + vec_data[j].x = datalist_[i].datval_[3*j]; + vec_data[j].y = datalist_[i].datval_[3*j+1]; + vec_data[j].z = datalist_[i].datval_[3*j+2]; + } + + gctl::save_gmsh_data(outfile, datalist_[i].name_, vec_data, gctl::ElemData, packed); + } + //else if (datalist_[i].valtype_ == Tensor) + //{ + // array ten_data(ele_num_); + // for (size_t j = 0; j < ele_num_; j++) + // { + // ten_data[j].val[0][0] = datalist_[i].datval_[9*j]; + // ten_data[j].val[0][1] = datalist_[i].datval_[9*j+1]; + // ten_data[j].val[0][2] = datalist_[i].datval_[9*j+2]; + // ten_data[j].val[1][0] = datalist_[i].datval_[9*j+3]; + // ten_data[j].val[1][1] = datalist_[i].datval_[9*j+4]; + // ten_data[j].val[1][2] = datalist_[i].datval_[9*j+5]; + // ten_data[j].val[2][0] = datalist_[i].datval_[9*j+6]; + // ten_data[j].val[2][1] = datalist_[i].datval_[9*j+7]; + // ten_data[j].val[2][2] = datalist_[i].datval_[9*j+8]; + // } + // + // gctl::save_gmsh_data(outfile, datalist_[i].name_, ten_data, gctl::ElemData, packed); + //} + else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } + else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); } outfile.close(); return; } -void gctl::base_mesh::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) +void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) { - meshdata *curr_data = get_data(datname); - - if (!curr_data->get_output()) - { - throw gctl::runtime_error("[gctl::base_mesh] Output is disabled for the data:" + datname); - } - if (out_mode == OverWrite) save_gmsh(filename, packed); std::ofstream outfile; gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); - if (curr_data->get_valtype() == Scalar) + const meshdata &data = get_data(datname); + if (data.loctype_ == NodeData) { - gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); - if (curr_data->get_dattype() == NodeData) + if (data.valtype_ == Scalar) gctl::save_gmsh_data(outfile, data.name_, data.datval_, gctl::NodeData, packed); + else if (data.valtype_ == Vector) { - gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::NodeData, packed); - } - else if (curr_data->get_dattype() == ElemData) - { - gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::ElemData, packed); + array vec_data(node_num_); + for (size_t j = 0; j < node_num_; j++) + { + vec_data[j].x = data.datval_[3*j]; + vec_data[j].y = data.datval_[3*j+1]; + vec_data[j].z = data.datval_[3*j+2]; + } + + gctl::save_gmsh_data(outfile, data.name_, vec_data, gctl::NodeData, packed); } + //else if (data.valtype_ == Tensor) + //{ + // array ten_data(node_num_); + // for (size_t j = 0; j < node_num_; j++) + // { + // ten_data[j].val[0][0] = data.datval_[9*j]; + // ten_data[j].val[0][1] = data.datval_[9*j+1]; + // ten_data[j].val[0][2] = data.datval_[9*j+2]; + // ten_data[j].val[1][0] = data.datval_[9*j+3]; + // ten_data[j].val[1][1] = data.datval_[9*j+4]; + // ten_data[j].val[1][2] = data.datval_[9*j+5]; + // ten_data[j].val[2][0] = data.datval_[9*j+6]; + // ten_data[j].val[2][1] = data.datval_[9*j+7]; + // ten_data[j].val[2][2] = data.datval_[9*j+8]; + // } + // + // gctl::save_gmsh_data(outfile, data.name_, ten_data, gctl::NodeData, packed); + //} + else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } - else if (curr_data->get_valtype() == Vector) + else if (data.loctype_ == ElemData) { - gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); - if (curr_data->get_dattype() == NodeData) + if (data.valtype_ == Scalar) gctl::save_gmsh_data(outfile, data.name_, data.datval_, gctl::ElemData, packed); + else if (data.valtype_ == Vector) { - gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::NodeData, packed); - } - else if (curr_data->get_dattype() == ElemData) - { - gctl::save_gmsh_data(outfile, curr_data->get_datname(), *data_ptr, gctl::ElemData, packed); - } - } - else if (curr_data->get_valtype() == Tensor) - { - gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); - if (curr_data->get_dattype() == NodeData) - { - array v(data_ptr->size()); - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[0][0]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txx", v, gctl::NodeData, packed); - - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[0][1]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txy", v, gctl::NodeData, packed); - - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[0][2]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txz", v, gctl::NodeData, packed); - - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[1][1]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tyy", v, gctl::NodeData, packed); - - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[1][2]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tyz", v, gctl::NodeData, packed); - - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[2][2]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tzz", v, gctl::NodeData, packed); - } - else if (curr_data->get_dattype() == ElemData) - { - array v(data_ptr->size()); - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[0][0]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txx", v, gctl::ElemData, packed); - - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[0][1]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txy", v, gctl::ElemData, packed); - - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[0][2]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Txz", v, gctl::ElemData, packed); - - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[1][1]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tyy", v, gctl::ElemData, packed); - - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[1][2]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tyz", v, gctl::ElemData, packed); - - for (size_t i = 0; i < v.size(); i++) - { - v[i] = data_ptr->at(i).val[2][2]; - } - gctl::save_gmsh_data(outfile, curr_data->get_datname() + "_Tzz", v, gctl::ElemData, packed); + array vec_data(ele_num_); + for (size_t j = 0; j < ele_num_; j++) + { + vec_data[j].x = data.datval_[3*j]; + vec_data[j].y = data.datval_[3*j+1]; + vec_data[j].z = data.datval_[3*j+2]; + } + + gctl::save_gmsh_data(outfile, data.name_, vec_data, gctl::ElemData, packed); } + //else if (data.valtype_ == Tensor) + //{ + // array ten_data(ele_num_); + // for (size_t j = 0; j < ele_num_; j++) + // { + // ten_data[j].val[0][0] = data.datval_[9*j]; + // ten_data[j].val[0][1] = data.datval_[9*j+1]; + // ten_data[j].val[0][2] = data.datval_[9*j+2]; + // ten_data[j].val[1][0] = data.datval_[9*j+3]; + // ten_data[j].val[1][1] = data.datval_[9*j+4]; + // ten_data[j].val[1][2] = data.datval_[9*j+5]; + // ten_data[j].val[2][0] = data.datval_[9*j+6]; + // ten_data[j].val[2][1] = data.datval_[9*j+7]; + // ten_data[j].val[2][2] = data.datval_[9*j+8]; + // } + // + // gctl::save_gmsh_data(outfile, data.name_, ten_data, gctl::ElemData, packed); + //} + else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } + else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); outfile.close(); return; } -void gctl::base_mesh::load_data_cloud(const array &in_posi, const array &in_val, - double search_xlen, double search_ylen, double search_deg, std::string datname, mesh_data_type_e d_type) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::load_data_cloud(const array &in_posi, const array &in_val, - double search_xlen, double search_ylen, double search_deg, std::string datname, mesh_data_type_e d_type) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::extract_points(std::string datname, const array &in_posi, array &out_val) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::extract_points(std::string datname, const array &in_posi, array &out_val) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::extract_profile(std::string datname, const point2dc &start_p, const point2dc &end_p, int size_p, - array &out_posi, array &out_val) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::extract_profile(std::string datname, const point3dc &start_p, const point3dc &end_p, int size_p, - double dh, array &out_posi, array &out_val) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, double in_val) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, point3dc in_val) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, tensor in_val) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::purge_data(std::string datname, double in_val) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::purge_data(std::string datname, point3dc in_val) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - -void gctl::base_mesh::purge_data(std::string datname, tensor in_val) -{ - throw runtime_error("[gctl::base_mesh] Invalid mesh type for calling this function."); - return; -} - /** * 以下是类的私有函数，可以简单一些 */ +void gctl::base_mesh::check_initiated(bool inverse) const +{ + if (inverse == true) + { + if (initialized_) throw std::runtime_error("[gctl::base_mesh] Mesh already initialized."); + else return; + } + + if (!initialized_) throw std::runtime_error("[gctl::base_mesh] Mesh not initialized."); + else return; +} + void gctl::base_mesh::init(mesh_type_e in_type, mesh_dim_e in_dim, std::string in_name, std::string in_info) { - if (in_name == "") - { - throw std::runtime_error("[gctl::base_mesh] The input name is empty."); - } + if (in_name == "") throw std::runtime_error("[gctl::base_mesh] The input name is empty."); + if (in_info == "") throw std::runtime_error("[gctl::base_mesh] The input info. is empty."); - if (in_info == "") - { - throw std::runtime_error("[gctl::base_mesh] The input info. is empty."); - } - - meshname = in_name; - meshinfo = in_info; - meshtype = in_type; - meshdim = in_dim; + meshname_ = in_name; + meshinfo_ = in_info; + meshtype_ = in_type; + meshdim_ = in_dim; return; } +int gctl::base_mesh::data_index(std::string datname) const +{ + if (datalist_.empty()) throw std::runtime_error("[gctl::base_mesh] No data saved."); + + for (size_t i = 0; i < datalist_.size(); i++) + { + if (datalist_[i].name_ == datname) return i; + } + + throw gctl::runtime_error("[gctl::base_mesh] No data found by the name: " + datname); +} + void gctl::base_mesh::load_headinfo(std::ifstream &infile, mesh_type_e expected_type, mesh_dim_e expected_dim) { // 读入网格头信息 - infile.read((char*)&meshtype, sizeof(int)); - infile.read((char*)&meshdim, sizeof(int)); - if (meshdim != expected_dim || meshtype != expected_type) + infile.read((char*)&meshtype_, sizeof(int)); + infile.read((char*)&meshdim_, sizeof(int)); + if (meshdim_ != expected_dim || meshtype_ != expected_type) { infile.close(); throw std::runtime_error("[gctl::base_mesh] Invalid input mesh type."); @@ -788,36 +515,26 @@ void gctl::base_mesh::load_headinfo(std::ifstream &infile, mesh_type_e expected_ int info_size; infile.read((char*)&info_size, sizeof(int)); - meshname.resize(info_size); - infile.read((char*)meshname.c_str(), info_size); + meshname_.resize(info_size); + infile.read((char*)meshname_.c_str(), info_size); infile.read((char*)&info_size, sizeof(int)); - meshinfo.resize(info_size); - infile.read((char*)meshinfo.c_str(), info_size); + meshinfo_.resize(info_size); + infile.read((char*)meshinfo_.c_str(), info_size); return; } void gctl::base_mesh::load_datablock(std::ifstream &infile) { - meshdata *new_data; - int in_num, info_size; - mesh_data_type_e in_dattype; - mesh_data_value_e in_valtype; - std::string in_name; + int in_num; + meshdata new_data; infile.read((char*)&in_num, sizeof(int)); for (int i = 0; i < in_num; i++) { - // 首先读入三个整形和数据名称 - infile.read((char*)&in_dattype, sizeof(int)); - infile.read((char*)&in_valtype, sizeof(int)); - infile.read((char*)&info_size, sizeof(int)); - - in_name.resize(info_size); - infile.read((char*)in_name.c_str(), info_size); - - new_data = add_data(in_name, in_dattype, true, in_valtype); - new_data->load_binary(infile); + new_data.clear(); + new_data.load_binary(infile); + datalist_.push_back(new_data); } return; } @@ -825,39 +542,32 @@ void gctl::base_mesh::load_datablock(std::ifstream &infile) void gctl::base_mesh::save_headinfo(std::ofstream &outfile) { // 首先输出网格的类型和维度 - outfile.write((char*)&meshtype, sizeof(int)); - outfile.write((char*)&meshdim, sizeof(int)); + outfile.write((char*)&meshtype_, sizeof(int)); + outfile.write((char*)&meshdim_, sizeof(int)); // 输出网格名称与信息 - int info_size = meshname.size(); + int info_size = meshname_.size(); outfile.write((char*)&info_size, sizeof(int)); - outfile.write((char*)meshname.c_str(), info_size); - info_size = meshinfo.size(); + outfile.write((char*)meshname_.c_str(), info_size); + info_size = meshinfo_.size(); outfile.write((char*)&info_size, sizeof(int)); - outfile.write((char*)meshinfo.c_str(), info_size); + outfile.write((char*)meshinfo_.c_str(), info_size); return; } void gctl::base_mesh::save_datablock(std::ofstream &outfile) -{ - // 统计输出的模型数量 - int out_num = 0; - meshdata *curr_data = nullptr; - for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) +{ + int num = 0; + for (size_t i = 0; i < datalist_.size(); i++) { - curr_data = *iter; - if (curr_data->get_output()) - { - out_num++; - } + if (datalist_[i].output_ok_) num++; } - outfile.write((char*)&out_num, sizeof(int)); - for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) + outfile.write((char*) &num, sizeof(int)); + for (size_t i = 0; i < datalist_.size(); i++) { - curr_data = *iter; - if (curr_data->get_output()) + if (datalist_[i].output_ok_) { - curr_data->save_binary(outfile); + datalist_[i].save_binary(outfile); // 输出数据块 } } return; diff --git a/lib/mesh/mesh.h b/lib/mesh/mesh.h index a6f6eb2..9347c74 100644 --- a/lib/mesh/mesh.h +++ b/lib/mesh/mesh.h @@ -1,4 +1,4 @@ -/******************************************************** +/******************************************************** * ██████╗ ██████╗████████╗██╗ * ██╔════╝ ██╔════╝╚══██╔══╝██║ * ██║ ███╗██║ ██║ ██║ @@ -28,13 +28,7 @@ #ifndef _GCTL_BASE_MESH_H #define _GCTL_BASE_MESH_H -#include "list" - #include "meshdata.h" -#include "meshdata_scalar.h" -#include "meshdata_vector.h" -#include "meshdata_tensor.h" - #include "gctl/io.h" #include "gctl/algorithm.h" @@ -42,6 +36,7 @@ namespace gctl { enum mesh_type_e { + UNDEFINED, REGULAR_MESH, LINEAR_MESH, TRI_TET_MESH, @@ -53,6 +48,7 @@ namespace gctl enum mesh_dim_e { + MESH_0D, MESH_2D, MESH_3D, }; @@ -74,7 +70,6 @@ namespace gctl /** * @brief 检查网格是否已经初始化。 - * */ bool initiated() const; @@ -85,36 +80,6 @@ namespace gctl */ bool saved(std::string datname) const; - /** - * @brief 返回对应名称的数据对象指针。 - * - * @param datname 数据名 - * @return 数据指针 - */ - meshdata *get_data(std::string datname) const; - - /** - * @brief 返回所有数据指针。 - * - * @param out_list 数据指针列表 - */ - void get_all_data(array &out_list) const; - - /** - * @brief 返回对应名称的数据对象的数组指针。 - * - * @param datname 数据名 - * @return 数组指针（注意需要转换为对应的数组指针类型） - */ - void *get_datval(std::string datname) const; - - /** - * @brief 删除对应名称的数据对象。 - * - * @param datname 数据名 - */ - void remove_data(std::string datname); - /** * @brief 显示网格与数据信息。 * @@ -122,14 +87,6 @@ namespace gctl */ void show_info(std::ostream &os = std::clog) const; - /** - * @brief 重命名数据对象。 - * - * @param oldname 旧名称 - * @param newname 新名称 - */ - void rename_data(std::string oldname, std::string newname); - /** * @brief 返回网格类型 * @@ -194,156 +151,109 @@ namespace gctl void set_meshinfo(std::string in_info); /** - * @brief 添加标量网格数据对象并赋初始值，如果对象已经存在则赋初始值 + * @brief 添加网格数据。 * - * @param in_name 数据对象名称 - * @param in_type 数据对象类型 - * @param if_output 数据对象是否可输出 - * @param init_val 初始值 - * @return 新建的数据对象指针 - */ - meshdata *add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, double init_val); - - /** - * @brief 添加适量网格数据对象并赋初始值，如果对象已经存在则赋初始值 + * @param in_loctype 网格数据类型（块体或顶点数据） + * @param in_valtype 网格数据值类型 + * @param name 数据名称 + * @param init_val 数据初始值 + * @param if_output 数据是否可用于输出 + * @param nan_val 数据无效值标记 * - * @param in_name 数据对象名称 - * @param in_type 数据对象类型 - * @param if_output 数据对象是否可输出 - * @param init_val 初始值 - * @return 新建的数据对象指针 + * @return 数据对象 */ - meshdata *add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, gctl::point3dc init_val); - - /** - * @brief 添加张量网格数据对象并赋初始值，如果对象已经存在则赋初始值 - * - * @param in_name 数据对象名称 - * @param in_type 数据对象类型 - * @param if_output 数据对象是否可输出 - * @param init_val 初始值 - * @return 新建的数据对象指针 - */ - meshdata *add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, gctl::tensor init_val); - - /** - * @brief 添加张量网格数据对象并初始为0值 - * - * @param in_name 数据对象名称 - * @param in_type 数据对象类型 - * @param if_output 数据对象是否可输出 - * @param init_val 初始值 - * @return 新建的数据对象指针 - */ - meshdata *add_data(std::string in_name, mesh_data_type_e in_type, bool if_output, mesh_data_value_e val_type); + meshdata &add_data(mesh_data_type_e in_loctype, mesh_data_value_e in_valtype, std::string name, + double init_val, bool if_output = true, double nan_val = GCTL_BDL_MAX); /** - * @brief （基类虚函数）初始化规则网格 + * @brief 添加网格数据。 + * + * @param in_loctype 网格数据类型（块体或顶点数据） + * @param name 数据名称 + * @param init_arr 数据初始值数组 + * @param if_output 数据是否可用于输出 + * @param nan_val 数据无效值标记 * - * @param in_name 网格名称 - * @param in_info 网格说明信息 - * @param xnum 网格x轴数量 - * @param ynum 网格y轴数量 - * @param xmin 网格x轴最小值 - * @param ymin 网格y轴最小值 - * @param dx 网格x轴间隔 - * @param dy 网格y轴间隔 + * @return 数据对象 */ - virtual void init(std::string in_name, std::string in_info, int xnum, int ynum, - double xmin, double ymin, double dx, double dy); + meshdata &add_data(mesh_data_type_e in_loctype, std::string name, const array &init_arr, + bool if_output = true, double nan_val = GCTL_BDL_MAX); /** - * @brief + * @brief 添加网格数据。 + * + * @param in_loctype 网格数据类型（块体或顶点数据） + * @param name 数据名称 + * @param init_arr 数据初始值数组 + * @param if_output 数据是否可用于输出 + * @param nan_val 数据无效值标记 * - * @param in_name - * @param in_info - * @param xbnum - * @param ybnum - * @param zbnum - * @param xmin - * @param ymin - * @param zmin - * @param xsize - * @param ysize - * @param zsize + * @return 数据对象 */ - virtual void init(std::string in_name, std::string in_info, int xbnum, int ybnum, int zbnum, - double xmin, double ymin, double zmin, double xsize, double ysize, double zsize); + meshdata &add_data(mesh_data_type_e in_loctype, std::string name, const array &init_arr, + bool if_output = true, double nan_val = GCTL_BDL_MAX); + + /** + * @brief 添加网格数据。 + * + * @param in_loctype 网格数据类型（块体或顶点数据） + * @param name 数据名称 + * @param init_arr 数据初始值数组 + * @param if_output 数据是否可用于输出 + * @param nan_val 数据无效值标记 + * + * @return 数据对象 + */ + meshdata &add_data(mesh_data_type_e in_loctype, std::string name, const array &init_arr, + bool if_output = true, double nan_val = GCTL_BDL_MAX); + + /** + * @brief 返回对应名称的数据对象指针。 + * + * @param datname 数据名 + * @return 数据指针 + */ + meshdata &get_data(std::string datname); + + /** + * @brief 删除对应名称的数据对象。 + * + * @param datname 数据名 + */ + void remove_data(std::string datname); /** - * @brief - * - * @param in_name - * @param in_info - * @param lon_min - * @param lat_min - * @param rad_min - * @param lon_size - * @param lat_size - * @param rad_size - * @param lon_bnum - * @param lat_bnum - * @param rad_bnum + * @brief 保存网格到Gmsh文件，并保存所有数据。 + * + * @param filename 文件名 + * @param out_mode 输出模式 + * @param packed 索引是否为紧凑（从0开始） */ - virtual void init(std::string in_name, std::string in_info, double lon_min, double lat_min, - double rad_min, double lon_size, double lat_size, double rad_size, int lon_bnum, int lat_bnum, int rad_bnum); + void save_gmsh_withdata(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); /** - * @brief - * - * @param in_name - * @param in_info - * @param xmin - * @param ymin - * @param xsizes - * @param ysizes + * @brief 保存网格到Gmsh文件，并保存指定名称的数据。 + * + * @param filename 文件名 + * @param datname 数据名 + * @param out_mode 输出模式 + * @param packed 索引是否为紧凑（从0开始） */ - virtual void init(std::string in_name, std::string in_info, double xmin, double ymin, - const gctl::array &xsizes, const gctl::array &ysizes); - + void save_gmsh_withdata(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); + /** - * @brief + * @brief （基类虚函数）保存网格到Gmsh文件。 * - * @param in_name - * @param in_info - * @param xmin - * @param ymin - * @param zmin - * @param xsizes - * @param ysizes - * @param zsizes + * @param filename 文件名 + * @param packed 索引是否为紧凑（从0开始） */ - virtual void init(std::string in_name, std::string in_info, double xmin, double ymin, - double zmin, const gctl::array &xsizes, const gctl::array &ysizes, - const gctl::array &zsizes); - - /** - * @brief - * - * @param in_name - * @param in_info - * @param in_nodes - * @param in_triangles - */ - virtual void init(std::string in_name, std::string in_info, const gctl::array &in_nodes, - const gctl::array &in_triangles); - - /** - * @brief - * - * @param in_name - * @param in_info - * @param in_nodes - * @param in_tets - */ - virtual void init(std::string in_name, std::string in_info, const gctl::array &in_nodes, - const gctl::array &in_tets); + virtual void save_gmsh(std::string filename, index_packed_e packed = Packed) = 0; /** * @brief 显示网格的维度信息 * */ - virtual void show_mesh_dimension(std::ostream &os) const; + virtual void show_mesh_dimension(std::ostream &os) const = 0; /** * @brief （基类纯虚函数）读入二进制网格文件 @@ -359,190 +269,44 @@ namespace gctl */ virtual void save_binary(std::string filename) = 0; - /** - * @brief （基类虚函数）保存网格到Gmsh文件。 - * - * @param filename 文件名 - * @param packed 索引是否为紧凑（从0开始） - */ - virtual void save_gmsh(std::string filename, index_packed_e packed = Packed); - - /** - * @brief - * - * @param filename - * @param d_type - * @param out_mode - * @param packed - */ - void save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed = Packed); - - /** - * @brief - * - * @param filename - * @param datname - * @param out_mode - * @param packed - */ - void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); - - /** - * @brief 将输入的自由点位上的浮点数据插值为规则网络的顶点或者块体数据 - * - * @param in_posi 输入的自由点位的坐标 - * @param in_val 输入的自由点位的数值 - * @param[in] search_xlen 插值搜索区域的x半径 - * @param[in] search_ylen 插值搜索区域的y半径 - * @param[in] search_deg 插值搜索区域的x半径绕x轴正方向逆时针旋转的角度（弧度） - * @param[in] datname 网格后的数据名称 - * @param[in] d_type 网格后的数据类型 - */ - virtual void load_data_cloud(const array &in_posi, const array &in_val, double search_xlen, - double search_ylen, double search_deg, std::string datname, mesh_data_type_e d_type = NodeData); - - /** - * @brief - * - * @param in_posi - * @param in_val - * @param search_xlen - * @param search_ylen - * @param search_deg - * @param datname - * @param d_type - */ - virtual void load_data_cloud(const array &in_posi, const array &in_val, double search_xlen, - double search_ylen, double search_deg, std::string datname, mesh_data_type_e d_type = NodeData); - - /** - * @brief - * - * @param datname - * @param in_posi - * @param out_val - */ - virtual void extract_points(std::string datname, const array &in_posi, array &out_val); - - /** - * @brief - * - * @param datname - * @param in_posi - * @param out_val - */ - virtual void extract_points(std::string datname, const array &in_posi, array &out_val); - - /** - * @brief - * - * @param datname - * @param start_p - * @param end_p - * @param size_p - * @param out_posi - * @param out_val - */ - virtual void extract_profile(std::string datname, const point2dc &start_p, const point2dc &end_p, int size_p, - array &out_posi, array &out_val); - - /** - * @brief - * - * @param datname - * @param start_p - * @param end_p - * @param size_p - * @param dh - * @param out_posi - * @param out_val - */ - virtual void extract_profile(std::string datname, const point3dc &start_p, const point3dc &end_p, int size_p, - double dh, array &out_posi, array &out_val); - - /** - * @brief - * - * @param datname - * @param p_type - * @param v_type - * @param para_str - * @param in_val - */ - virtual void edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, double in_val); - - /** - * @brief - * - * @param datname - * @param p_type - * @param v_type - * @param para_str - * @param in_val - */ - virtual void edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, point3dc in_val); - - /** - * @brief - * - * @param datname - * @param p_type - * @param v_type - * @param para_str - * @param in_val - */ - virtual void edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, tensor in_val); - - /** - * @brief - * - * @param datname - * @param in_val - */ - virtual void purge_data(std::string datname, double in_val); - - /** - * @brief - * - * @param datname - * @param in_val - */ - virtual void purge_data(std::string datname, point3dc in_val); - - /** - * @brief - * - * @param datname - * @param in_val - */ - virtual void purge_data(std::string datname, tensor in_val); - protected: - mesh_type_e meshtype; - mesh_dim_e meshdim; - std::string meshname; - std::string meshinfo; + mesh_type_e meshtype_; + mesh_dim_e meshdim_; + std::string meshname_; + std::string meshinfo_; - int node_num, ele_num; - bool initialized; + int node_num_, ele_num_; + bool initialized_; - std::list saved_data; - std::list::iterator iter; + std::vector datalist_; /** * 以下为类的私有函数 只能被类的公共函数调用 */ + + /** + * @brief 检查网格是否已经初始化。 + * + */ + void check_initiated(bool inverse = false) const; /** * @brief 初始化网格 - * - * @param in_type - * @param in_dim - * @param in_name - * @param in_info + * + * @param in_type 网格类型 + * @param in_dim 网格维度 + * @param in_name 网格名称 + * @param in_info 网格说明 */ void init(mesh_type_e in_type, mesh_dim_e in_dim, std::string in_name, std::string in_info); - + + /** + * @brief 返回数据索引并检查数据对象是否存在 + * + * @param datname 数据名 + */ + int data_index(std::string datname) const; + /** * @brief 读入二进制网格头信息 * diff --git a/lib/mesh/meshdata.cpp b/lib/mesh/meshdata.cpp index 725f02a..4a7015d 100644 --- a/lib/mesh/meshdata.cpp +++ b/lib/mesh/meshdata.cpp @@ -1,4 +1,4 @@ -/******************************************************** +/******************************************************** * ██████╗ ██████╗████████╗██╗ * ██╔════╝ ██╔════╝╚══██╔══╝██║ * ██║ ███╗██║ ██║ ██║ @@ -26,69 +26,226 @@ ******************************************************/ #include "meshdata.h" +#include "fstream" -gctl::meshdata::meshdata(std::string in_name, mesh_data_type_e in_type, bool if_output) +gctl::meshdata::meshdata() { - if (in_name == "") - { - throw std::runtime_error("[gctl::meshdata] The input name is empty."); - } - - datname = in_name; - dattype = in_type; - output_ok = if_output; + name_ = "untitled"; + loctype_ = NodeData; + valtype_ = Scalar; + output_ok_ = true; + nan_val_ = GCTL_BDL_MAX; } -gctl::meshdata::~meshdata(){} - -void gctl::meshdata::set_datname(std::string in_name) +gctl::meshdata::meshdata(mesh_data_type_e in_loctype, + mesh_data_value_e in_valtype, size_t size, + std::string name, bool if_output, double nan_val) { - if (in_name == "") - { - throw std::runtime_error("[gctl::meshdata] The input name is empty."); - } + create(in_loctype, in_valtype, size, name, if_output, nan_val); +} - datname = in_name; +gctl::meshdata::~meshdata() +{ + clear(); +} + +void gctl::meshdata::clear() +{ + name_ = "untitled"; + loctype_ = NodeData; + valtype_ = Scalar; + output_ok_ = true; + nan_val_ = GCTL_BDL_MAX; + datval_.clear(); +} + +void gctl::meshdata::create(mesh_data_type_e in_loctype, + mesh_data_value_e in_valtype, size_t size, + std::string name, bool if_output, double nan_val) +{ + name_ = name; + loctype_ = in_loctype; + valtype_ = in_valtype; + output_ok_ = if_output; + nan_val_ = nan_val; + if (size != 0) datval_.resize(size, 0.0); + return; +} + +gctl::array gctl::meshdata::export_vector() const +{ + if (valtype_ != Vector) throw std::runtime_error("[gctl::meshdata::export_vector] Invalid data type."); + + size_t n = 0; + array tmp(datval_.size()/3); + for (size_t i = 0; i < datval_.size(); i += 3) + { + tmp[n] = point3dc(datval_[3*i], datval_[3*i + 1], datval_[3*i + 2]); + n++; + } + return tmp; +} + +gctl::array gctl::meshdata::export_tensor() const +{ + if (valtype_ != Tensor) throw std::runtime_error("[gctl::meshdata::export_tensor] Invalid data type."); + + size_t n = 0; + array tmp(datval_.size()/9); + for (size_t i = 0; i < datval_.size(); i += 9) + { + tmp[n] = tensor(datval_[9*i], datval_[9*i + 1], datval_[9*i + 2], + datval_[9*i + 3], datval_[9*i + 4], datval_[9*i + 5], + datval_[9*i + 6], datval_[9*i + 7], datval_[9*i + 8]); + n++; + } + return tmp; +} + +void gctl::meshdata::show_info(std::ostream &os) const +{ + os << "Data: " << name_ << " | "; + if (loctype_ == NodeData) os << "node data | "; + if (loctype_ == ElemData) os << "element data | "; + if (loctype_ == ElemData2D) os << "2D element data | "; + if (loctype_ == ElemData3D) os << "3D element data | "; + if (valtype_ == Scalar) os << "scalar | "; + if (valtype_ == Vector) os << "vector | "; + if (valtype_ == Tensor) os << "tensor | "; + if (output_ok_) os << "output" << std::endl; + else os<< "no-output" << std::endl; return; } -std::string gctl::meshdata::get_datname() +void gctl::meshdata::show_stats(std::ostream &os) const { - return datname; -} + int vn = 0; + if (valtype_ == Vector) + { + for (size_t i = 0; i < datval_.size(); i += 3) + { + if (fabs(datval_[3*i] - nan_val_) > 1e-10) vn++; + } -gctl::mesh_data_type_e gctl::meshdata::get_dattype() -{ - return dattype; -} + array tmp_x(vn), tmp_y(vn), tmp_z(vn); -gctl::mesh_data_value_e gctl::meshdata::get_valtype() -{ - return valtype; -} + vn = 0; + for (size_t i = 0; i < datval_.size(); i += 3) + { + if (fabs(datval_[3*i] - nan_val_) > 1e-10) + { + tmp_x[vn] = datval_[3*i]; + tmp_y[vn] = datval_[3*i + 1]; + tmp_z[vn] = datval_[3*i + 2]; + vn++; + } + } + + os << "mean = (" << tmp_x.mean() << ", " << tmp_y.mean() << ", " << tmp_z.mean() << ")\n" + << "std = (" << tmp_x.std() << ", " << tmp_y.std() << ", " << tmp_z.std() << ")\n" + << "rms = (" << tmp_x.rms() << ", " << tmp_y.rms() << ", " << tmp_z.rms() << ")\n"; + } + else if (valtype_ == Tensor) + { + for (size_t i = 0; i < datval_.size(); i += 9) + { + if (fabs(datval_[9*i] - nan_val_) > 1e-10) vn++; + } -void gctl::meshdata::set_output(bool if_output) -{ - output_ok = if_output; + array tmp_xx(vn), tmp_xy(vn), tmp_xz(vn); + array tmp_yx(vn), tmp_yy(vn), tmp_yz(vn); + array tmp_zx(vn), tmp_zy(vn), tmp_zz(vn); + + vn = 0; + for (size_t i = 0; i < datval_.size(); i += 9) + { + if (fabs(datval_[9*i] - nan_val_) > 1e-10) + { + tmp_xx[vn] = datval_[9*i]; + tmp_xy[vn] = datval_[9*i + 1]; + tmp_xz[vn] = datval_[9*i + 2]; + tmp_yx[vn] = datval_[9*i + 3]; + tmp_yy[vn] = datval_[9*i + 4]; + tmp_yz[vn] = datval_[9*i + 5]; + tmp_zx[vn] = datval_[9*i + 6]; + tmp_zy[vn] = datval_[9*i + 7]; + tmp_zz[vn] = datval_[9*i + 8]; + vn++; + } + } + + os << "mean = \n" + << tmp_xx.mean() << ", " << tmp_xy.mean() << ", " << tmp_xz.mean() << "\n" + << tmp_yx.mean() << ", " << tmp_yy.mean() << ", " << tmp_yz.mean() << "\n" + << tmp_zx.mean() << ", " << tmp_zy.mean() << ", " << tmp_zz.mean() << "\n"; + + os << "std = \n" + << tmp_xx.std() << ", " << tmp_xy.std() << ", " << tmp_xz.std() << "\n" + << tmp_yx.std() << ", " << tmp_yy.std() << ", " << tmp_yz.std() << "\n" + << tmp_zx.std() << ", " << tmp_zy.std() << ", " << tmp_zz.std() << "\n"; + + os << "rms = \n" + << tmp_xx.rms() << ", " << tmp_xy.rms() << ", " << tmp_xz.rms() << "\n" + << tmp_yx.rms() << ", " << tmp_yy.rms() << ", " << tmp_yz.rms() << "\n" + << tmp_zx.rms() << ", " << tmp_zy.rms() << ", " << tmp_zz.rms() << "\n"; + } + else // Scalar + { + for (size_t i = 0; i < datval_.size(); i++) + { + if (fabs(datval_[i] - nan_val_) > 1e-10) vn++; + } + + array tmp(vn); + + vn = 0; + for (size_t i = 0; i < datval_.size(); i++) + { + if (fabs(datval_[i] - nan_val_) > 1e-10) + { + tmp[vn] = datval_[i]; + vn++; + } + } + + os << "mean = " << tmp.mean() << ", std = " << tmp.std() << ", rms = " << tmp.rms() << std::endl; + } return; } -bool gctl::meshdata::get_output() +void gctl::meshdata::load_binary(std::ifstream &infile) { - return output_ok; + int name_size; + infile.read((char*) &name_size, sizeof(int)); + + name_.resize(name_size); + infile.read((char*) name_.c_str(), name_size); + + infile.read((char*) &loctype_, sizeof(int)); + infile.read((char*) &valtype_, sizeof(int)); + infile.read((char*) &output_ok_, sizeof(bool)); + + int n; + infile.read((char*) &n, sizeof(int)); + datval_.resize(n); + + infile.read((char*) datval_.get(), sizeof(double)*datval_.size()); + infile.read((char*) &nan_val_, sizeof(double)); + return; } -void gctl::meshdata::show_info(std::ostream &os) +void gctl::meshdata::save_binary(std::ofstream &outfile) { - os << "Data: " << datname << " | "; - if (dattype == NodeData) os << "Type: Node data | "; - if (dattype == ElemData) os << "Type: Element data | "; - if (dattype == ElemData2D) os << "Type: 2D element data | "; - if (dattype == ElemData3D) os << "Type: 3D element data | "; - if (valtype == Scalar) os << "Value: Scalar | "; - if (valtype == Vector) os << "Value: Vector | "; - if (valtype == Tensor) os << "Value: Tensor | "; - if (output_ok) os << "Output: Yes" << std::endl; - else os<< "Output: No" << std::endl; - return; + int name_size = name_.size(); + outfile.write((char*) &name_size, sizeof(int)); + outfile.write((char*) name_.c_str(), name_size); + outfile.write((char*) &loctype_, sizeof(int)); + outfile.write((char*) &valtype_, sizeof(int)); + outfile.write((char*) &output_ok_, sizeof(bool)); + + int n = datval_.size(); + outfile.write((char*) &n, sizeof(int)); + outfile.write((char*) datval_.get(), sizeof(double)*datval_.size()); + outfile.write((char*) &nan_val_, sizeof(double)); + return; } \ No newline at end of file diff --git a/lib/mesh/meshdata.h b/lib/mesh/meshdata.h index 217aea1..46b0e7f 100644 --- a/lib/mesh/meshdata.h +++ b/lib/mesh/meshdata.h @@ -1,4 +1,4 @@ -/******************************************************** +/******************************************************** * ██████╗ ██████╗████████╗██╗ * ██╔════╝ ██╔════╝╚══██╔══╝██║ * ██║ ███╗██║ ██║ ██║ @@ -30,11 +30,12 @@ #include "gctl_mesh_config.h" #include "gctl/core.h" -#include "gctl/geometry.h" +#include "gctl/geometry/point3c.h" +#include "gctl/geometry/tensor.h" namespace gctl { - /** + /** * @brief 网格数据的数值类型 */ enum mesh_data_value_e @@ -44,93 +45,90 @@ namespace gctl Tensor, ///< 张量数据 }; - /** - * @brief 网格文件中的数据对象（纯虚类）。此类为具体类型的数据对象的基类 - */ - class meshdata - { - protected: - std::string datname; // 数据的名称 - mesh_data_type_e dattype; // 数据的赋值属性 顶点或是元素（设置后不可更改） - mesh_data_value_e valtype; // 数据的类型（设置后不可更改） - bool output_ok; // 是否可输出数据 - - public: - // 构造函数 - meshdata(std::string in_name, mesh_data_type_e in_type, bool if_output); - - // 析构函数 - virtual ~meshdata(); + /** + * @brief 网格文件中的数据对象，可储存标量、矢量和张量数据。 + * + */ + struct meshdata + { + std::string name_; // 数据的名称 + mesh_data_type_e loctype_; // 数据的赋值位置属性 顶点或是元素 + mesh_data_value_e valtype_; // 数据的类型 + bool output_ok_; // 是否可输出数据 + array datval_; // 数据值 注意目前我们只支持浮点数据存储 + double nan_val_; // 无效数据的标记值 /** - * @brief 设置数据名称 - * - * @param[in] in_name 名称字符串 + * @brief 构造函数 */ - void set_datname(std::string in_name); + meshdata(); /** - * @brief 返回数据的名称 - * - * @return 名称字符串 + * @brief 创建数据对象 + * + * @param in_loctype 数据的赋值位置属性 顶点或是元素 + * @param in_valtype 数据的类型 + * @param size 数据的大小 + * @param name 数据的名称 + * @param if_output 是否可输出数据 + * @param nan_val 无效数据的标记值 */ - std::string get_datname(); - + meshdata(mesh_data_type_e in_loctype, mesh_data_value_e in_valtype, + size_t size, std::string name = "untitled", + bool if_output = true, double nan_val = GCTL_BDL_MAX); + /** - * @brief 返回数据的赋值类型 - * - * @return 数据赋值类型的枚举 + * @brief 析构函数 */ - mesh_data_type_e get_dattype(); + virtual ~meshdata(); /** - * @brief 返回数据值的类型 - * - * @return 数据值类型的枚举 + * @brief 清空数据对象 */ - mesh_data_value_e get_valtype(); + void clear(); /** - * @brief 设置数据对象输出状态的设置情况 - * - * @param[in] if_output 是否可输出此对象 + * @brief 创建数据对象 + * + * @param in_loctype 数据的赋值位置属性 顶点或是元素 + * @param in_valtype 数据的类型 + * @param size 数据的大小 + * @param name 数据的名称 + * @param if_output 是否可输出数据 + * @param nan_val 无效数据的标记值 */ - void set_output(bool if_output); + void create(mesh_data_type_e in_loctype, mesh_data_value_e in_valtype, + size_t size, std::string name = "untitled", + bool if_output = true, double nan_val = GCTL_BDL_MAX); /** - * @brief 返回数据对象输出状态的设置情况 - * - * @return 是否可输出此对象 + * @brief 返回适量数据。 */ - bool get_output(); + array export_vector() const; /** + * @brief 返回张量数据。 + */ + array export_tensor() const; + + /** * @brief 显示数据对象的头信息 */ - void show_info(std::ostream &os = std::clog); + void show_info(std::ostream &os = std::clog) const; - /** + /** * @brief 显示数据统计参数 */ - virtual void show_stats(std::ostream &os = std::clog) = 0; + void show_stats(std::ostream &os = std::clog) const; - /** - * @brief 返回数据块的指针 所有子类的数据块均为gctl::array类型，这是一个通用的接口。 - * - * @note 注意因为具体的返回类型未知 因此需在调用后按实际数据类型转换指针 - * - * @return 数据块的指针 - */ - virtual void *get_datval_ptr() = 0; - - /** + /** * @brief 载入二进制文件 * * @warning 不要直接调用此函数，应该在网格类型的相应函数中调用 * * @param infile 输入文件的流（以二进制方式打开） */ - virtual void load_binary(std::ifstream &infile) = 0; + void load_binary(std::ifstream &infile); /** * @brief 保存二进制文件 @@ -139,20 +137,8 @@ namespace gctl * * @param outfile 输出的文件流（以二进制方式打开） */ - virtual void save_binary(std::ofstream &outfile) = 0; - - /** - * @brief 销毁指针的对象 可销毁此基类或子类指针指向的对象 - * - * @param obj_ptr 网格数据指针 - */ - static void destroy(meshdata *obj_ptr) - { - delete obj_ptr; - obj_ptr = nullptr; - return; - } - }; + void save_binary(std::ofstream &outfile); + }; } -#endif //_GCTL_MESHDATA_H \ No newline at end of file +#endif // _GCTL_MESHDATA_H \ No newline at end of file diff --git a/lib/mesh/regular_grid.cpp b/lib/mesh/regular_grid.cpp index 28bc240..0e1e5d8 100644 --- a/lib/mesh/regular_grid.cpp +++ b/lib/mesh/regular_grid.cpp @@ -35,22 +35,18 @@ void gctl::regular_grid::init(std::string in_name, std::string in_info, int xnum, int ynum, double xmin, double ymin, double dx, double dy) { - if (initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is already initialized."); - } - + check_initiated(true); // check to see if the mesh is already initiated base_mesh::init(REGULAR_GRID, MESH_2D, in_name, in_info); rg_xnum = xnum; rg_ynum = ynum; rg_xmin = xmin; rg_ymin = ymin; rg_dx = dx; rg_dy = dy; - node_num = rg_xnum * rg_ynum; - ele_num = (rg_xnum-1) * (rg_ynum-1); + node_num_ = rg_xnum * rg_ynum; + ele_num_ = (rg_xnum-1) * (rg_ynum-1); - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); for (int j = 0; j < rg_ynum; j++) { @@ -76,24 +72,24 @@ void gctl::regular_grid::init(std::string in_name, std::string in_info, int xnum } } - initialized = true; + initialized_ = true; return; } void gctl::regular_grid::show_mesh_dimension(std::ostream &os) const { - os << "Range X: " << rg_xmin << " -> " << rg_xmin + (rg_xnum - 1)*rg_dx << "\n"; - os << "Range Y: " << rg_ymin << " -> " << rg_ymin + (rg_ynum - 1)*rg_dy << "\n"; - os << "Interval: " << rg_dx << ", " << rg_dy << "\n"; + os << "node num: " << node_num_ << std::endl; + os << "elem num: " << ele_num_ << std::endl; + os << "x-range: " << rg_xmin << " -> " << rg_xmin + (rg_xnum - 1)*rg_dx << "\n"; + os << "y-range: " << rg_ymin << " -> " << rg_ymin + (rg_ynum - 1)*rg_dy << "\n"; + os << "interval: " << rg_dx << ", " << rg_dy << "\n"; + os << "dimension: " << rg_xnum << ", " << rg_ynum << "\n"; return; } void gctl::regular_grid::load_binary(std::string filename) { - if (initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is already initialized."); - } + check_initiated(true); // check to see if the mesh is already initiated std::ifstream infile; gctl::open_infile(infile, filename, ".2m", std::ios::in|std::ios::binary); @@ -109,11 +105,11 @@ void gctl::regular_grid::load_binary(std::string filename) infile.read((char*)&rg_dx, sizeof(double)); infile.read((char*)&rg_dy, sizeof(double)); - node_num = rg_xnum * rg_ynum; - ele_num = (rg_xnum-1) * (rg_ynum-1); + node_num_ = rg_xnum * rg_ynum; + ele_num_ = (rg_xnum-1) * (rg_ynum-1); - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); for (int j = 0; j < rg_ynum; j++) { @@ -139,7 +135,7 @@ void gctl::regular_grid::load_binary(std::string filename) } } - initialized = true; + initialized_ = true; // 读入模型数据单元 load_datablock(infile); @@ -149,10 +145,7 @@ void gctl::regular_grid::load_binary(std::string filename) void gctl::regular_grid::save_binary(std::string filename) { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is not initialized."); - } + check_initiated(); // check to see if the mesh is not initiated std::ofstream outfile; gctl::open_outfile(outfile, filename, ".2m", std::ios::out|std::ios::binary); @@ -197,11 +190,11 @@ void gctl::regular_grid::clear_regular_grid() int gctl::regular_grid::view(std::string datname) { - array *datval_ptr = (array*) get_datval(datname); + meshdata data = get_data(datname); 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(*datval_ptr, datname); + plt.add_dens(data.datval_, datname); return plt.plot(); } @@ -218,10 +211,10 @@ int gctl::regular_grid::view(std::string datname) void gctl::regular_grid::plot(std::string datname) { - array *datval_ptr = (array*) get_datval(datname); + meshdata data = get_data(datname); pic.set_command("psconvert", "-A -TG -E300"); - pic.plot(datname, *datval_ptr, + pic.plot(datname, data.datval_, rg_xmin, rg_xmin + (rg_xnum - 1)*rg_dx, rg_ymin, rg_ymin + (rg_ynum - 1)*rg_dy, rg_xnum, rg_ynum); @@ -239,61 +232,37 @@ void gctl::regular_grid::plot(std::string datname) int gctl::regular_grid::get_xdim() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is not initialized."); - } - + check_initiated(); // check to see if the mesh is not initiated return rg_xnum; } int gctl::regular_grid::get_ydim() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is not initialized."); - } - + check_initiated(); // check to see if the mesh is not initiated return rg_ynum; } double gctl::regular_grid::get_xmin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is not initialized."); - } - + check_initiated(); // check to see if the mesh is not initiated return rg_xmin; } double gctl::regular_grid::get_ymin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is not initialized."); - } - + check_initiated(); // check to see if the mesh is not initiated return rg_ymin; } double gctl::regular_grid::get_dx() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is not initialized."); - } - + check_initiated(); // check to see if the mesh is not initiated return rg_dx; } double gctl::regular_grid::get_dy() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is not initialized."); - } - + check_initiated(); // check to see if the mesh is not initiated return rg_dy; } @@ -309,7 +278,7 @@ void gctl::regular_grid::load_netcdf_grid(std::string filename, mesh_data_type_e gctl::array in_arr_single; // 如果未初始化 则初始化 - if (!initialized) + if (!initialized_) { // read a data array read_netcdf_axis(filename, in_x, xname); @@ -348,7 +317,7 @@ void gctl::regular_grid::load_netcdf_grid(std::string filename, mesh_data_type_e double dx = (xmax - xmin)/(xnum - 1); double dy = (ymax - ymin)/(ynum - 1); - meshdata *data_ptr; + meshdata new_data; if (d_type == NodeData) { init(filename, "Imported from a .nc file.", xnum, ynum, xmin, ymin, dx, dy); @@ -356,8 +325,14 @@ void gctl::regular_grid::load_netcdf_grid(std::string filename, mesh_data_type_e { if (!saved(in_name[i])) { - data_ptr = meshdata_scalar::create(in_name[i], NodeData, xnum*ynum, true, 0.0); - saved_data.push_back(data_ptr); + new_data.clear(); + 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]; + } + + datalist_.push_back(new_data); } else throw std::runtime_error("[gctl::regular_grid] Duplicated data names."); } @@ -369,25 +344,20 @@ void gctl::regular_grid::load_netcdf_grid(std::string filename, mesh_data_type_e { if (!saved(in_name[i])) { - data_ptr = meshdata_scalar::create(in_name[i], ElemData, xnum*ynum, true, 0.0); - saved_data.push_back(data_ptr); + new_data.clear(); + 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]; + } + + datalist_.push_back(new_data); } else throw std::runtime_error("[gctl::regular_grid] Duplicated data names."); } } - // get data pointer - gctl::array *val_ptr; - for (size_t r = 0; r < in_arr.row_size(); r++) - { - val_ptr = (gctl::array*) get_datval(in_name[r]); - for (int i = 0; i < val_ptr->size(); i++) - { - val_ptr->at(i) = in_arr[r][i]; - } - } - - initialized = true; + initialized_ = true; } else { @@ -405,52 +375,43 @@ void gctl::regular_grid::load_netcdf_grid(std::string filename, mesh_data_type_e } } - meshdata *data_ptr; + meshdata new_data; if (d_type == NodeData) { - if (in_arr.col_size() != rg_xnum*rg_ynum) - { - throw std::runtime_error("[gctl::regular_grid] Incompatible input data size."); - } - for (int i = 0; i < in_name.size(); i++) { if (!saved(in_name[i])) { - data_ptr = meshdata_scalar::create(in_name[i], d_type, rg_xnum*rg_ynum, true, 0.0); - saved_data.push_back(data_ptr); + new_data.clear(); + 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]; + } + + datalist_.push_back(new_data); } else throw std::runtime_error("[gctl::regular_grid] Duplicated data names."); } } else if (d_type == ElemData) { - if (in_arr.col_size() != (rg_xnum-1)*(rg_ynum-1)) - { - throw std::runtime_error("[gctl::regular_grid] Incompatible input data size."); - } - for (int i = 0; i < in_name.size(); i++) { if (!saved(in_name[i])) { - data_ptr = meshdata_scalar::create(in_name[i], d_type, (rg_xnum-1)*(rg_ynum-1), true, 0.0); - saved_data.push_back(data_ptr); + new_data.clear(); + 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]; + } + + datalist_.push_back(new_data); } else throw std::runtime_error("[gctl::regular_grid] Duplicated data names."); } } - - // get data pointer - gctl::array *val_ptr; - for (size_t r = 0; r < in_arr.row_size(); r++) - { - val_ptr = (gctl::array*) get_datval(in_name[r]); - for (int i = 0; i < val_ptr->size(); i++) - { - val_ptr->at(i) = in_arr[r][i]; - } - } } return; } @@ -458,82 +419,70 @@ void gctl::regular_grid::load_netcdf_grid(std::string filename, mesh_data_type_e void gctl::regular_grid::save_netcdf_grid(std::string filename, mesh_data_type_e d_type, std::string xname, std::string yname) { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is not initialized."); - } - - meshdata *curr_data = nullptr; + check_initiated(); // check to see if the mesh is not initiated bool if_append = false; - for (iter = saved_data.begin(); iter != saved_data.end(); ++iter) + meshdata curr_data; + for (size_t i = 0; i < datalist_.size(); i++) { - curr_data = *iter; - if (curr_data->get_dattype() == d_type && d_type == NodeData && - curr_data->get_valtype() == Scalar && curr_data->get_output()) + curr_data = datalist_[i]; + if (curr_data.loctype_ == d_type && d_type == NodeData && + curr_data.valtype_ == Scalar && curr_data.output_ok_) { - array* data_ptr = (array*)curr_data->get_datval_ptr(); - if (!if_append) { - gctl::save_netcdf_grid(filename, *data_ptr, rg_xnum, rg_ynum, rg_xmin, - rg_dx, rg_ymin, rg_dy, xname, yname, curr_data->get_datname()); + gctl::save_netcdf_grid(filename, curr_data.datval_, rg_xnum, rg_ynum, rg_xmin, + rg_dx, rg_ymin, rg_dy, xname, yname, curr_data.name_); if_append = true; } else { - gctl::append_netcdf_grid(filename, *data_ptr, xname, yname, curr_data->get_datname()); + gctl::append_netcdf_grid(filename, curr_data.datval_, xname, yname, curr_data.name_); } } - else if (curr_data->get_dattype() == d_type && d_type == ElemData && - curr_data->get_valtype() == Scalar && curr_data->get_output()) + else if (curr_data.loctype_ == d_type && d_type == ElemData && + curr_data.valtype_ == Scalar && curr_data.output_ok_) { - array* data_ptr = (array*)curr_data->get_datval_ptr(); - if (!if_append) { - gctl::save_netcdf_grid(filename, *data_ptr, rg_xnum-1, rg_ynum-1, rg_xmin+0.5*rg_dx, - rg_dx, rg_ymin+0.5*rg_dy, rg_dy, xname, yname, curr_data->get_datname()); + gctl::save_netcdf_grid(filename, curr_data.datval_, rg_xnum-1, rg_ynum-1, rg_xmin+0.5*rg_dx, + rg_dx, rg_ymin+0.5*rg_dy, rg_dy, xname, yname, curr_data.name_); if_append = true; } else { - gctl::append_netcdf_grid(filename, *data_ptr, xname, yname, curr_data->get_datname()); + gctl::append_netcdf_grid(filename, curr_data.datval_, xname, yname, curr_data.name_); } } } - return; } void gctl::regular_grid::save_netcdf_grid(std::string filename, std::string datname, std::string xname, std::string yname) { - meshdata *curr_data = get_data(datname); + meshdata curr_data = get_data(datname); - if (!curr_data->get_output()) + if (!curr_data.output_ok_) { throw std::runtime_error("[gctl::regular_grid] Output of the data is disabled."); } - if (curr_data->get_valtype() != Scalar) + if (curr_data.valtype_ != Scalar) { throw std::runtime_error("[gctl::regular_grid] The output data type can't be saved to a netCDF file."); } - if (curr_data->get_valtype() == Scalar && curr_data->get_dattype() == NodeData) + if (curr_data.valtype_ == Scalar && curr_data.loctype_ == NodeData) { - array* data_ptr = (array*)curr_data->get_datval_ptr(); - gctl::save_netcdf_grid(filename, *data_ptr, rg_xnum, rg_ynum, rg_xmin, - rg_dx, rg_ymin, rg_dy, xname, yname, curr_data->get_datname()); + gctl::save_netcdf_grid(filename, curr_data.datval_, rg_xnum, rg_ynum, rg_xmin, + rg_dx, rg_ymin, rg_dy, xname, yname, curr_data.name_); } - else if (curr_data->get_valtype() == Scalar && curr_data->get_dattype() == ElemData) + else if (curr_data.valtype_ == Scalar && curr_data.loctype_ == ElemData) { - array* data_ptr = (array*)curr_data->get_datval_ptr(); - gctl::save_netcdf_grid(filename, *data_ptr, rg_xnum-1, rg_ynum-1, rg_xmin+0.5*rg_dx, - rg_dx, rg_ymin+0.5*rg_dy, rg_dy, xname, yname, curr_data->get_datname()); + gctl::save_netcdf_grid(filename, curr_data.datval_, rg_xnum-1, rg_ynum-1, rg_xmin+0.5*rg_dx, + rg_dx, rg_ymin+0.5*rg_dy, rg_dy, xname, yname, curr_data.name_); } - return; } @@ -541,13 +490,12 @@ void gctl::regular_grid::save_netcdf_grid(std::string filename, std::string datn void gctl::regular_grid::load_surfer_grid(std::string filename, std::string datname, mesh_data_type_e d_type, surfer_file_type_e grid_type) { - gctl::array in_arr; - int xnum, ynum; double xmin, xmax, ymin, ymax, zmin, zmax, dx, dy, blank_val; + gctl::array in_arr; // 如果微初始化 则初始化 - if (!initialized) + if (!initialized_) { if (grid_type == Surfer6Text) { @@ -570,28 +518,28 @@ void gctl::regular_grid::load_surfer_grid(std::string filename, std::string datn gctl::read_surfer7_grid(filename, in_arr, xnum, ynum, xmin, ymin, dx, dy, zmin, zmax, blank_val); } - meshdata *data_ptr; + meshdata curr_data; if (d_type == NodeData) { init(filename, "Imported from a surfer grid.", xnum, ynum, xmin, ymin, dx, dy); - data_ptr = meshdata_scalar::create(datname, NodeData, xnum*ynum, true, 0.0); + curr_data.create(NodeData, Scalar, node_num_, datname, true, GCTL_BDL_MAX); + for (size_t i = 0; i < node_num_; i++) + { + curr_data.datval_[i] = in_arr[i]; + } } else if (d_type == ElemData) { init(filename, "Imported from a surfer grid.", xnum+1, ynum+1, xmin-0.5*dx, ymin-0.5*dy, dx, dy); - data_ptr = meshdata_scalar::create(datname, ElemData, xnum*ynum, true, 0.0); + curr_data.create(ElemData, Scalar, ele_num_, datname, true, GCTL_BDL_MAX); + for (size_t i = 0; i < ele_num_; i++) + { + curr_data.datval_[i] = in_arr[i]; + } } - saved_data.push_back(data_ptr); - - // get data pointer - gctl::array *val_ptr = (gctl::array*) data_ptr->get_datval_ptr(); - for (int i = 0; i < val_ptr->size(); i++) - { - val_ptr->at(i) = in_arr[i]; - } - - initialized = true; + datalist_.push_back(curr_data); + initialized_ = true; } else { @@ -610,7 +558,7 @@ void gctl::regular_grid::load_surfer_grid(std::string filename, std::string datn gctl::read_surfer7_grid(filename, in_arr, xnum, ynum, xmin, ymin, dx, dy, zmin, zmax, blank_val); } - meshdata *data_ptr; + meshdata curr_data; if (d_type == NodeData) { if (in_arr.size() != rg_xnum*rg_ynum) @@ -618,7 +566,11 @@ void gctl::regular_grid::load_surfer_grid(std::string filename, std::string datn throw std::runtime_error("[gctl::regular_grid] Incompatible input data size."); } - data_ptr = meshdata_scalar::create(datname, d_type, rg_xnum*rg_ynum, true, 0.0); + curr_data.create(NodeData, Scalar, node_num_, datname, true, GCTL_BDL_MAX); + for (size_t i = 0; i < node_num_; i++) + { + curr_data.datval_[i] = in_arr[i]; + } } else if (d_type == ElemData) { @@ -627,79 +579,74 @@ void gctl::regular_grid::load_surfer_grid(std::string filename, std::string datn throw std::runtime_error("[gctl::regular_grid] Incompatible input data size."); } - data_ptr = meshdata_scalar::create(datname, d_type, (rg_xnum-1)*(rg_ynum-1), true, 0.0); + curr_data.create(ElemData, Scalar, ele_num_, datname, true, GCTL_BDL_MAX); + for (size_t i = 0; i < ele_num_; i++) + { + curr_data.datval_[i] = in_arr[i]; + } } - saved_data.push_back(data_ptr); - - // get data pointer - gctl::array *val_ptr = (gctl::array*) data_ptr->get_datval_ptr(); - for (int i = 0; i < val_ptr->size(); i++) - { - val_ptr->at(i) = in_arr[i]; - } + datalist_.push_back(curr_data); } return; } void gctl::regular_grid::save_surfer_grid(std::string filename, std::string datname, surfer_file_type_e grid_type) { - meshdata *curr_data = curr_data = get_data(datname); + meshdata curr_data = get_data(datname); - if (!curr_data->get_output()) + if (!curr_data.output_ok_) { throw std::runtime_error("[gctl::regular_grid] Output of the data is disabled."); } - if (curr_data->get_valtype() != Scalar) + if (curr_data.valtype_ != Scalar) { throw std::runtime_error("[gctl::regular_grid] The output data type can't be saved to a Surfer file."); } - gctl::array *data_ptr = (gctl::array*) curr_data->get_datval_ptr(); - if (curr_data->get_dattype() == NodeData) + if (curr_data.loctype_ == NodeData) { if (grid_type == Surfer6Text) { - gctl::save_surfer6_grid(filename, *data_ptr, rg_xnum, rg_ynum, + gctl::save_surfer6_grid(filename, curr_data.datval_, rg_xnum, rg_ynum, rg_xmin, rg_xmin+(rg_xnum-1)*rg_dx, rg_ymin, rg_ymin+(rg_ynum-1)*rg_dy, NAN, NAN, gctl::Surfer6Text); } else if (grid_type == Surfer6Binary) { - gctl::save_surfer6_grid(filename, *data_ptr, rg_xnum, rg_ynum, + gctl::save_surfer6_grid(filename, curr_data.datval_, rg_xnum, rg_ynum, rg_xmin, rg_xmin+(rg_xnum-1)*rg_dx, rg_ymin, rg_ymin+(rg_ynum-1)*rg_dy, NAN, NAN, gctl::Surfer6Binary); } else if (grid_type == Surfer7Grid) { - gctl::save_surfer6_grid(filename, *data_ptr, rg_xnum, rg_ynum, + gctl::save_surfer6_grid(filename, curr_data.datval_, rg_xnum, rg_ynum, rg_xmin, rg_ymin, rg_dx, rg_dy); } } - else if (curr_data->get_dattype() == ElemData) + else if (curr_data.loctype_ == ElemData) { if (grid_type == Surfer6Text) { - gctl::save_surfer6_grid(filename, *data_ptr, rg_xnum-1, rg_ynum-1, + gctl::save_surfer6_grid(filename, curr_data.datval_, rg_xnum-1, rg_ynum-1, rg_xmin+0.5*rg_dx, rg_xmin+0.5*rg_dx+(rg_xnum-2)*rg_dx, rg_ymin+0.5*rg_dy, rg_ymin+0.5*rg_dy+(rg_ynum-2)*rg_dy, NAN, NAN, gctl::Surfer6Text); } else if (grid_type == Surfer6Binary) { - gctl::save_surfer6_grid(filename, *data_ptr, rg_xnum-1, rg_ynum-1, + gctl::save_surfer6_grid(filename, curr_data.datval_, rg_xnum-1, rg_ynum-1, rg_xmin+0.5*rg_dx, rg_xmin+0.5*rg_dx+(rg_xnum-2)*rg_dx, rg_ymin+0.5*rg_dy, rg_ymin+0.5*rg_dy+(rg_ynum-2)*rg_dy, NAN, NAN, gctl::Surfer6Binary); } else if (grid_type == Surfer7Grid) { - gctl::save_surfer6_grid(filename, *data_ptr, rg_xnum-1, rg_ynum-1, + gctl::save_surfer6_grid(filename, curr_data.datval_, rg_xnum-1, rg_ynum-1, rg_xmin+0.5*rg_dx, rg_ymin+0.5*rg_dy, rg_dx, rg_dy); } } - return; } @@ -712,40 +659,32 @@ void gctl::regular_grid::save_gmsh(std::string filename, index_packed_e packed) return; } -void gctl::regular_grid::save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed) +void gctl::regular_grid::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, d_type, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, out_mode, packed); return; } void gctl::regular_grid::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, datname, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); return; } void gctl::regular_grid::save_text(std::string filename, const array &datname) { mesh_data_type_e d_type; - meshdata *dat_ptr = nullptr; - - dat_ptr = get_data(datname[0]); - d_type = dat_ptr->get_dattype(); + meshdata curr_data = get_data(datname[0]); + d_type = curr_data.loctype_; for (size_t i = 1; i < datname.size(); i++) { - dat_ptr = get_data(datname[i]); - if (d_type != dat_ptr->get_dattype()) + curr_data = get_data(datname[i]); + if (d_type != curr_data.loctype_) { - throw std::runtime_error("[gctl::regular_grid] multiple data location types occured."); + throw std::runtime_error("[gctl::regular_grid] multiple data location types found."); } } - array*> datval_ptr(datname.size(), nullptr); - for (size_t i = 0; i < datname.size(); i++) - { - datval_ptr[i] = (array*) get_datval(datname[i]); - } - std::ofstream ofile; open_outfile(ofile, filename, ".txt"); @@ -756,26 +695,28 @@ void gctl::regular_grid::save_text(std::string filename, const arrayget_dattype() == NodeData) + if (curr_data.loctype_ == NodeData) { - for (size_t i = 0; i < node_num; i++) + for (size_t i = 0; i < node_num_; i++) { ofile << nodes[i].x << " " << nodes[i].y; for (size_t n = 0; n < datname.size(); n++) { - ofile << " " << datval_ptr[n]->at(i); + curr_data = get_data(datname[n]); + ofile << " " << curr_data.datval_[i]; } ofile << "\n"; } } else { - for (size_t i = 0; i < ele_num; i++) + for (size_t i = 0; i < ele_num_; i++) { ofile << 0.5*(elements[i].dl->x + elements[i].ur->x) << " " << 0.5*(elements[i].dl->y + elements[i].ur->y); for (size_t n = 0; n < datname.size(); n++) { - ofile << " " << datval_ptr[n]->at(i); + curr_data = get_data(datname[n]); + ofile << " " << curr_data.datval_[i]; } ofile << "\n"; } @@ -788,21 +729,15 @@ void gctl::regular_grid::save_text(std::string filename, const array &in_posi, const array &in_val, double search_xlen, double search_ylen, double search_deg, std::string datname, mesh_data_type_e d_type) { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_grid] The mesh is not initialized."); - } - - gctl::array grid_points; + check_initiated(); // 检查网格是否已经初始化 if (in_posi.size() != in_val.size()) { throw std::runtime_error("[gctl::regular_grid] Invalid sizes of the input data cloud."); } - // create a new data object - meshdata *data_ptr = add_data(datname, d_type, true, Scalar); array *inte_data = nullptr; + gctl::array grid_points; if (d_type == NodeData) { grid_points.resize(rg_xnum*rg_ynum); @@ -830,14 +765,15 @@ void gctl::regular_grid::load_data_cloud(const array &in_posi, const a inte_data = p2p_dist_2d(grid_points.get(), grid_points.size(), in_posi.get(), in_val.get(), in_posi.size(), search_xlen, search_ylen, search_deg); - - array *val_ptr = (array*) data_ptr->get_datval_ptr(); - for (int i = 0; i < val_ptr->size(); i++) + + // create a new data object + meshdata curr_data = add_data(d_type, Scalar, datname, 0.0, true, GCTL_BDL_MAX); + for (int i = 0; i < curr_data.datval_.size(); i++) { - val_ptr->at(i) = inte_data->at(i); + curr_data.datval_[i] = inte_data->at(i); } - delete inte_data; + delete inte_data; // 释放内存 return; } @@ -849,15 +785,14 @@ void gctl::regular_grid::extract_points(std::string datname, const arrayget_valtype(); - mesh_data_type_e data_type = data_ptr->get_dattype(); + meshdata curr_data = get_data(datname); + mesh_data_value_e value_type = curr_data.valtype_; + mesh_data_type_e data_type = curr_data.loctype_; if(value_type != Scalar) { throw std::runtime_error("[gctl::regular_grid] Wrong data's value type."); } - array *val_ptr = (array*) data_ptr->get_datval_ptr(); out_val.resize(in_posi.size()); int tmp_i, tmp_j, in_xnum, in_ynum; @@ -875,15 +810,15 @@ void gctl::regular_grid::extract_points(std::string datname, const arrayat(tmp_i + tmp_j*in_xnum)) && - !std::isnan(val_ptr->at(tmp_i + 1 + tmp_j*in_xnum)) && - !std::isnan(val_ptr->at(tmp_i + 1 + (tmp_j+1)*in_xnum)) && - !std::isnan(val_ptr->at(tmp_i + (tmp_j+1)*in_xnum))) + if (!std::isnan(curr_data.datval_[tmp_i + tmp_j*in_xnum]) && + !std::isnan(curr_data.datval_[tmp_i + 1 + tmp_j*in_xnum]) && + !std::isnan(curr_data.datval_[tmp_i + 1 + (tmp_j+1)*in_xnum]) && + !std::isnan(curr_data.datval_[tmp_i + (tmp_j+1)*in_xnum])) { out_val[i] = rect_interpolate(rg_xmin + tmp_i*rg_dx, rg_ymin + tmp_j*rg_dy, - rg_dx, rg_dy, in_posi[i].x, in_posi[i].y, val_ptr->at(tmp_i + tmp_j*in_xnum), - val_ptr->at(tmp_i + 1 + tmp_j*in_xnum), val_ptr->at(tmp_i + 1 + (tmp_j+1)*in_xnum), - val_ptr->at(tmp_i + (tmp_j+1)*in_xnum)); + rg_dx, rg_dy, in_posi[i].x, in_posi[i].y, curr_data.datval_[tmp_i + tmp_j*in_xnum], + curr_data.datval_[tmp_i + 1 + tmp_j*in_xnum], curr_data.datval_[tmp_i + 1 + (tmp_j+1)*in_xnum], + curr_data.datval_[tmp_i + (tmp_j+1)*in_xnum]); } else out_val[i] = NAN; } @@ -902,15 +837,15 @@ void gctl::regular_grid::extract_points(std::string datname, const arrayat(tmp_i + tmp_j*in_xnum)) && - !std::isnan(val_ptr->at(tmp_i + 1 + tmp_j*in_xnum)) && - !std::isnan(val_ptr->at(tmp_i + 1 + (tmp_j+1)*in_xnum)) && - !std::isnan(val_ptr->at(tmp_i + (tmp_j+1)*in_xnum))) + if (!std::isnan(curr_data.datval_[tmp_i + tmp_j*in_xnum]) && + !std::isnan(curr_data.datval_[tmp_i + 1 + tmp_j*in_xnum]) && + !std::isnan(curr_data.datval_[tmp_i + 1 + (tmp_j+1)*in_xnum]) && + !std::isnan(curr_data.datval_[tmp_i + (tmp_j+1)*in_xnum])) { out_val[i] = rect_interpolate(rg_xmin + 0.5*rg_dx + tmp_i*rg_dx, rg_ymin + 0.5*rg_dy + tmp_j*rg_dy, - rg_dx, rg_dy, in_posi[i].x, in_posi[i].y, val_ptr->at(tmp_i + tmp_j*in_xnum), - val_ptr->at(tmp_i + 1 + tmp_j*in_xnum), val_ptr->at(tmp_i + 1 + (tmp_j+1)*in_xnum), - val_ptr->at(tmp_i + (tmp_j+1)*in_xnum)); + rg_dx, rg_dy, in_posi[i].x, in_posi[i].y, curr_data.datval_[tmp_i + tmp_j*in_xnum], + curr_data.datval_[tmp_i + 1 + tmp_j*in_xnum], curr_data.datval_[tmp_i + 1 + (tmp_j+1)*in_xnum], + curr_data.datval_[tmp_i + (tmp_j+1)*in_xnum]); } else out_val[i] = NAN; } @@ -944,9 +879,9 @@ void gctl::regular_grid::extract_profile(std::string datname, const point2dc &st void gctl::regular_grid::gradient(std::string datname, std::string gradname, gradient_type_e d_type, int order) { - meshdata *data_ptr = get_data(datname); - mesh_data_value_e value_type = data_ptr->get_valtype(); - mesh_data_type_e data_type = data_ptr->get_dattype(); + meshdata curr_data = get_data(datname); + mesh_data_value_e value_type = curr_data.valtype_; + mesh_data_type_e data_type = curr_data.loctype_; if(value_type != Scalar) { @@ -959,139 +894,122 @@ void gctl::regular_grid::gradient(std::string datname, std::string gradname, gra } // 检查是否存在与梯度数据同名的数据 若有则检查是否需要重新建立数据 - meshdata *new_data_ptr = nullptr; + meshdata new_data; mesh_data_value_e value_type2; mesh_data_type_e data_type2; if (saved(gradname)) { - new_data_ptr = get_data(gradname); - value_type2 = new_data_ptr->get_valtype(); - data_type2 = new_data_ptr->get_dattype(); + new_data = get_data(gradname); + value_type2 = new_data.valtype_; + data_type2 = new_data.loctype_; if (value_type2 != value_type || data_type2 != data_type) { // 删除原有数据 remove_data(gradname); // 新建数据 - new_data_ptr = add_data(gradname, data_type, true, value_type); + new_data = add_data(data_type, Scalar, gradname, 0.0, true, GCTL_BDL_MAX); } } - else new_data_ptr = add_data(gradname, data_type, true, value_type); + else new_data = add_data(data_type, Scalar, gradname, 0.0, true, GCTL_BDL_MAX); - array *inval_ptr = (array*) data_ptr->get_datval_ptr(); - array *outval_ptr = (array*) new_data_ptr->get_datval_ptr(); if (data_type == NodeData && d_type == Dx) { - difference_2d(*inval_ptr, *outval_ptr, rg_ynum, rg_xnum, rg_dx, Dx, order); + difference_2d(curr_data.datval_, new_data.datval_, rg_ynum, rg_xnum, rg_dx, Dx, order); } else if (data_type == NodeData && d_type == Dy) { - difference_2d(*inval_ptr, *outval_ptr, rg_ynum, rg_xnum, rg_dy, Dy, order); + difference_2d(curr_data.datval_, new_data.datval_, rg_ynum, rg_xnum, rg_dy, Dy, order); } else if (data_type == ElemData && d_type == Dx) { - difference_2d(*inval_ptr, *outval_ptr, rg_ynum-1, rg_xnum-1, rg_dx, Dx, order); + difference_2d(curr_data.datval_, new_data.datval_, rg_ynum-1, rg_xnum-1, rg_dx, Dx, order); } else { - difference_2d(*inval_ptr, *outval_ptr, rg_ynum-1, rg_xnum-1, rg_dy, Dy, order); + difference_2d(curr_data.datval_, new_data.datval_, rg_ynum-1, rg_xnum-1, rg_dy, Dy, order); } return; } void gctl::regular_grid::sum(std::string newname, std::string datname, std::string datname2) { - meshdata *data_ptr1 = get_data(datname); - mesh_data_value_e value_type1 = data_ptr1->get_valtype(); - mesh_data_type_e data_type1 = data_ptr1->get_dattype(); + meshdata data_1 = get_data(datname); + mesh_data_value_e value_type1 = data_1.valtype_; + mesh_data_type_e data_type1 = data_1.loctype_; - meshdata *data_ptr2 = get_data(datname2); - mesh_data_value_e value_type2 = data_ptr2->get_valtype(); - mesh_data_type_e data_type2 = data_ptr2->get_dattype(); + meshdata data_2 = get_data(datname2); + mesh_data_value_e value_type2 = data_2.valtype_; + mesh_data_type_e data_type2 = data_2.loctype_; if (value_type1 != value_type2 || data_type1 != data_type2) { throw std::runtime_error("[gctl::regular_grid] Can't preform the process."); } - array *val_ptr1 = (array*) data_ptr1->get_datval_ptr(); - array *val_ptr2 = (array*) data_ptr2->get_datval_ptr(); - - meshdata *new_data_ptr = nullptr; - new_data_ptr = add_data(newname, data_type1, true, value_type1); + meshdata new_data = add_data(data_type1, value_type1, newname, 0.0, true, GCTL_BDL_MAX); - array *val_ptr = (array*) new_data_ptr->get_datval_ptr(); - for (size_t i = 0; i < val_ptr->size(); i++) + for (size_t i = 0; i < new_data.datval_.size(); i++) { - val_ptr->at(i) = val_ptr1->at(i) + val_ptr2->at(i); + new_data.datval_[i] = data_1.datval_[i] + data_2.datval_[i]; } return; } void gctl::regular_grid::diff(std::string newname, std::string datname, std::string datname2) { - meshdata *data_ptr1 = get_data(datname); - mesh_data_value_e value_type1 = data_ptr1->get_valtype(); - mesh_data_type_e data_type1 = data_ptr1->get_dattype(); + meshdata data_1 = get_data(datname); + mesh_data_value_e value_type1 = data_1.valtype_; + mesh_data_type_e data_type1 = data_1.loctype_; - meshdata *data_ptr2 = get_data(datname2); - mesh_data_value_e value_type2 = data_ptr2->get_valtype(); - mesh_data_type_e data_type2 = data_ptr2->get_dattype(); + meshdata data_2 = get_data(datname2); + mesh_data_value_e value_type2 = data_2.valtype_; + mesh_data_type_e data_type2 = data_2.loctype_; if (value_type1 != value_type2 || data_type1 != data_type2) { throw std::runtime_error("[gctl::regular_grid] Can't preform the process."); } - array *val_ptr1 = (array*) data_ptr1->get_datval_ptr(); - array *val_ptr2 = (array*) data_ptr2->get_datval_ptr(); - - meshdata *new_data_ptr = nullptr; - new_data_ptr = add_data(newname, data_type1, true, value_type1); + meshdata new_data = add_data(data_type1, value_type1, newname, 0.0, true, GCTL_BDL_MAX); - array *val_ptr = (array*) new_data_ptr->get_datval_ptr(); - for (size_t i = 0; i < val_ptr->size(); i++) + for (size_t i = 0; i < new_data.datval_.size(); i++) { - val_ptr->at(i) = val_ptr1->at(i) - val_ptr2->at(i); + new_data.datval_[i] = data_1.datval_[i] - data_2.datval_[i]; } return; } void gctl::regular_grid::boolean(std::string newname, std::string datname, std::string maskname, bool reverse) { - meshdata *data_ptr1 = get_data(datname); - mesh_data_value_e value_type1 = data_ptr1->get_valtype(); - mesh_data_type_e data_type1 = data_ptr1->get_dattype(); + meshdata data_1 = get_data(datname); + mesh_data_value_e value_type1 = data_1.valtype_; + mesh_data_type_e data_type1 = data_1.loctype_; - meshdata *data_ptr2 = get_data(maskname); - mesh_data_value_e value_type2 = data_ptr2->get_valtype(); - mesh_data_type_e data_type2 = data_ptr2->get_dattype(); + meshdata data_2 = get_data(maskname); + mesh_data_value_e value_type2 = data_2.valtype_; + mesh_data_type_e data_type2 = data_2.loctype_; if (value_type1 != value_type2 || data_type1 != data_type2) { throw std::runtime_error("[gctl::regular_grid] Can't preform the process."); } - array *val_ptr1 = (array*) data_ptr1->get_datval_ptr(); - array *val_ptr2 = (array*) data_ptr2->get_datval_ptr(); - - meshdata *new_data_ptr = nullptr; - new_data_ptr = add_data(newname, data_type1, true, value_type1); + meshdata new_data = add_data(data_type1, value_type1, newname, 0.0, true, GCTL_BDL_MAX); - array *val_ptr = (array*) new_data_ptr->get_datval_ptr(); if (!reverse) { - for (size_t i = 0; i < val_ptr->size(); i++) + for (size_t i = 0; i < new_data.datval_.size(); i++) { - if (fabs(val_ptr2->at(i)) < 1e-8 || isnan(val_ptr2->at(i))) val_ptr->at(i) = GCTL_BDL_MAX; - else val_ptr->at(i) = val_ptr1->at(i); + if (fabs(data_2.datval_[i]) < 1e-8 || isnan(data_2.datval_[i])) new_data.datval_[i] = GCTL_BDL_MAX; + else new_data.datval_[i] = data_1.datval_[i]; } } else { - for (size_t i = 0; i < val_ptr->size(); i++) + for (size_t i = 0; i < new_data.datval_.size(); i++) { - if (fabs(val_ptr2->at(i)) < 1e-8 || isnan(val_ptr2->at(i))) val_ptr->at(i) = val_ptr1->at(i); - else val_ptr->at(i) = GCTL_BDL_MAX; + if (fabs(data_2.datval_[i]) < 1e-8 || isnan(data_2.datval_[i])) new_data.datval_[i] = data_1.datval_[i]; + else new_data.datval_[i] = GCTL_BDL_MAX; } } return; @@ -1116,31 +1034,27 @@ void gctl::regular_grid::function(std::string expression_str, std::string newnam exprtk::parser parser; if (!parser.compile(expression_str, expression)) throw std::runtime_error("[gctl::function] Fail to compile the math expression."); - meshdata* data_ptr = nullptr; - - if (!saved(newname)) data_ptr = add_data(newname, NodeData, true, Scalar); - else data_ptr = get_data(newname); + if (!saved(newname)) add_data(NodeData, Scalar, newname, 0.0, true, GCTL_BDL_MAX); + meshdata curr_data = get_data(newname); - array* val_ptr = (array*) data_ptr->get_datval_ptr(); - - if (data_ptr->get_dattype() == NodeData) + if (curr_data.loctype_ == NodeData) { - for (size_t i = 0; i < val_ptr->size(); i++) + for (size_t i = 0; i < curr_data.datval_.size(); i++) { - var[0] = val_ptr->at(i); + var[0] = curr_data.datval_[i]; var[1] = nodes[i].x; var[2] = nodes[i].y; - val_ptr->at(i) = expression.value(); + curr_data.datval_[i] = expression.value(); } } else { - for (size_t i = 0; i < val_ptr->size(); i++) + for (size_t i = 0; i < curr_data.datval_.size(); i++) { - var[0] = val_ptr->at(i); + var[0] = curr_data.datval_[i]; var[1] = 0.5*(elements[i].dl->x + elements[i].ur->x); var[2] = 0.5*(elements[i].dl->y + elements[i].ur->y); - val_ptr->at(i) = expression.value(); + curr_data.datval_[i] = expression.value(); } } return; @@ -1164,22 +1078,22 @@ void gctl::regular_grid::calculator(std::string expression_str, const array parser; if (!parser.compile(expression_str, expression)) throw std::runtime_error("[gctl::regular_grid] Fail to compile the math expression."); - array data_ptrs(var.size(), nullptr); + array datas(var.size()); mesh_data_value_e val_type1, val_type2; mesh_data_type_e data_type1, data_type2; // Remeber we put the output at the first place. for (size_t i = 1; i < var.size(); i++) { - data_ptrs[i] = get_data(data_list[i]); + datas[i] = get_data(data_list[i]); } - val_type1 = data_ptrs[1]->get_valtype(); - data_type1= data_ptrs[1]->get_dattype(); + val_type1 = datas[1].valtype_; + data_type1= datas[1].loctype_; for (size_t i = 2; i < var.size(); i++) { - val_type2 = data_ptrs[i]->get_valtype(); - data_type2= data_ptrs[i]->get_dattype(); + val_type2 = datas[i].valtype_; + data_type2= datas[i].loctype_; if (val_type1 != val_type2 || data_type1 != data_type2) { throw std::runtime_error("[gctl::regular_grid] Can't preform the calculation on selected data."); @@ -1187,32 +1101,22 @@ void gctl::regular_grid::calculator(std::string expression_str, const arrayget_valtype(); - data_type2= data_ptrs[0]->get_dattype(); - if (val_type1 != val_type2 || data_type1 != data_type2) - { - throw std::runtime_error("[gctl::regular_grid] Can't preform the calculation on selected data."); - } + throw std::runtime_error("[gctl::regular_grid] Can't preform the calculation on selected data."); } - array*> val_ptrs(var.size()); - for (size_t i = 0; i < var.size(); i++) - { - val_ptrs[i] = (array*) data_ptrs[i]->get_datval_ptr(); - } - - for (size_t i = 0; i < val_ptrs[0]->size(); i++) + for (size_t i = 0; i < datas[0].datval_.size(); i++) { for (size_t v = 0; v < var.size(); v++) { - var[v] = val_ptrs[v]->at(i); + var[v] = datas[v].datval_[i]; } - val_ptrs[0]->at(i) = expression.value(); + datas[0].datval_[i] = expression.value(); } return; } @@ -1223,9 +1127,9 @@ void gctl::regular_grid::calculator(std::string expression_str, const arrayget_valtype(); - mesh_data_type_e data_type = data_ptr->get_dattype(); + meshdata curr_data = get_data(datname); + mesh_data_value_e value_type = curr_data.valtype_; + mesh_data_type_e data_type = curr_data.loctype_; if(value_type != Scalar) { @@ -1237,8 +1141,6 @@ void gctl::regular_grid::wavelet(std::string datname, std::string wavename, int throw std::runtime_error("[gctl::regular_grid] The decomposition level must be greater than zero."); } - array *inval_ptr = (array*) data_ptr->get_datval_ptr(); - wave_object obj = nullptr; wt2_object wt = nullptr; obj = wave_init(wavename.c_str()); @@ -1246,7 +1148,7 @@ void gctl::regular_grid::wavelet(std::string datname, std::string wavename, int else wt = wt2_init(obj, "dwt", rg_ynum-1, rg_xnum-1, order); double *wavecoeffs = nullptr; - wavecoeffs = dwt2(wt, inval_ptr->get()); + wavecoeffs = dwt2(wt, curr_data.datval_.get()); gctl::array coeff_copy(wt->outlength); for (int i = 0; i < wt->outlength; i++) @@ -1261,9 +1163,8 @@ void gctl::regular_grid::wavelet(std::string datname, std::string wavename, int wavecoeffs[i] = coeff_copy[i]; } - data_ptr = add_data(datname+"_A"+std::to_string(wt->J), data_type, true, value_type); - array *outval_ptr = (array*) data_ptr->get_datval_ptr(); - idwt2(wt, wavecoeffs, outval_ptr->get()); + meshdata new_data = add_data(data_type, value_type, datname+"_A"+std::to_string(wt->J), 0.0, true, GCTL_BDL_MAX); + idwt2(wt, wavecoeffs, new_data.datval_.get()); int coeff_idx; for (int j = 0; j < wt->J; j++) @@ -1281,9 +1182,8 @@ void gctl::regular_grid::wavelet(std::string datname, std::string wavename, int wavecoeffs[i+coeff_idx] = coeff_copy[i+coeff_idx]; } - data_ptr = add_data(datname+"_D"+std::to_string(wt->J - j), data_type, true, value_type); - outval_ptr = (array*) data_ptr->get_datval_ptr(); - idwt2(wt, wavecoeffs, outval_ptr->get()); + new_data = add_data(data_type, value_type, datname+"_D"+std::to_string(wt->J - j), 0.0, true, GCTL_BDL_MAX); + idwt2(wt, wavecoeffs, new_data.datval_.get()); } if (summary) wt2_summary(wt); diff --git a/lib/mesh/regular_grid.h b/lib/mesh/regular_grid.h index 8b92bd8..ccd3392 100644 --- a/lib/mesh/regular_grid.h +++ b/lib/mesh/regular_grid.h @@ -92,7 +92,7 @@ namespace gctl void save_surfer_grid(std::string filename, std::string datname, surfer_file_type_e grid_type = Surfer7Grid); void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed = Packed); + void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); void save_text(std::string filename, const array &datname); diff --git a/lib/mesh/regular_mesh_2d.cpp b/lib/mesh/regular_mesh_2d.cpp index d7104fa..209e64d 100644 --- a/lib/mesh/regular_mesh_2d.cpp +++ b/lib/mesh/regular_mesh_2d.cpp @@ -30,22 +30,18 @@ void gctl::regular_mesh_2d::init(std::string in_name, std::string in_info, int xbnum, int ybnum, double xmin, double ymin, double xsize, double ysize) { - if (initialized) - { - throw std::runtime_error("[gctl::regular_mesh_2d] The mesh is already initialized."); - } - + check_initiated(true); // 检查网格是否已经初始化 base_mesh::init(REGULAR_MESH, MESH_2D, in_name, in_info); rm_xbnum = xbnum; rm_ybnum = ybnum; rm_xmin = xmin; rm_ymin = ymin; rm_xsize = xsize; rm_ysize = ysize; - node_num = (rm_xbnum+1) * (rm_ybnum+1); - ele_num = rm_xbnum * rm_ybnum; + node_num_ = (rm_xbnum+1) * (rm_ybnum+1); + ele_num_ = rm_xbnum * rm_ybnum; - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); for (int j = 0; j < rm_ybnum+1; j++) { @@ -71,16 +67,24 @@ void gctl::regular_mesh_2d::init(std::string in_name, std::string in_info, int x } } - initialized = true; + initialized_ = true; + return; +} + +void gctl::regular_mesh_2d::show_mesh_dimension(std::ostream &os) const +{ + os << "node num: " << node_num_ << std::endl; + os << "elem num: " << ele_num_ << std::endl; + os << "x-range: " << rm_xmin << " -> " << rm_xmin + (rm_xbnum - 1)*rm_xsize << "\n"; + os << "y-range: " << rm_ymin << " -> " << rm_ymin + (rm_ybnum - 1)*rm_ysize << "\n"; + os << "block-size: " << rm_xsize << ", " << rm_ysize << "\n"; + os << "dimension: " << rm_xbnum << ", " << rm_ybnum << "\n"; return; } void gctl::regular_mesh_2d::load_binary(std::string filename) { - if (initialized) - { - throw std::runtime_error("[gctl::regular_mesh_2d] The mesh is already initialized."); - } + check_initiated(true); // 检查网格是否已经初始化(如果已经初始化，那么就会抛出异常) std::ifstream infile; gctl::open_infile(infile, filename, ".2m", @@ -97,11 +101,11 @@ void gctl::regular_mesh_2d::load_binary(std::string filename) infile.read((char*)&rm_xsize, sizeof(double)); infile.read((char*)&rm_ysize, sizeof(double)); - node_num = (rm_xbnum+1) * (rm_ybnum+1); - ele_num = rm_xbnum * rm_ybnum; + node_num_ = (rm_xbnum+1) * (rm_ybnum+1); + ele_num_ = rm_xbnum * rm_ybnum; - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); for (int j = 0; j < rm_ybnum+1; j++) { @@ -127,21 +131,17 @@ void gctl::regular_mesh_2d::load_binary(std::string filename) } } - initialized = true; - // 读入模型数据单元 load_datablock(infile); infile.close(); + initialized_ = true; return; } void gctl::regular_mesh_2d::save_binary(std::string filename) { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_2d] The mesh is not initialized."); - } + check_initiated(); // 检查网格是否已经初始化 std::ofstream outfile; gctl::open_outfile(outfile, filename, ".2m", @@ -177,61 +177,37 @@ gctl::regular_mesh_2d::~regular_mesh_2d(){} int gctl::regular_mesh_2d::get_xbnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_xbnum; } int gctl::regular_mesh_2d::get_ybnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_ybnum; } double gctl::regular_mesh_2d::get_xmin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_xmin; } double gctl::regular_mesh_2d::get_ymin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_ymin; } double gctl::regular_mesh_2d::get_xsize() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_xsize; } double gctl::regular_mesh_2d::get_ysize() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_2d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_ysize; } @@ -244,14 +220,14 @@ void gctl::regular_mesh_2d::save_gmsh(std::string filename, index_packed_e packe return; } -void gctl::regular_mesh_2d::save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed) +void gctl::regular_mesh_2d::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, d_type, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, out_mode, packed); return; } void gctl::regular_mesh_2d::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, datname, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); return; } diff --git a/lib/mesh/regular_mesh_2d.h b/lib/mesh/regular_mesh_2d.h index 19285b7..39f7bb4 100644 --- a/lib/mesh/regular_mesh_2d.h +++ b/lib/mesh/regular_mesh_2d.h @@ -43,6 +43,8 @@ namespace gctl void init(std::string in_name, std::string in_info, int xbnum, int ybnum, double xmin, double ymin, double xsize, double ysize); + void show_mesh_dimension(std::ostream &os) const; + void load_binary(std::string filename); void save_binary(std::string filename); @@ -63,7 +65,7 @@ namespace gctl double get_ysize() const; void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed = Packed); + void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); protected: diff --git a/lib/mesh/regular_mesh_3d.cpp b/lib/mesh/regular_mesh_3d.cpp index 5e53118..8883add 100644 --- a/lib/mesh/regular_mesh_3d.cpp +++ b/lib/mesh/regular_mesh_3d.cpp @@ -30,22 +30,18 @@ void gctl::regular_mesh_3d::init(std::string in_name, std::string in_info, int xbnum, int ybnum, int zbnum, double xmin, double ymin, double zmin, double xsize, double ysize, double zsize) { - if (initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is already initialized."); - } - + check_initiated(true); // 检查网格是否已经初始化 base_mesh::init(REGULAR_MESH, MESH_3D, in_name, in_info); rm_xbnum = xbnum; rm_ybnum = ybnum; rm_zbnum = zbnum; rm_xmin = xmin; rm_ymin = ymin; rm_zmin = zmin; rm_xsize = xsize; rm_ysize = ysize; rm_zsize = zsize; - node_num = (rm_xbnum+1) * (rm_ybnum+1) *(rm_zbnum+1); - ele_num = rm_xbnum * rm_ybnum * rm_zbnum; + node_num_ = (rm_xbnum+1) * (rm_ybnum+1) *(rm_zbnum+1); + ele_num_ = rm_xbnum * rm_ybnum * rm_zbnum; - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); for (int k = 0; k < rm_zbnum+1; k++) { @@ -82,16 +78,25 @@ void gctl::regular_mesh_3d::init(std::string in_name, std::string in_info, int x } } - initialized = true; + initialized_ = true; + return; +} + +void gctl::regular_mesh_3d::show_mesh_dimension(std::ostream &os) const +{ + os << "node num: " << node_num_ << std::endl; + os << "elem num: " << ele_num_ << std::endl; + os << "x-range: " << rm_xmin << " -> " << rm_xmin + (rm_xbnum - 1)*rm_xsize << "\n"; + os << "y-range: " << rm_ymin << " -> " << rm_ymin + (rm_ybnum - 1)*rm_ysize << "\n"; + os << "z-range: " << rm_zmin << " -> " << rm_zmin + (rm_zbnum - 1)*rm_zsize << "\n"; + os << "block-size: " << rm_xsize << ", " << rm_ysize << ", " << rm_zsize << "\n"; + os << "dimension: " << rm_xbnum << ", " << rm_ybnum << ", " << rm_zbnum << "\n"; return; } void gctl::regular_mesh_3d::load_binary(std::string filename) { - if (initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is already initialized."); - } + check_initiated(true); // 检查网格是否已经初始化 std::ifstream infile; gctl::open_infile(infile, filename, ".2m", @@ -111,11 +116,11 @@ void gctl::regular_mesh_3d::load_binary(std::string filename) infile.read((char*)&rm_ysize, sizeof(double)); infile.read((char*)&rm_zsize, sizeof(double)); - node_num = (rm_xbnum+1) * (rm_ybnum+1) *(rm_zbnum+1); - ele_num = rm_xbnum * rm_ybnum * rm_zbnum; + node_num_ = (rm_xbnum+1) * (rm_ybnum+1) *(rm_zbnum+1); + ele_num_ = rm_xbnum * rm_ybnum * rm_zbnum; - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); for (int k = 0; k < rm_zbnum+1; k++) { @@ -152,21 +157,17 @@ void gctl::regular_mesh_3d::load_binary(std::string filename) } } - initialized = true; - // 读入模型数据单元 load_datablock(infile); infile.close(); + initialized_ = true; return; } void gctl::regular_mesh_3d::save_binary(std::string filename) { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is not initialized."); - } + check_initiated(); // 检查网格是否已经初始化 std::ofstream outfile; gctl::open_outfile(outfile, filename, ".2m", @@ -205,91 +206,55 @@ gctl::regular_mesh_3d::~regular_mesh_3d(){} int gctl::regular_mesh_3d::get_xbnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_xbnum; } int gctl::regular_mesh_3d::get_ybnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_ybnum; } int gctl::regular_mesh_3d::get_zbnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_zbnum; } double gctl::regular_mesh_3d::get_xmin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_xmin; } double gctl::regular_mesh_3d::get_ymin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_ymin; } double gctl::regular_mesh_3d::get_zmin() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_zmin; } double gctl::regular_mesh_3d::get_xsize() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_xsize; } double gctl::regular_mesh_3d::get_ysize() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_ysize; } double gctl::regular_mesh_3d::get_zsize() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_zsize; } @@ -302,15 +267,15 @@ void gctl::regular_mesh_3d::save_gmsh(std::string filename, index_packed_e packe return; } -void gctl::regular_mesh_3d::save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed) +void gctl::regular_mesh_3d::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, d_type, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, out_mode, packed); return; } void gctl::regular_mesh_3d::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, datname, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); return; } diff --git a/lib/mesh/regular_mesh_3d.h b/lib/mesh/regular_mesh_3d.h index 500b622..ec42b47 100644 --- a/lib/mesh/regular_mesh_3d.h +++ b/lib/mesh/regular_mesh_3d.h @@ -43,6 +43,8 @@ namespace gctl void init(std::string in_name, std::string in_info, int xbnum, int ybnum, int zbnum, double xmin, double ymin, double zmin, double xsize, double ysize, double zsize); + void show_mesh_dimension(std::ostream &os) const; + void load_binary(std::string filename); void save_binary(std::string filename); @@ -66,7 +68,7 @@ namespace gctl double get_zsize() const; void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed = Packed); + void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); //void edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, double in_val); diff --git a/lib/mesh/regular_mesh_sph_3d.cpp b/lib/mesh/regular_mesh_sph_3d.cpp index 27801ab..0849249 100644 --- a/lib/mesh/regular_mesh_sph_3d.cpp +++ b/lib/mesh/regular_mesh_sph_3d.cpp @@ -30,22 +30,18 @@ void gctl::regular_mesh_sph_3d::init(std::string in_name, std::string in_info, double lon_min, double lat_min, double rad_min, double lon_size, double lat_size, double rad_size, int lon_bnum, int lat_bnum, int rad_bnum) { - if (initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is already initialized."); - } - + check_initiated(true); // 检查网格是否已经初始化 base_mesh::init(REGULAR_MESH_SPH, MESH_3D, in_name, in_info); rm_lon_bnum = lon_bnum; rm_lat_bnum = lat_bnum; rm_rad_bnum = rad_bnum; rm_lon_min = lon_min; rm_lat_min = lat_min; rm_rad_min = rad_min; rm_lon_size = lon_size; rm_lat_size = lat_size; rm_rad_size = rad_size; - node_num = (rm_lon_bnum+1) * (rm_lat_bnum+1) *(rm_rad_bnum+1); - ele_num = rm_lon_bnum * rm_lat_bnum * rm_rad_bnum; + node_num_ = (rm_lon_bnum+1) * (rm_lat_bnum+1) *(rm_rad_bnum+1); + ele_num_ = rm_lon_bnum * rm_lat_bnum * rm_rad_bnum; - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); int tmp_id; for (int k = 0; k < rm_rad_bnum+1; k++) @@ -85,16 +81,25 @@ void gctl::regular_mesh_sph_3d::init(std::string in_name, std::string in_info, d } } - initialized = true; + initialized_ = true; + return; +} + +void gctl::regular_mesh_sph_3d::show_mesh_dimension(std::ostream &os) const +{ + os << "node num: " << node_num_ << std::endl; + os << "elem num: " << ele_num_ << std::endl; + os << "x-range: " << rm_lon_min << " -> " << rm_lon_min + (rm_lon_bnum - 1)*rm_lon_size << "\n"; + os << "y-range: " << rm_lat_min << " -> " << rm_lat_min + (rm_lat_bnum - 1)*rm_lat_size << "\n"; + os << "z-range: " << rm_rad_min << " -> " << rm_rad_min + (rm_rad_bnum - 1)*rm_rad_size << "\n"; + os << "block-size: " << rm_lon_size << ", " << rm_lat_size << ", " << rm_rad_size << "\n"; + os << "dimension: " << rm_lon_bnum << ", " << rm_lat_bnum << ", " << rm_rad_bnum << "\n"; return; } void gctl::regular_mesh_sph_3d::load_binary(std::string filename) { - if (initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is already initialized."); - } + check_initiated(true); // 检查网格是否已经初始化 std::ifstream infile; gctl::open_infile(infile, filename, ".2m", @@ -114,11 +119,11 @@ void gctl::regular_mesh_sph_3d::load_binary(std::string filename) infile.read((char*)&rm_lat_size, sizeof(double)); infile.read((char*)&rm_rad_size, sizeof(double)); - node_num = (rm_lon_bnum+1) * (rm_lat_bnum+1) *(rm_rad_bnum+1); - ele_num = rm_lon_bnum * rm_lat_bnum * rm_rad_bnum; + node_num_ = (rm_lon_bnum+1) * (rm_lat_bnum+1) *(rm_rad_bnum+1); + ele_num_ = rm_lon_bnum * rm_lat_bnum * rm_rad_bnum; - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); int tmp_id; for (int k = 0; k < rm_rad_bnum+1; k++) @@ -158,7 +163,7 @@ void gctl::regular_mesh_sph_3d::load_binary(std::string filename) } } - initialized = true; + initialized_ = true; // 读入模型数据单元 load_datablock(infile); @@ -169,10 +174,7 @@ void gctl::regular_mesh_sph_3d::load_binary(std::string filename) void gctl::regular_mesh_sph_3d::save_binary(std::string filename) { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is not initialized."); - } + check_initiated(); // 检查网格是否已经初始化 std::ofstream outfile; gctl::open_outfile(outfile, filename, ".2m", @@ -211,91 +213,55 @@ gctl::regular_mesh_sph_3d::~regular_mesh_sph_3d(){} int gctl::regular_mesh_sph_3d::get_lon_bnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_lon_bnum; } int gctl::regular_mesh_sph_3d::get_lat_bnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_lat_bnum; } int gctl::regular_mesh_sph_3d::get_rad_bnum() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_rad_bnum; } double gctl::regular_mesh_sph_3d::get_lon_min() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_lon_min; } double gctl::regular_mesh_sph_3d::get_lat_min() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_lat_min; } double gctl::regular_mesh_sph_3d::get_rad_min() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_rad_min; } double gctl::regular_mesh_sph_3d::get_lon_size() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_lon_size; } double gctl::regular_mesh_sph_3d::get_lat_size() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_lat_size; } double gctl::regular_mesh_sph_3d::get_rad_size() const { - if (!initialized) - { - throw std::runtime_error("[gctl::regular_mesh_sph_3d] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return rm_rad_size; } @@ -319,14 +285,14 @@ void gctl::regular_mesh_sph_3d::save_gmsh(std::string filename, index_packed_e p return; } -void gctl::regular_mesh_sph_3d::save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed) +void gctl::regular_mesh_sph_3d::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, d_type, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, out_mode, packed); return; } void gctl::regular_mesh_sph_3d::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, datname, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); return; } diff --git a/lib/mesh/regular_mesh_sph_3d.h b/lib/mesh/regular_mesh_sph_3d.h index abb2497..fd4fcd5 100644 --- a/lib/mesh/regular_mesh_sph_3d.h +++ b/lib/mesh/regular_mesh_sph_3d.h @@ -42,6 +42,8 @@ namespace gctl void init(std::string in_name, std::string in_info, double lon_min, double lat_min, double rad_min, double lon_size, double lat_size, double rad_size, int lon_bnum, int lat_bnum, int rad_bnum); + void show_mesh_dimension(std::ostream &os) const; + void load_binary(std::string filename); void save_binary(std::string filename); @@ -64,7 +66,7 @@ namespace gctl double get_rad_size() const; void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed = Packed); + void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); protected: diff --git a/lib/mesh/tet_mesh.cpp b/lib/mesh/tet_mesh.cpp index 19acad9..408d2e5 100644 --- a/lib/mesh/tet_mesh.cpp +++ b/lib/mesh/tet_mesh.cpp @@ -30,24 +30,20 @@ void gctl::tetrahedron_mesh::init(std::string in_name, std::string in_info, const array &in_nodes, const array &in_tets) { - if (initialized) - { - throw std::runtime_error("[gctl::tetrahedron_mesh] The mesh is already initialized."); - } - + check_initiated(true); // 检查网格是否已经初始化 base_mesh::init(TRI_TET_MESH, MESH_3D, in_name, in_info); - node_num = in_nodes.size(); - ele_num = in_tets.size(); + node_num_ = in_nodes.size(); + ele_num_ = in_tets.size(); - nodes.resize(node_num); - for (int i = 0; i < node_num; i++) + nodes.resize(node_num_); + for (int i = 0; i < node_num_; i++) { nodes[i] = in_nodes[i]; } - elements.resize(ele_num); - for (int i = 0; i < ele_num; i++) + elements.resize(ele_num_); + for (int i = 0; i < ele_num_; i++) { elements[i].id = i; for (int j = 0; j < 4; j++) @@ -57,16 +53,20 @@ void gctl::tetrahedron_mesh::init(std::string in_name, std::string in_info, cons elements[i].deter_vert_order(); } - initialized = true; + initialized_ = true; + return; +} + +void gctl::tetrahedron_mesh::show_mesh_dimension(std::ostream &os) const +{ + os << "node num: " << node_num_ << std::endl; + os << "elem num: " << ele_num_ << std::endl; return; } void gctl::tetrahedron_mesh::load_binary(std::string filename) { - if (initialized) - { - throw std::runtime_error("[gctl::tetrahedron_mesh] The mesh is already initialized."); - } + check_initiated(true); // 检查网格是否已经初始化 std::ifstream infile; gctl::open_infile(infile, filename, ".2m", @@ -76,19 +76,19 @@ void gctl::tetrahedron_mesh::load_binary(std::string filename) load_headinfo(infile, TRI_TET_MESH, MESH_2D); // 读入网格信息 - infile.read((char*)&node_num, sizeof(int)); - infile.read((char*)&ele_num, sizeof(int)); + infile.read((char*)&node_num_, sizeof(int)); + infile.read((char*)&ele_num_, sizeof(int)); - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); - for (int i = 0; i < node_num; i++) + for (int i = 0; i < node_num_; i++) { infile.read((char*)nodes.get(i), sizeof(gctl::vertex3dc)); } int in_index; - for (int i = 0; i < ele_num; i++) + for (int i = 0; i < ele_num_; i++) { elements[i].id = i; for (int j = 0; j < 4; j++) @@ -98,21 +98,18 @@ void gctl::tetrahedron_mesh::load_binary(std::string filename) } elements[i].deter_vert_order(); } - initialized = true; // 读入模型数据单元 load_datablock(infile); infile.close(); + initialized_ = true; return; } void gctl::tetrahedron_mesh::save_binary(std::string filename) { - if (!initialized) - { - throw std::runtime_error("[gctl::tetrahedron_mesh] The mesh is not initialized."); - } + check_initiated(); // 检查网格是否已经初始化 std::ofstream outfile; gctl::open_outfile(outfile, filename, ".2m", @@ -122,16 +119,16 @@ void gctl::tetrahedron_mesh::save_binary(std::string filename) save_headinfo(outfile); // 输出网格信息 - outfile.write((char*)&node_num, sizeof(int)); - outfile.write((char*)&ele_num, sizeof(int)); + outfile.write((char*)&node_num_, sizeof(int)); + outfile.write((char*)&ele_num_, sizeof(int)); - for (int i = 0; i < node_num; i++) + for (int i = 0; i < node_num_; i++) { outfile.write((char*)nodes.get(i), sizeof(gctl::vertex3dc)); } int in_index; - for (int i = 0; i < ele_num; i++) + for (int i = 0; i < ele_num_; i++) { for (int j = 0; j < 4; j++) { @@ -159,21 +156,13 @@ gctl::tetrahedron_mesh::~tetrahedron_mesh(){} const gctl::array &gctl::tetrahedron_mesh::get_nodes() const { - if (!initialized) - { - throw std::runtime_error("[gctl::tetrahedron_mesh] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return nodes; } const gctl::array &gctl::tetrahedron_mesh::get_elements() const { - if (!initialized) - { - throw std::runtime_error("[gctl::tetrahedron_mesh] The mesh is not initialized."); - } - + check_initiated(); // 检查网格是否已经初始化 return elements; } @@ -183,11 +172,10 @@ void gctl::tetrahedron_mesh::load_tetgen(std::string filename, index_packed_e pa gctl::read_Tetgen_element(filename, elements, nodes, packed); // 设置名称与信息等 - node_num = nodes.size(); - ele_num = elements.size(); + node_num_ = nodes.size(); + ele_num_ = elements.size(); base_mesh::init(TRI_TET_MESH, MESH_3D, filename, "Imported from a .node and .ele file."); - initialized = true; - + initialized_ = true; return; } @@ -200,11 +188,10 @@ void gctl::tetrahedron_mesh::load_gmsh(std::string filename, index_packed_e pack infile.close(); // 设置名称与信息等 - node_num = nodes.size(); - ele_num = elements.size(); + node_num_ = nodes.size(); + ele_num_ = elements.size(); base_mesh::init(TRI_TET_MESH, MESH_3D, filename, "Imported from a .msh file."); - initialized = true; - + initialized_ = true; return; } @@ -217,14 +204,14 @@ void gctl::tetrahedron_mesh::save_gmsh(std::string filename, index_packed_e pack return; } -void gctl::tetrahedron_mesh::save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed) +void gctl::tetrahedron_mesh::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, d_type, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, out_mode, packed); return; } void gctl::tetrahedron_mesh::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, datname, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); return; } diff --git a/lib/mesh/tet_mesh.h b/lib/mesh/tet_mesh.h index 18786a2..ea87a83 100644 --- a/lib/mesh/tet_mesh.h +++ b/lib/mesh/tet_mesh.h @@ -43,6 +43,8 @@ namespace gctl void init(std::string in_name, std::string in_info, const array &in_nodes, const array &in_tets); + void show_mesh_dimension(std::ostream &os) const; + void load_binary(std::string filename); void save_binary(std::string filename); @@ -61,7 +63,7 @@ namespace gctl void load_tetgen(std::string filename, index_packed_e packed = Packed); void load_gmsh(std::string filename, index_packed_e packed = Packed); void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed = Packed); + void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); protected: diff --git a/lib/mesh/tri_mesh.cpp b/lib/mesh/tri_mesh.cpp index ce1a3f7..6177c73 100644 --- a/lib/mesh/tri_mesh.cpp +++ b/lib/mesh/tri_mesh.cpp @@ -30,24 +30,20 @@ void gctl::triangle_mesh::init(std::string in_name, std::string in_info, const array &in_nodes, const array &in_triangles) { - if (initialized) - { - throw std::runtime_error("[gctl::triangle_mesh] The mesh is already initialized."); - } - + check_initiated(true); // 检查是否已经初始化 base_mesh::init(TRI_TET_MESH, MESH_2D, in_name, in_info); - node_num = in_nodes.size(); - ele_num = in_triangles.size(); + node_num_ = in_nodes.size(); + ele_num_ = in_triangles.size(); - nodes.resize(node_num); - for (int i = 0; i < node_num; i++) + nodes.resize(node_num_); + for (int i = 0; i < node_num_; i++) { nodes[i] = in_nodes[i]; } - elements.resize(ele_num); - for (int i = 0; i < ele_num; i++) + elements.resize(ele_num_); + for (int i = 0; i < ele_num_; i++) { elements[i].id = i; for (int j = 0; j < 3; j++) @@ -55,16 +51,21 @@ void gctl::triangle_mesh::init(std::string in_name, std::string in_info, const a elements[i].vert[j] = nodes.get(in_triangles[i].vert[j]->id); } } - initialized = true; + + initialized_ = true; + return; +} + +void gctl::triangle_mesh::show_mesh_dimension(std::ostream &os) const +{ + os << "node num: " << node_num_ << std::endl; + os << "elem num: " << ele_num_ << std::endl; return; } void gctl::triangle_mesh::load_binary(std::string filename) { - if (initialized) - { - throw std::runtime_error("[gctl::triangle_mesh] The mesh is already initialized."); - } + check_initiated(true); // 检查是否已经初始化 std::ifstream infile; gctl::open_infile(infile, filename, ".2m", @@ -74,19 +75,19 @@ void gctl::triangle_mesh::load_binary(std::string filename) load_headinfo(infile, TRI_TET_MESH, MESH_2D); // 读入网格信息 - infile.read((char*)&node_num, sizeof(int)); - infile.read((char*)&ele_num, sizeof(int)); + infile.read((char*)&node_num_, sizeof(int)); + infile.read((char*)&ele_num_, sizeof(int)); - nodes.resize(node_num); - elements.resize(ele_num); + nodes.resize(node_num_); + elements.resize(ele_num_); - for (int i = 0; i < node_num; i++) + for (int i = 0; i < node_num_; i++) { infile.read((char*)nodes.get(i), sizeof(gctl::vertex2dc)); } int in_index; - for (int i = 0; i < ele_num; i++) + for (int i = 0; i < ele_num_; i++) { elements[i].id = i; for (int j = 0; j < 3; j++) @@ -95,21 +96,18 @@ void gctl::triangle_mesh::load_binary(std::string filename) elements[i].vert[j] = nodes.get(in_index); } } - initialized = true; // 读入模型数据单元 load_datablock(infile); infile.close(); + initialized_ = true; return; } void gctl::triangle_mesh::save_binary(std::string filename) { - if (!initialized) - { - throw std::runtime_error("[gctl::triangle_mesh] The mesh is not initialized."); - } + check_initiated(); // 检查是否已经初始化 std::ofstream outfile; gctl::open_outfile(outfile, filename, ".2m", @@ -119,16 +117,16 @@ void gctl::triangle_mesh::save_binary(std::string filename) save_headinfo(outfile); // 输出网格信息 - outfile.write((char*)&node_num, sizeof(int)); - outfile.write((char*)&ele_num, sizeof(int)); + outfile.write((char*)&node_num_, sizeof(int)); + outfile.write((char*)&ele_num_, sizeof(int)); - for (int i = 0; i < node_num; i++) + for (int i = 0; i < node_num_; i++) { outfile.write((char*)nodes.get(i), sizeof(gctl::vertex2dc)); } int in_index; - for (int i = 0; i < ele_num; i++) + for (int i = 0; i < ele_num_; i++) { for (int j = 0; j < 3; j++) { @@ -156,21 +154,13 @@ gctl::triangle_mesh::~triangle_mesh(){} const gctl::array &gctl::triangle_mesh::get_nodes() const { - if (!initialized) - { - throw std::runtime_error("[gctl::triangle_mesh] The mesh is not initialized."); - } - + check_initiated(); // 检查是否已经初始化 return nodes; } const gctl::array &gctl::triangle_mesh::get_elements() const { - if (!initialized) - { - throw std::runtime_error("[gctl::triangle_mesh] The mesh is not initialized."); - } - + check_initiated(); // 检查是否已经初始化 return elements; } @@ -180,11 +170,10 @@ void gctl::triangle_mesh::load_triangle(std::string filename, index_packed_e pac gctl::read_Triangle_element(filename, elements, nodes, packed); // 设置名称与信息等 - node_num = nodes.size(); - ele_num = elements.size(); + node_num_ = nodes.size(); + ele_num_ = elements.size(); base_mesh::init(TRI_TET_MESH, MESH_2D, filename, "Imported from a .node and .ele file."); - initialized = true; - + initialized_ = true; return; } @@ -197,11 +186,10 @@ void gctl::triangle_mesh::load_gmsh(std::string filename, index_packed_e packed) infile.close(); // 设置名称与信息等 - node_num = nodes.size(); - ele_num = elements.size(); + node_num_ = nodes.size(); + ele_num_ = elements.size(); base_mesh::init(TRI_TET_MESH, MESH_2D, filename, "Imported from a .msh file."); - initialized = true; - + initialized_ = true; return; } @@ -214,14 +202,14 @@ void gctl::triangle_mesh::save_gmsh(std::string filename, index_packed_e packed) return; } -void gctl::triangle_mesh::save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed) +void gctl::triangle_mesh::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, d_type, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, out_mode, packed); return; } void gctl::triangle_mesh::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) { - base_mesh::save_gmsh(filename, datname, out_mode, packed); + base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); return; } diff --git a/lib/mesh/tri_mesh.h b/lib/mesh/tri_mesh.h index 23db76b..da5f2d1 100644 --- a/lib/mesh/tri_mesh.h +++ b/lib/mesh/tri_mesh.h @@ -43,6 +43,8 @@ namespace gctl void init(std::string in_name, std::string in_info, const array &in_nodes, const array &in_triangles); + void show_mesh_dimension(std::ostream &os) const; + void load_binary(std::string filename); void save_binary(std::string filename); @@ -61,7 +63,7 @@ namespace gctl void load_triangle(std::string filename, index_packed_e packed = Packed); void load_gmsh(std::string filename, index_packed_e packed = Packed); void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, mesh_data_type_e d_type, output_type_e out_mode, index_packed_e packed = Packed); + void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); protected: diff --git a/tool/gridmanager/gridmanager.cpp b/tool/gridmanager/gridmanager.cpp index 2c5c36d..8efcac8 100644 --- a/tool/gridmanager/gridmanager.cpp +++ b/tool/gridmanager/gridmanager.cpp @@ -377,8 +377,7 @@ void save_gmsh(const std::vector &cmd_units) // save gmsh if (cmd_units.size() < 3) throw std::runtime_error("save: insufficient parameters."); - rg.save_gmsh(cmd_units[2], NodeData, OverWrite, NotPacked); - rg.save_gmsh(cmd_units[2], ElemData, Append, NotPacked); + rg.save_gmsh(cmd_units[2], OverWrite, NotPacked); return; } @@ -477,7 +476,7 @@ void data_cloud(const std::vector &cmd_units) array posi_arr(posix_vec.size()); array posi_val; - posi_val.import_vector(data_vec); + posi_val.input(data_vec); for (size_t i = 0; i < posi_arr.size(); i++) { posi_arr[i].x = posix_vec[i]; @@ -622,21 +621,21 @@ void data_output(const std::vector &cmd_units) copy_str[i - 1] = cmd_units[i]; } - meshdata* data_ptr; + meshdata curr_data; if (copy_str[0] == "enable") { for (size_t i = 1; i < copy_str.size(); i++) { - data_ptr = rg.get_data(copy_str[i]); - data_ptr->set_output(true); + curr_data = rg.get_data(copy_str[i]); + curr_data.output_ok_ = true; } } else if (copy_str[0] == "disable") { for (size_t i = 1; i < copy_str.size(); i++) { - data_ptr = rg.get_data(copy_str[i]); - data_ptr->set_output(false); + curr_data = rg.get_data(copy_str[i]); + curr_data.output_ok_ = false; } } else throw std::runtime_error("data-output: invalid operation type."); @@ -654,7 +653,8 @@ void data_rename(const std::vector &cmd_units) copy_str[i - 1] = cmd_units[i]; } - rg.rename_data(copy_str[0], copy_str[1]); + meshdata curr_data = rg.get_data(copy_str[0]); + curr_data.name_ = copy_str[1]; return; } @@ -693,13 +693,13 @@ void get_stats(const std::vector &cmd_units) copy_str[i - 1] = cmd_units[i]; } - meshdata *data_ptr; + meshdata curr_data; std::vector stats; for (size_t i = 0; i < copy_str.size(); i++) { - data_ptr = rg.get_data(copy_str[i]); - data_ptr->show_info(); - data_ptr->show_stats(); + curr_data = rg.get_data(copy_str[i]); + curr_data.show_info(); + curr_data.show_stats(); } return; } -- 2.45.0 From 43b95188f33052ed7018f8048b6c1c2374f4cada Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Mon, 13 Jan 2025 00:10:04 +0800 Subject: [PATCH 02/14] update --- GCTL_logo.jpg | Bin 0 -> 33450 bytes README.md | 159 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 GCTL_logo.jpg diff --git a/GCTL_logo.jpg b/GCTL_logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..80cc01674ce063dd80360c915207d19eda1acaa0 GIT binary patch literal 33450 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 literal 0 HcmV?d00001 diff --git a/README.md b/README.md index efdc5c7..5773a3a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,159 @@ -# gctl_mesh +![](./doc/mesh_logo.png) + +# GCTL Mesh Library + +GCTL Mesh是地球物理计算工具库(Geophysical Computational Tools & Library)的网格处理模块，提供了多种类型的网格实现和操作功能。 + +## 功能特点 + +- 支持多种网格类型的创建和操作 +- 提供2D和3D网格的实现 +- 包含规则网格和非规则网格的处理 +- 支持球面网格的处理 +- 支持网格数据的导入导出（包括Gmsh格式和二进制格式） +- 支持标量、矢量和张量数据的处理 + +## 主要组件 + +### 基础网格类型 +- `mesh.h`: 网格基类，定义了基本的网格接口和功能 +- `meshdata.h`: 网格数据结构的定义和处理 + +### 规则网格 +- `regular_grid`: 通用规则网格实现 +- `regular_mesh_2d`: 二维规则网格 +- `regular_mesh_3d`: 三维规则网格 +- `regular_mesh_sph_3d`: 三维球面规则网格 + +### 线性网格 +- `linear_mesh_2d`: 二维线性网格 +- `linear_mesh_3d`: 三维线性网格 + +### 非规则网格 +- `tri_mesh`: 三角形网格 +- `tet_mesh`: 四面体网格 + +## 核心功能 + +### 网格数据管理 +- 支持在顶点或单元上定义数据 +- 支持三种数据类型： + - 标量数据 (Scalar) + - 矢量数据 (Vector) + - 张量数据 (Tensor) +- 数据操作功能： + - 添加/删除数据 + - 数据导入导出 + - 数据统计分析 + +### 网格操作 +- 网格初始化和清理 +- 网格信息查询（节点数、单元数等） +- 网格文件导入导出 + - 支持Gmsh格式 + - 支持二进制格式 +- 网格数据可视化输出 + +### 网格类型 +支持的网格维度： +- 0D网格 (MESH_0D) +- 2D网格 (MESH_2D) +- 3D网格 (MESH_3D) + +支持的网格类别： +- 规则网格 (REGULAR_MESH) +- 线性网格 (LINEAR_MESH) +- 三角形/四面体网格 (TRI_TET_MESH) +- 球面规则网格 (REGULAR_MESH_SPH) +- 球面线性网格 (LINEAR_MESH_SPH) +- 球面三角形/四面体网格 (TRI_TET_MESH_SPH) +- 规则网格 (REGULAR_GRID) + +## API示例 + +### 数据操作 +```cpp +// 添加数据 +meshdata &add_data(mesh_data_type_e type, // 数据位置类型（顶点/单元） + mesh_data_value_e valtype, // 数据值类型（标量/矢量/张量） + string name, // 数据名称 + double init_val, // 初始值 + bool if_output = true); // 是否可输出 + +// 获取数据 +meshdata &get_data(string datname); + +// 删除数据 +void remove_data(string datname); +``` + +### 文件操作 +```cpp +// 保存为Gmsh格式（含数据） +void save_gmsh_withdata(string filename, + output_type_e out_mode, + index_packed_e packed = Packed); + +// 保存为二进制格式 +void save_binary(string filename); + +// 读取二进制格式 +void load_binary(string filename); +``` + +## 许可证 + +该项目采用双重许可证方案： +1. GNU Lesser General Public License v2或更高版本 +2. 商业许可证（需单独申请） + +## 联系方式 + +作者：Yi Zhang (yizhang-geo@zju.edu.cn) + +## 版权声明 + +Copyright (c) 2023 Yi Zhang + +## 使用示例 + +库提供了多个完整的示例程序，展示了不同功能的使用方法： + +### 基础网格操作 +```cpp +// mesh_ex1.cpp - 基础网格创建和数据操作 +gctl::regular_grid rgd; +rgd.init("grid-1", "null", 4, 4, 0.0, 0.0, 1.0, 1.0); // 创建4x4网格 +rgd.add_data(gctl::NodeData, gctl::Scalar, "data-1", 2.5); // 添加节点数据 +rgd.add_data(gctl::ElemData, gctl::Scalar, "data-2", 1.2); // 添加单元数据 +``` + +### 文件导入导出 +```cpp +// mesh_ex5.cpp - NetCDF格式文件操作 +gctl::regular_grid rgd; +rgd.load_netcdf_grid("data/input.nc", gctl::ElemData, "x", "y"); // 读取网格 +rgd.save_netcdf_grid("data/output.nc", "example"); // 保存网格 +``` + +### 球面网格处理 +```cpp +// mesh_ex10.cpp - 3D球面网格创建 +gctl::regular_mesh_sph_3d rm_3ds; +rm_3ds.init("mesh-1", "null", 30.25, 30.25, 2005, 0.5, 0.5, 10, 40, 40, 50); +rm_3ds.add_data(gctl::ElemData, gctl::Scalar, "data-1", 2.5); +rm_3ds.save_gmsh("mesh_sample10", gctl::OverWrite, gctl::NotPacked); +``` + +更多示例可以在`example`目录下找到： +- `mesh_ex1.cpp`: 基础网格创建和数据操作 +- `mesh_ex2.cpp`: 网格数据的导入导出 +- `mesh_ex3.cpp`: 网格变换和操作 +- `mesh_ex4.cpp`: 非结构化网格处理 +- `mesh_ex5.cpp`: NetCDF格式文件操作 +- `mesh_ex6.cpp`: 网格数据插值 +- `mesh_ex7.cpp`: 网格数据统计分析 +- `mesh_ex8.cpp`: 二维规则网格操作 +- `mesh_ex9.cpp`: 三维规则网格操作 +- `mesh_ex10.cpp`: 球面网格处理 -- 2.45.0 From 90557194e4a22a93d2d0b0a8c1c750b1cc63d008 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Mon, 13 Jan 2025 00:12:53 +0800 Subject: [PATCH 03/14] add logo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5773a3a..a34e863 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![](./doc/mesh_logo.png) +![logo](GCTL_logo.jpg) # GCTL Mesh Library -- 2.45.0 From 4f76487bc89bd3ccd1d1aaf207ae7cf16bf51970 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Mon, 13 Jan 2025 09:15:55 +0800 Subject: [PATCH 04/14] add doc --- README.md | 70 ++++++++--------- doc/linear_mesh_2d.md | 109 ++++++++++++++++++++++++++ doc/linear_mesh_3d.md | 121 +++++++++++++++++++++++++++++ doc/mesh.md | 116 ++++++++++++++++++++++++++++ doc/meshdata.md | 116 ++++++++++++++++++++++++++++ doc/regular_grid.md | 114 ++++++++++++++++++++++++++++ doc/regular_mesh_2d.md | 98 ++++++++++++++++++++++++ doc/regular_mesh_3d.md | 106 ++++++++++++++++++++++++++ doc/regular_mesh_sph_3d.md | 115 ++++++++++++++++++++++++++++ doc/tet_mesh.md | 152 +++++++++++++++++++++++++++++++++++++ doc/tri_mesh.md | 138 +++++++++++++++++++++++++++++++++ 11 files changed, 1218 insertions(+), 37 deletions(-) create mode 100644 doc/linear_mesh_2d.md create mode 100644 doc/linear_mesh_3d.md create mode 100644 doc/mesh.md create mode 100644 doc/meshdata.md create mode 100644 doc/regular_grid.md create mode 100644 doc/regular_mesh_2d.md create mode 100644 doc/regular_mesh_3d.md create mode 100644 doc/regular_mesh_sph_3d.md create mode 100644 doc/tet_mesh.md create mode 100644 doc/tri_mesh.md diff --git a/README.md b/README.md index a34e863..e7027c6 100644 --- a/README.md +++ b/README.md @@ -13,25 +13,25 @@ GCTL Mesh是地球物理计算工具库(Geophysical Computational Tools & Librar - 支持网格数据的导入导出（包括Gmsh格式和二进制格式） - 支持标量、矢量和张量数据的处理 -## 主要组件 +## 文档 -### 基础网格类型 -- `mesh.h`: 网格基类，定义了基本的网格接口和功能 -- `meshdata.h`: 网格数据结构的定义和处理 +### 基础类 +- [`mesh.h`](doc/mesh.md): 网格基类，定义了基本的网格接口和功能 +- [`meshdata.h`](doc/meshdata.md): 网格数据结构的定义和处理 ### 规则网格 -- `regular_grid`: 通用规则网格实现 -- `regular_mesh_2d`: 二维规则网格 -- `regular_mesh_3d`: 三维规则网格 -- `regular_mesh_sph_3d`: 三维球面规则网格 +- [`regular_grid.h`](doc/regular_grid.md): 通用规则网格实现，支持2D和3D +- [`regular_mesh_2d.h`](doc/regular_mesh_2d.md): 二维规则网格，专注于2D结构化网格 +- [`regular_mesh_3d.h`](doc/regular_mesh_3d.md): 三维规则网格，专注于3D结构化网格 +- [`regular_mesh_sph_3d.h`](doc/regular_mesh_sph_3d.md): 三维球面规则网格，适用于地球物理建模 ### 线性网格 -- `linear_mesh_2d`: 二维线性网格 -- `linear_mesh_3d`: 三维线性网格 +- [`linear_mesh_2d.h`](doc/linear_mesh_2d.md): 二维线性网格，用于表示2D空间中的线段 +- [`linear_mesh_3d.h`](doc/linear_mesh_3d.md): 三维线性网格，用于表示3D空间中的曲线 ### 非规则网格 -- `tri_mesh`: 三角形网格 -- `tet_mesh`: 四面体网格 +- [`tri_mesh.h`](doc/tri_mesh.md): 三角形网格，用于复杂2D区域的离散化 +- [`tet_mesh.h`](doc/tet_mesh.md): 四面体网格，用于复杂3D区域的离散化 ## 核心功能 @@ -52,6 +52,7 @@ GCTL Mesh是地球物理计算工具库(Geophysical Computational Tools & Librar - 网格文件导入导出 - 支持Gmsh格式 - 支持二进制格式 + - 支持NetCDF格式（部分网格类型） - 网格数据可视化输出 ### 网格类型 @@ -69,36 +70,31 @@ GCTL Mesh是地球物理计算工具库(Geophysical Computational Tools & Librar - 球面三角形/四面体网格 (TRI_TET_MESH_SPH) - 规则网格 (REGULAR_GRID) +## 应用场景 + +- **规则网格**：适用于简单几何形状的离散化，如矩形/立方体区域 +- **线性网格**： + - 2D：用于表示边界、裂缝等线性特征 + - 3D：用于表示输电线路、管道系统、裂缝网络等 +- **三角形网格**：适用于复杂2D区域的有限元分析、流体动力学等 +- **四面体网格**：适用于复杂3D区域的有限元分析、计算流体力学等 +- **球面网格**：特别适用于地球物理学、大气科学等全球尺度的模拟 + ## API示例 -### 数据操作 +详细的API使用示例请参考各个网格类型的文档。基本使用模式如下： + ```cpp +// 创建网格对象 +gctl::regular_grid rgd; +rgd.init("grid-1", "test grid", 4, 4, 0.0, 0.0, 1.0, 1.0); + // 添加数据 -meshdata &add_data(mesh_data_type_e type, // 数据位置类型（顶点/单元） - mesh_data_value_e valtype, // 数据值类型（标量/矢量/张量） - string name, // 数据名称 - double init_val, // 初始值 - bool if_output = true); // 是否可输出 +rgd.add_data(gctl::NodeData, gctl::Scalar, "temperature", 25.0); +rgd.add_data(gctl::ElemData, gctl::Vector, "velocity", velocity_array); -// 获取数据 -meshdata &get_data(string datname); - -// 删除数据 -void remove_data(string datname); -``` - -### 文件操作 -```cpp -// 保存为Gmsh格式（含数据） -void save_gmsh_withdata(string filename, - output_type_e out_mode, - index_packed_e packed = Packed); - -// 保存为二进制格式 -void save_binary(string filename); - -// 读取二进制格式 -void load_binary(string filename); +// 保存网格 +rgd.save_gmsh("output.msh", gctl::OverWrite); ``` ## 许可证 diff --git a/doc/linear_mesh_2d.md b/doc/linear_mesh_2d.md new file mode 100644 index 0000000..4ade1f7 --- /dev/null +++ b/doc/linear_mesh_2d.md @@ -0,0 +1,109 @@ +# GCTL Linear Mesh 2D 文档 + +## 简介 + +`linear_mesh_2d.h` 定义了GCTL网格库中的二维线性网格类 `linear_mesh_2d`，用于创建和管理二维非结构化线性网格。该类支持不规则分布的网格点，适用于复杂几何形状的离散化。 + +## 类继承 + +`linear_mesh_2d` 继承自 `base_mesh` 基类，实现了所有虚函数，并添加了二维线性网格特有的功能。 + +## 主要API + +### 初始化 +```cpp +// 初始化二维线性网格 +void init(std::string name, // 网格名称 + std::string info, // 网格信息 + const array &nodes, // 节点坐标数组 + const array &elements); // 单元连接关系数组 +``` + +### 网格信息 +```cpp +// 获取节点坐标 +void get_node_coord(int node_idx, // 节点索引 + double &x, double &y) const; + +// 获取单元节点索引 +void get_elem_nodes(int elem_idx, // 单元索引 + int &n1, int &n2) const; + +// 获取单元中心坐标 +void get_elem_center(int elem_idx, // 单元索引 + double &x, double &y) const; + +// 获取单元长度 +double get_elem_length(int elem_idx) const; +``` + +### 网格查询 +```cpp +// 查找包含指定点的单元 +bool find_element(double x, double y, // 目标点坐标 + int &elem_idx) const; // 返回单元索引 + +// 获取节点相邻的单元 +array get_node_elements(int node_idx) const; + +// 获取单元相邻的单元 +array get_elem_neighbors(int elem_idx) const; +``` + +### 文件操作 +```cpp +// 保存为Gmsh格式 +virtual void save_gmsh(std::string filename, + index_packed_e packed = Packed) override; + +// 保存为二进制格式 +virtual void save_binary(std::string filename) override; + +// 读取二进制格式 +virtual void load_binary(std::string filename) override; +``` + +## 使用示例 + +```cpp +// 创建节点坐标数组 +array nodes; +nodes.push_back(point2dc(0.0, 0.0)); +nodes.push_back(point2dc(1.0, 0.0)); +nodes.push_back(point2dc(1.0, 1.0)); +nodes.push_back(point2dc(0.0, 1.0)); + +// 创建单元连接关系 +array elements; +elements.push_back(int2(0, 1)); // 第一条边 +elements.push_back(int2(1, 2)); // 第二条边 +elements.push_back(int2(2, 3)); // 第三条边 +elements.push_back(int2(3, 0)); // 第四条边 + +// 创建线性网格 +gctl::linear_mesh_2d mesh2d; +mesh2d.init("boundary", "2D boundary mesh", nodes, elements); + +// 获取单元信息 +double length = mesh2d.get_elem_length(0); // 获取第一条边的长度 + +// 查找包含特定点的单元 +int elem_idx; +if (mesh2d.find_element(0.5, 0.5, elem_idx)) { + // 找到包含点(0.5,0.5)的单元 +} + +// 添加数据并保存 +mesh2d.add_data(gctl::NodeData, gctl::Scalar, "displacement", 0.0); +mesh2d.save_gmsh("boundary.msh", gctl::Packed); +``` + +## 注意事项 + +1. 线性网格主要用于表示一维结构（如边界）在二维空间中的分布 +2. 每个单元由两个节点定义，表示一条线段 +3. 节点和单元的编号从0开始 +4. 支持不规则分布的节点，适合复杂几何形状 +5. 提供了网格拓扑关系查询功能（节点相邻单元、单元相邻单元等） +6. 支持Gmsh和二进制格式的文件操作 +7. 适用于边界元素法、有限元法等数值计算 \ No newline at end of file diff --git a/doc/linear_mesh_3d.md b/doc/linear_mesh_3d.md new file mode 100644 index 0000000..e0a3f8a --- /dev/null +++ b/doc/linear_mesh_3d.md @@ -0,0 +1,121 @@ +# GCTL Linear Mesh 3D 文档 + +## 简介 + +`linear_mesh_3d.h` 定义了GCTL网格库中的三维线性网格类 `linear_mesh_3d`，用于创建和管理三维空间中的非结构化线性网格。该类支持不规则分布的网格点，适用于复杂三维几何结构中的线性特征离散化。 + +## 类继承 + +`linear_mesh_3d` 继承自 `base_mesh` 基类，实现了所有虚函数，并添加了三维线性网格特有的功能。 + +## 主要API + +### 初始化 +```cpp +// 初始化三维线性网格 +void init(std::string name, // 网格名称 + std::string info, // 网格信息 + const array &nodes, // 节点坐标数组 + const array &elements); // 单元连接关系数组 +``` + +### 网格信息 +```cpp +// 获取节点坐标 +void get_node_coord(int node_idx, // 节点索引 + double &x, double &y, double &z) const; + +// 获取单元节点索引 +void get_elem_nodes(int elem_idx, // 单元索引 + int &n1, int &n2) const; + +// 获取单元中心坐标 +void get_elem_center(int elem_idx, // 单元索引 + double &x, double &y, double &z) const; + +// 获取单元长度 +double get_elem_length(int elem_idx) const; + +// 获取单元方向向量 +void get_elem_direction(int elem_idx, // 单元索引 + double &dx, double &dy, double &dz) const; +``` + +### 网格查询 +```cpp +// 查找最近的单元 +bool find_nearest_element(double x, double y, double z, // 目标点坐标 + int &elem_idx, // 返回单元索引 + double &distance) const; // 返回最短距离 + +// 获取节点相邻的单元 +array get_node_elements(int node_idx) const; + +// 获取单元相邻的单元 +array get_elem_neighbors(int elem_idx) const; +``` + +### 文件操作 +```cpp +// 保存为Gmsh格式 +virtual void save_gmsh(std::string filename, + index_packed_e packed = Packed) override; + +// 保存为二进制格式 +virtual void save_binary(std::string filename) override; + +// 读取二进制格式 +virtual void load_binary(std::string filename) override; +``` + +## 使用示例 + +```cpp +// 创建节点坐标数组 +array nodes; +nodes.push_back(point3dc(0.0, 0.0, 0.0)); +nodes.push_back(point3dc(1.0, 0.0, 0.0)); +nodes.push_back(point3dc(1.0, 1.0, 1.0)); +nodes.push_back(point3dc(0.0, 1.0, 1.0)); + +// 创建单元连接关系 +array elements; +elements.push_back(int2(0, 1)); // 第一条边 +elements.push_back(int2(1, 2)); // 第二条边 +elements.push_back(int2(2, 3)); // 第三条边 + +// 创建线性网格 +gctl::linear_mesh_3d mesh3d; +mesh3d.init("curve3d", "3D curve mesh", nodes, elements); + +// 获取单元信息 +double length = mesh3d.get_elem_length(0); // 获取第一条边的长度 + +// 获取单元方向 +double dx, dy, dz; +mesh3d.get_elem_direction(0, dx, dy, dz); // 获取第一条边的方向向量 + +// 查找最近的单元 +int elem_idx; +double distance; +if (mesh3d.find_nearest_element(0.5, 0.5, 0.5, elem_idx, distance)) { + // 找到距离点(0.5,0.5,0.5)最近的单元 +} + +// 添加数据并保存 +mesh3d.add_data(gctl::NodeData, gctl::Vector, "displacement", + array(nodes.size(), point3dc(0,0,0))); +mesh3d.save_gmsh("curve3d.msh", gctl::Packed); +``` + +## 注意事项 + +1. 线性网格主要用于表示一维结构（如曲线、管线）在三维空间中的分布 +2. 每个单元由两个节点定义，表示一条空间线段 +3. 节点和单元的编号从0开始 +4. 支持不规则分布的节点，适合复杂三维曲线的离散化 +5. 提供了网格拓扑关系查询功能 +6. 支持计算单元的方向向量，便于处理定向问题 +7. 查找最近单元功能适用于路径规划和碰撞检测 +8. 支持Gmsh和二进制格式的文件操作 +9. 适用于输电线路、管道系统、裂缝网络等模拟 \ No newline at end of file diff --git a/doc/mesh.md b/doc/mesh.md new file mode 100644 index 0000000..026bb6e --- /dev/null +++ b/doc/mesh.md @@ -0,0 +1,116 @@ +# GCTL Mesh 基类文档 + +## 简介 + +`mesh.h` 定义了GCTL网格库的基础类 `base_mesh`，这是所有具体网格类型的基类。它提供了网格操作的基本接口和功能实现。 + +## 类型定义 + +### 网格类型 (mesh_type_e) +```cpp +enum mesh_type_e { + UNDEFINED, // 未定义网格 + REGULAR_MESH, // 规则网格 + LINEAR_MESH, // 线性网格 + TRI_TET_MESH, // 三角形/四面体网格 + REGULAR_MESH_SPH, // 球面规则网格 + LINEAR_MESH_SPH, // 球面线性网格 + TRI_TET_MESH_SPH, // 球面三角形/四面体网格 + REGULAR_GRID, // 规则网格 +}; +``` + +### 网格维度 (mesh_dim_e) +```cpp +enum mesh_dim_e { + MESH_0D, // 0维网格 + MESH_2D, // 2维网格 + MESH_3D // 3维网格 +}; +``` + +## 主要API + +### 基本操作 +```cpp +void clear(); // 清除所有网格数据 +bool initiated() const; // 检查网格是否已初始化 +void show_info(); // 显示网格与数据信息 +``` + +### 网格信息获取 +```cpp +mesh_type_e get_meshtype() const; // 获取网格类型 +mesh_dim_e get_meshdim() const; // 获取网格维度 +int get_nodenum() const; // 获取顶点数量 +int get_elenum() const; // 获取网格单元数量 +int get_datanum() const; // 获取数据对象数量 +``` + +### 网格属性设置 +```cpp +std::string get_meshname() const; // 获取网格名称 +void set_meshname(std::string in_name); // 设置网格名称 +std::string get_meshinfo() const; // 获取网格说明信息 +void set_meshinfo(std::string in_info); // 设置网格说明信息 +``` + +### 数据操作 +```cpp +// 添加网格数据（标量初始值） +meshdata &add_data(mesh_data_type_e in_loctype, // 数据位置类型 + mesh_data_value_e in_valtype, // 数据值类型 + std::string name, // 数据名称 + double init_val, // 初始值 + bool if_output = true); // 是否可输出 + +// 添加网格数据（数组初始值） +meshdata &add_data(mesh_data_type_e in_loctype, // 数据位置类型 + std::string name, // 数据名称 + const array &init_arr, // 初始值数组 + bool if_output = true); // 是否可输出 + +// 获取数据对象 +meshdata &get_data(std::string datname); + +// 删除数据对象 +void remove_data(std::string datname); +``` + +### 文件操作 +```cpp +// 保存为Gmsh格式（含数据） +void save_gmsh_withdata(std::string filename, // 文件名 + output_type_e out_mode, // 输出模式 + index_packed_e packed = Packed); // 索引打包方式 + +// 保存为Gmsh格式（指定数据） +void save_gmsh_withdata(std::string filename, // 文件名 + std::string datname, // 数据名称 + output_type_e out_mode, // 输出模式 + index_packed_e packed = Packed); // 索引打包方式 + +// 纯虚函数 - 需要由派生类实现 +virtual void save_gmsh(std::string filename, + index_packed_e packed = Packed) = 0; +virtual void load_binary(std::string filename) = 0; +virtual void save_binary(std::string filename) = 0; +``` + +## 使用示例 + +```cpp +// 创建网格对象（以regular_grid为例） +gctl::regular_grid rgd; +rgd.init("grid-1", "test grid", 4, 4, 0.0, 0.0, 1.0, 1.0); + +// 添加数据 +rgd.add_data(gctl::NodeData, gctl::Scalar, "temperature", 25.0); +rgd.add_data(gctl::ElemData, gctl::Vector, "velocity", velocity_array); + +// 显示网格信息 +rgd.show_info(); + +// 保存网格 +rgd.save_gmsh_withdata("output.msh", gctl::OverWrite); +``` \ No newline at end of file diff --git a/doc/meshdata.md b/doc/meshdata.md new file mode 100644 index 0000000..83b4e8e --- /dev/null +++ b/doc/meshdata.md @@ -0,0 +1,116 @@ +# GCTL MeshData 文档 + +## 简介 + +`meshdata.h` 定义了GCTL网格库中的数据对象类 `meshdata`，用于在网格上存储和管理各种类型的数据（标量、矢量和张量）。 + +## 类型定义 + +### 数据值类型 (mesh_data_value_e) +```cpp +enum mesh_data_value_e { + Scalar, // 标量数据 + Vector, // 矢量数据 + Tensor // 张量数据 +}; +``` + +## 类成员 + +### 属性 +```cpp +std::string name_; // 数据的名称 +mesh_data_type_e loctype_; // 数据的赋值位置属性（顶点或元素） +mesh_data_value_e valtype_; // 数据的类型（标量/矢量/张量） +bool output_ok_; // 是否可输出数据 +array datval_; // 数据值数组 +double nan_val_; // 无效数据的标记值 +``` + +## 主要API + +### 构造和初始化 +```cpp +// 默认构造函数 +meshdata(); + +// 带参数构造函数 +meshdata(mesh_data_type_e in_loctype, // 数据位置类型 + mesh_data_value_e in_valtype, // 数据值类型 + size_t size, // 数据大小 + std::string name = "untitled", // 数据名称 + bool if_output = true, // 是否可输出 + double nan_val = GCTL_BDL_MAX); // 无效值标记 + +// 创建数据对象 +void create(mesh_data_type_e in_loctype, // 数据位置类型 + mesh_data_value_e in_valtype, // 数据值类型 + size_t size, // 数据大小 + std::string name = "untitled", // 数据名称 + bool if_output = true, // 是否可输出 + double nan_val = GCTL_BDL_MAX); // 无效值标记 +``` + +### 数据操作 +```cpp +// 清空数据对象 +void clear(); + +// 导出矢量数据 +array export_vector() const; + +// 导出张量数据 +array export_tensor() const; +``` + +### 信息显示 +```cpp +// 显示数据对象的头信息 +void show_info(std::ostream &os = std::clog) const; + +// 显示数据统计参数 +void show_stats(std::ostream &os = std::clog) const; +``` + +### 文件操作 +```cpp +// 载入二进制文件 +void load_binary(std::ifstream &infile); + +// 保存二进制文件 +void save_binary(std::ofstream &outfile); +``` + +## 使用示例 + +```cpp +// 创建数据对象 +gctl::meshdata data(gctl::NodeData, // 节点数据 + gctl::Scalar, // 标量类型 + 100, // 数据大小 + "temperature", // 数据名称 + true); // 可输出 + +// 显示数据信息 +data.show_info(); + +// 显示数据统计信息 +data.show_stats(); + +// 导出矢量数据 +if (data.valtype_ == gctl::Vector) { + array vectors = data.export_vector(); +} + +// 导出张量数据 +if (data.valtype_ == gctl::Tensor) { + array tensors = data.export_tensor(); +} +``` + +## 注意事项 + +1. 数据对象支持三种类型：标量、矢量和张量 +2. 数据可以定义在网格的顶点或元素上 +3. 数据导出时会根据数据类型自动转换为对应的格式 +4. 二进制文件操作通常由网格类调用，不建议直接使用 \ No newline at end of file diff --git a/doc/regular_grid.md b/doc/regular_grid.md new file mode 100644 index 0000000..44fc858 --- /dev/null +++ b/doc/regular_grid.md @@ -0,0 +1,114 @@ +# GCTL Regular Grid 文档 + +## 简介 + +`regular_grid.h` 定义了GCTL网格库中的规则网格类 `regular_grid`，用于创建和管理规则网格。规则网格是最基本的网格类型，具有规则的网格点分布和单元结构。 + +## 类继承 + +`regular_grid` 继承自 `base_mesh` 基类，实现了所有虚函数，并添加了规则网格特有的功能。 + +## 主要API + +### 初始化 +```cpp +// 初始化二维规则网格 +void init(std::string name, // 网格名称 + std::string info, // 网格信息 + int nx, int ny, // x和y方向的网格数 + double x0, double y0, // 起始点坐标 + double x1, double y1); // 终止点坐标 + +// 初始化三维规则网格 +void init(std::string name, // 网格名称 + std::string info, // 网格信息 + int nx, int ny, int nz, // x、y和z方向的网格数 + double x0, double y0, double z0, // 起始点坐标 + double x1, double y1, double z1); // 终止点坐标 +``` + +### 网格信息 +```cpp +// 获取网格维度 +int get_dimension() const; + +// 获取网格点数 +void get_grid_num(int &nx, int &ny) const; // 2D +void get_grid_num(int &nx, int &ny, int &nz) const; // 3D + +// 获取网格范围 +void get_grid_range(double &x0, double &y0, // 2D起点 + double &x1, double &y1) const; // 2D终点 +void get_grid_range(double &x0, double &y0, double &z0, // 3D起点 + double &x1, double &y1, double &z1) const; // 3D终点 +``` + +### 网格操作 +```cpp +// 获取指定位置的网格点坐标 +void get_node_coord(int i, int j, // 2D索引 + double &x, double &y) const; +void get_node_coord(int i, int j, int k, // 3D索引 + double &x, double &y, double &z) const; + +// 获取指定位置的单元中心坐标 +void get_elem_center(int i, int j, // 2D索引 + double &x, double &y) const; +void get_elem_center(int i, int j, int k, // 3D索引 + double &x, double &y, double &z) const; +``` + +### 文件操作 +```cpp +// 保存为Gmsh格式 +virtual void save_gmsh(std::string filename, + index_packed_e packed = Packed) override; + +// 保存为二进制格式 +virtual void save_binary(std::string filename) override; + +// 读取二进制格式 +virtual void load_binary(std::string filename) override; + +// NetCDF格式操作 +void load_netcdf_grid(std::string filename, + mesh_data_type_e loctype, + std::string xname, + std::string yname); + +void save_netcdf_grid(std::string filename, + std::string title = "untitled"); +``` + +## 使用示例 + +```cpp +// 创建2D规则网格 +gctl::regular_grid grid2d; +grid2d.init("grid2d", "2D regular grid", + 100, 100, // 100x100网格 + 0.0, 0.0, // 起点(0,0) + 1.0, 1.0); // 终点(1,1) + +// 创建3D规则网格 +gctl::regular_grid grid3d; +grid3d.init("grid3d", "3D regular grid", + 50, 50, 50, // 50x50x50网格 + 0.0, 0.0, 0.0, // 起点(0,0,0) + 1.0, 1.0, 1.0); // 终点(1,1,1) + +// 获取网格信息 +int nx, ny, nz; +grid3d.get_grid_num(nx, ny, nz); + +// 添加数据并保存 +grid3d.add_data(gctl::NodeData, gctl::Scalar, "temperature", 25.0); +grid3d.save_gmsh("output.msh", gctl::Packed); +``` + +## 注意事项 + +1. 规则网格支持2D和3D两种维度 +2. 网格点和单元的编号是规则的，可以通过索引直接访问 +3. 支持多种文件格式的导入导出（Gmsh、二进制、NetCDF） +4. 网格范围由起点和终点坐标定义，网格间距自动计算 \ No newline at end of file diff --git a/doc/regular_mesh_2d.md b/doc/regular_mesh_2d.md new file mode 100644 index 0000000..6f9a422 --- /dev/null +++ b/doc/regular_mesh_2d.md @@ -0,0 +1,98 @@ +# GCTL Regular Mesh 2D 文档 + +## 简介 + +`regular_mesh_2d.h` 定义了GCTL网格库中的二维规则网格类 `regular_mesh_2d`，用于创建和管理二维结构化网格。与`regular_grid`相比，该类更专注于二维网格的处理，提供了更多针对二维网格的专门操作。 + +## 类继承 + +`regular_mesh_2d` 继承自 `base_mesh` 基类，实现了所有虚函数，并添加了二维规则网格特有的功能。 + +## 主要API + +### 初始化 +```cpp +// 初始化二维规则网格 +void init(std::string name, // 网格名称 + std::string info, // 网格信息 + int nx, int ny, // x和y方向的网格数 + double x0, double y0, // 起始点坐标 + double x1, double y1, // 终止点坐标 + double dx = 0.0, // x方向网格间距（0表示自动计算） + double dy = 0.0); // y方向网格间距（0表示自动计算） +``` + +### 网格信息 +```cpp +// 获取网格点数 +void get_mesh_num(int &nx, int &ny) const; + +// 获取网格范围 +void get_mesh_range(double &x0, double &y0, // 起点坐标 + double &x1, double &y1) const; // 终点坐标 + +// 获取网格间距 +void get_mesh_step(double &dx, double &dy) const; +``` + +### 网格操作 +```cpp +// 获取指定位置的网格点坐标 +void get_node_coord(int i, int j, // 节点索引 + double &x, double &y) const; + +// 获取指定位置的单元中心坐标 +void get_elem_center(int i, int j, // 单元索引 + double &x, double &y) const; + +// 获取指定坐标所在的网格单元索引 +bool get_elem_index(double x, double y, // 坐标 + int &i, int &j) const; // 返回单元索引 +``` + +### 文件操作 +```cpp +// 保存为Gmsh格式 +virtual void save_gmsh(std::string filename, + index_packed_e packed = Packed) override; + +// 保存为二进制格式 +virtual void save_binary(std::string filename) override; + +// 读取二进制格式 +virtual void load_binary(std::string filename) override; +``` + +## 使用示例 + +```cpp +// 创建二维规则网格 +gctl::regular_mesh_2d mesh2d; +mesh2d.init("mesh2d", "2D regular mesh", + 100, 100, // 100x100网格 + 0.0, 0.0, // 起点(0,0) + 1.0, 1.0); // 终点(1,1) + +// 获取网格信息 +int nx, ny; +mesh2d.get_mesh_num(nx, ny); + +double dx, dy; +mesh2d.get_mesh_step(dx, dy); + +// 获取特定位置的坐标 +double x, y; +mesh2d.get_node_coord(50, 50, x, y); // 获取中心点坐标 + +// 添加数据并保存 +mesh2d.add_data(gctl::NodeData, gctl::Scalar, "elevation", 0.0); +mesh2d.save_gmsh("terrain.msh", gctl::Packed); +``` + +## 注意事项 + +1. 网格间距可以自动计算或手动指定 +2. 提供了坐标与网格索引之间的转换功能 +3. 所有索引都是从0开始计数 +4. 网格点和单元的编号是规则的，遵循行优先顺序 +5. 支持Gmsh和二进制格式的文件操作 \ No newline at end of file diff --git a/doc/regular_mesh_3d.md b/doc/regular_mesh_3d.md new file mode 100644 index 0000000..1faeb0a --- /dev/null +++ b/doc/regular_mesh_3d.md @@ -0,0 +1,106 @@ +# GCTL Regular Mesh 3D 文档 + +## 简介 + +`regular_mesh_3d.h` 定义了GCTL网格库中的三维规则网格类 `regular_mesh_3d`，用于创建和管理三维结构化网格。该类专门处理三维空间中的规则网格，提供了完整的三维网格操作功能。 + +## 类继承 + +`regular_mesh_3d` 继承自 `base_mesh` 基类，实现了所有虚函数，并添加了三维规则网格特有的功能。 + +## 主要API + +### 初始化 +```cpp +// 初始化三维规则网格 +void init(std::string name, // 网格名称 + std::string info, // 网格信息 + int nx, int ny, int nz, // x、y和z方向的网格数 + double x0, double y0, double z0, // 起始点坐标 + double x1, double y1, double z1, // 终止点坐标 + double dx = 0.0, // x方向网格间距（0表示自动计算） + double dy = 0.0, // y方向网格间距（0表示自动计算） + double dz = 0.0); // z方向网格间距（0表示自动计算） +``` + +### 网格信息 +```cpp +// 获取网格点数 +void get_mesh_num(int &nx, int &ny, int &nz) const; + +// 获取网格范围 +void get_mesh_range(double &x0, double &y0, double &z0, // 起点坐标 + double &x1, double &y1, double &z1) const; // 终点坐标 + +// 获取网格间距 +void get_mesh_step(double &dx, double &dy, double &dz) const; +``` + +### 网格操作 +```cpp +// 获取指定位置的网格点坐标 +void get_node_coord(int i, int j, int k, // 节点索引 + double &x, double &y, double &z) const; + +// 获取指定位置的单元中心坐标 +void get_elem_center(int i, int j, int k, // 单元索引 + double &x, double &y, double &z) const; + +// 获取指定坐标所在的网格单元索引 +bool get_elem_index(double x, double y, double z, // 坐标 + int &i, int &j, int &k) const; // 返回单元索引 +``` + +### 文件操作 +```cpp +// 保存为Gmsh格式 +virtual void save_gmsh(std::string filename, + index_packed_e packed = Packed) override; + +// 保存为二进制格式 +virtual void save_binary(std::string filename) override; + +// 读取二进制格式 +virtual void load_binary(std::string filename) override; +``` + +## 使用示例 + +```cpp +// 创建三维规则网格 +gctl::regular_mesh_3d mesh3d; +mesh3d.init("mesh3d", "3D regular mesh", + 50, 50, 50, // 50x50x50网格 + 0.0, 0.0, 0.0, // 起点(0,0,0) + 1.0, 1.0, 1.0); // 终点(1,1,1) + +// 获取网格信息 +int nx, ny, nz; +mesh3d.get_mesh_num(nx, ny, nz); + +double dx, dy, dz; +mesh3d.get_mesh_step(dx, dy, dz); + +// 获取特定位置的坐标 +double x, y, z; +mesh3d.get_node_coord(25, 25, 25, x, y, z); // 获取中心点坐标 + +// 查找特定坐标所在的单元 +int i, j, k; +if (mesh3d.get_elem_index(0.5, 0.5, 0.5, i, j, k)) { + // 找到包含点(0.5,0.5,0.5)的单元 +} + +// 添加数据并保存 +mesh3d.add_data(gctl::NodeData, gctl::Scalar, "pressure", 0.0); +mesh3d.save_gmsh("volume.msh", gctl::Packed); +``` + +## 注意事项 + +1. 网格间距可以自动计算或手动指定 +2. 提供了三维空间中坐标与网格索引之间的转换功能 +3. 所有索引都是从0开始计数 +4. 网格点和单元的编号是规则的，遵循x-y-z优先顺序 +5. 支持Gmsh和二进制格式的文件操作 +6. 内存占用随网格规模的立方增长，使用大规模网格时需注意内存管理 \ No newline at end of file diff --git a/doc/regular_mesh_sph_3d.md b/doc/regular_mesh_sph_3d.md new file mode 100644 index 0000000..34adaf2 --- /dev/null +++ b/doc/regular_mesh_sph_3d.md @@ -0,0 +1,115 @@ +# GCTL Regular Mesh Spherical 3D 文档 + +## 简介 + +`regular_mesh_sph_3d.h` 定义了GCTL网格库中的三维球面规则网格类 `regular_mesh_sph_3d`，用于创建和管理球面坐标系下的三维规则网格。该类特别适用于地球物理学中的球面网格计算。 + +## 类继承 + +`regular_mesh_sph_3d` 继承自 `base_mesh` 基类，实现了所有虚函数，并添加了球面网格特有的功能。 + +## 主要API + +### 初始化 +```cpp +// 初始化三维球面规则网格 +void init(std::string name, // 网格名称 + std::string info, // 网格信息 + double lat0, // 起始纬度 + double lon0, // 起始经度 + double r0, // 起始半径 + double dlat, // 纬度间隔 + double dlon, // 经度间隔 + double dr, // 半径间隔 + int nlat, // 纬度方向网格数 + int nlon, // 经度方向网格数 + int nr); // 径向网格数 +``` + +### 网格信息 +```cpp +// 获取网格点数 +void get_mesh_num(int &nlat, int &nlon, int &nr) const; + +// 获取网格范围 +void get_mesh_range(double &lat0, double &lon0, double &r0, // 起点 + double &lat1, double &lon1, double &r1) const; // 终点 + +// 获取网格间距 +void get_mesh_step(double &dlat, double &dlon, double &dr) const; +``` + +### 网格操作 +```cpp +// 获取指定位置的网格点球面坐标 +void get_node_coord_sph(int i, int j, int k, // 节点索引 + double &lat, double &lon, double &r) const; + +// 获取指定位置的网格点笛卡尔坐标 +void get_node_coord(int i, int j, int k, // 节点索引 + double &x, double &y, double &z) const; + +// 获取指定位置的单元中心球面坐标 +void get_elem_center_sph(int i, int j, int k, // 单元索引 + double &lat, double &lon, double &r) const; + +// 获取指定位置的单元中心笛卡尔坐标 +void get_elem_center(int i, int j, int k, // 单元索引 + double &x, double &y, double &z) const; + +// 获取指定球面坐标所在的网格单元索引 +bool get_elem_index(double lat, double lon, double r, // 球面坐标 + int &i, int &j, int &k) const; // 返回单元索引 +``` + +### 文件操作 +```cpp +// 保存为Gmsh格式 +virtual void save_gmsh(std::string filename, + index_packed_e packed = Packed) override; + +// 保存为二进制格式 +virtual void save_binary(std::string filename) override; + +// 读取二进制格式 +virtual void load_binary(std::string filename) override; +``` + +## 使用示例 + +```cpp +// 创建三维球面规则网格 +gctl::regular_mesh_sph_3d mesh_sph; +mesh_sph.init("earth_mesh", "Earth model mesh", + -90.0, -180.0, 6371.0, // 起始点：南极点，经度-180度，地球半径 + 1.0, 1.0, 10.0, // 间隔：1度纬度，1度经度，10km深度 + 180, 360, 100); // 网格数：180纬度，360经度，100层 + +// 获取网格信息 +int nlat, nlon, nr; +mesh_sph.get_mesh_num(nlat, nlon, nr); + +// 获取特定位置的坐标（球面坐标） +double lat, lon, r; +mesh_sph.get_node_coord_sph(90, 180, 0, lat, lon, r); // 获取中心点坐标 + +// 获取特定位置的坐标（笛卡尔坐标） +double x, y, z; +mesh_sph.get_node_coord(90, 180, 0, x, y, z); + +// 添加数据并保存 +mesh_sph.add_data(gctl::NodeData, gctl::Scalar, "temperature", 0.0); +mesh_sph.save_gmsh("earth_model.msh", gctl::Packed); +``` + +## 注意事项 + +1. 坐标系采用地理坐标系约定： + - 纬度范围：-90度（南极）到90度（北极） + - 经度范围：-180度到180度 + - 半径：从地心开始计算 +2. 提供了球面坐标和笛卡尔坐标的双重表示 +3. 网格在极点附近可能出现变形，需要特别处理 +4. 经度方向是周期性的，可以处理跨越180度经线的情况 +5. 支持Gmsh和二进制格式的文件操作 +6. 适用于地球物理建模、大气科学等领域 \ No newline at end of file diff --git a/doc/tet_mesh.md b/doc/tet_mesh.md new file mode 100644 index 0000000..1b7271a --- /dev/null +++ b/doc/tet_mesh.md @@ -0,0 +1,152 @@ +# GCTL Tetrahedral Mesh 文档 + +## 简介 + +`tet_mesh.h` 定义了GCTL网格库中的四面体网格类 `tet_mesh`，用于创建和管理三维空间中的非结构化四面体网格。该类特别适用于复杂三维区域的离散化，支持任意形状的体积域。 + +## 类继承 + +`tet_mesh` 继承自 `base_mesh` 基类，实现了所有虚函数，并添加了四面体网格特有的功能。 + +## 主要API + +### 初始化 +```cpp +// 初始化四面体网格 +void init(std::string name, // 网格名称 + std::string info, // 网格信息 + const array &nodes, // 节点坐标数组 + const array &elements); // 单元连接关系数组 +``` + +### 网格信息 +```cpp +// 获取节点坐标 +void get_node_coord(int node_idx, // 节点索引 + double &x, double &y, double &z) const; + +// 获取单元节点索引 +void get_elem_nodes(int elem_idx, // 单元索引 + int &n1, int &n2, int &n3, int &n4) const; + +// 获取单元中心坐标 +void get_elem_center(int elem_idx, // 单元索引 + double &x, double &y, double &z) const; + +// 获取单元体积 +double get_elem_volume(int elem_idx) const; + +// 获取单元外接球信息 +void get_elem_circumsphere(int elem_idx, // 单元索引 + double &x, double &y, double &z, // 球心坐标 + double &radius) const; // 半径 +``` + +### 网格查询 +```cpp +// 查找包含指定点的单元 +bool find_element(double x, double y, double z, // 目标点坐标 + int &elem_idx) const; // 返回单元索引 + +// 获取节点相邻的单元 +array get_node_elements(int node_idx) const; + +// 获取单元相邻的单元 +array get_elem_neighbors(int elem_idx) const; + +// 获取边界面 +array get_boundary_faces() const; +``` + +### 网格质量评估 +```cpp +// 获取单元质量参数 +double get_elem_quality(int elem_idx) const; + +// 获取最小二面角 +double get_elem_min_dihedral_angle(int elem_idx) const; + +// 获取最大二面角 +double get_elem_max_dihedral_angle(int elem_idx) const; + +// 获取纵横比 +double get_elem_aspect_ratio(int elem_idx) const; +``` + +### 文件操作 +```cpp +// 保存为Gmsh格式 +virtual void save_gmsh(std::string filename, + index_packed_e packed = Packed) override; + +// 保存为二进制格式 +virtual void save_binary(std::string filename) override; + +// 读取二进制格式 +virtual void load_binary(std::string filename) override; +``` + +## 使用示例 + +```cpp +// 创建节点坐标数组 +array nodes; +nodes.push_back(point3dc(0.0, 0.0, 0.0)); // 底面三角形的顶点 +nodes.push_back(point3dc(1.0, 0.0, 0.0)); +nodes.push_back(point3dc(0.0, 1.0, 0.0)); +nodes.push_back(point3dc(0.0, 0.0, 1.0)); // 顶点 + +// 创建单元连接关系 +array elements; +elements.push_back(int4(0, 1, 2, 3)); // 一个四面体 + +// 创建四面体网格 +gctl::tet_mesh mesh; +mesh.init("volume", "3D tetrahedral mesh", nodes, elements); + +// 获取单元信息 +double volume = mesh.get_elem_volume(0); // 获取四面体的体积 +double quality = mesh.get_elem_quality(0); // 获取四面体的质量参数 + +// 获取外接球信息 +double cx, cy, cz, radius; +mesh.get_elem_circumsphere(0, cx, cy, cz, radius); + +// 查找包含特定点的单元 +int elem_idx; +if (mesh.find_element(0.25, 0.25, 0.25, elem_idx)) { + // 找到包含点(0.25,0.25,0.25)的四面体 +} + +// 获取边界 +array boundary = mesh.get_boundary_faces(); + +// 添加数据并保存 +mesh.add_data(gctl::NodeData, gctl::Vector, "displacement", + array(nodes.size(), point3dc(0,0,0))); +mesh.save_gmsh("volume.msh", gctl::Packed); +``` + +## 注意事项 + +1. 四面体网格适用于三维区域的离散化 +2. 每个单元由四个节点定义，遵循右手法则定义方向 +3. 节点和单元的编号从0开始 +4. 提供了完整的网格质量评估功能： + - 体积 + - 二面角 + - 纵横比 + - 质量参数 +5. 支持复杂的拓扑关系查询 +6. 可以自动识别和提取边界面 +7. 支持Gmsh和二进制格式的文件操作 +8. 适用于： + - 有限元分析 + - 计算流体动力学 + - 结构力学 + - 电磁场分析 +9. 网格质量对计算精度和收敛性有重要影响，建议： + - 控制最小二面角不小于10度 + - 控制最大二面角不大于160度 + - 保持适当的纵横比 + \ No newline at end of file diff --git a/doc/tri_mesh.md b/doc/tri_mesh.md new file mode 100644 index 0000000..0086320 --- /dev/null +++ b/doc/tri_mesh.md @@ -0,0 +1,138 @@ +# GCTL Triangle Mesh 文档 + +## 简介 + +`tri_mesh.h` 定义了GCTL网格库中的三角形网格类 `tri_mesh`，用于创建和管理二维平面上的非结构化三角形网格。该类特别适用于复杂二维区域的离散化，支持任意形状的边界。 + +## 类继承 + +`tri_mesh` 继承自 `base_mesh` 基类，实现了所有虚函数，并添加了三角形网格特有的功能。 + +## 主要API + +### 初始化 +```cpp +// 初始化三角形网格 +void init(std::string name, // 网格名称 + std::string info, // 网格信息 + const array &nodes, // 节点坐标数组 + const array &elements); // 单元连接关系数组 +``` + +### 网格信息 +```cpp +// 获取节点坐标 +void get_node_coord(int node_idx, // 节点索引 + double &x, double &y) const; + +// 获取单元节点索引 +void get_elem_nodes(int elem_idx, // 单元索引 + int &n1, int &n2, int &n3) const; + +// 获取单元中心坐标 +void get_elem_center(int elem_idx, // 单元索引 + double &x, double &y) const; + +// 获取单元面积 +double get_elem_area(int elem_idx) const; + +// 获取单元外接圆信息 +void get_elem_circumcircle(int elem_idx, // 单元索引 + double &x, double &y, // 圆心坐标 + double &radius) const; // 半径 +``` + +### 网格查询 +```cpp +// 查找包含指定点的单元 +bool find_element(double x, double y, // 目标点坐标 + int &elem_idx) const; // 返回单元索引 + +// 获取节点相邻的单元 +array get_node_elements(int node_idx) const; + +// 获取单元相邻的单元 +array get_elem_neighbors(int elem_idx) const; + +// 获取边界边 +array get_boundary_edges() const; +``` + +### 网格质量评估 +```cpp +// 获取单元质量参数 +double get_elem_quality(int elem_idx) const; + +// 获取最小内角 +double get_elem_min_angle(int elem_idx) const; + +// 获取最大内角 +double get_elem_max_angle(int elem_idx) const; +``` + +### 文件操作 +```cpp +// 保存为Gmsh格式 +virtual void save_gmsh(std::string filename, + index_packed_e packed = Packed) override; + +// 保存为二进制格式 +virtual void save_binary(std::string filename) override; + +// 读取二进制格式 +virtual void load_binary(std::string filename) override; +``` + +## 使用示例 + +```cpp +// 创建节点坐标数组 +array nodes; +nodes.push_back(point2dc(0.0, 0.0)); +nodes.push_back(point2dc(1.0, 0.0)); +nodes.push_back(point2dc(0.5, 0.866)); +nodes.push_back(point2dc(0.5, 0.289)); + +// 创建单元连接关系 +array elements; +elements.push_back(int3(0, 1, 3)); // 第一个三角形 +elements.push_back(int3(0, 3, 2)); // 第二个三角形 +elements.push_back(int3(1, 2, 3)); // 第三个三角形 + +// 创建三角形网格 +gctl::tri_mesh mesh; +mesh.init("domain", "2D triangle mesh", nodes, elements); + +// 获取单元信息 +double area = mesh.get_elem_area(0); // 获取第一个三角形的面积 +double quality = mesh.get_elem_quality(0); // 获取第一个三角形的质量参数 + +// 获取外接圆信息 +double cx, cy, radius; +mesh.get_elem_circumcircle(0, cx, cy, radius); + +// 查找包含特定点的单元 +int elem_idx; +if (mesh.find_element(0.5, 0.5, elem_idx)) { + // 找到包含点(0.5,0.5)的三角形 +} + +// 获取边界 +array boundary = mesh.get_boundary_edges(); + +// 添加数据并保存 +mesh.add_data(gctl::NodeData, gctl::Scalar, "pressure", 0.0); +mesh.save_gmsh("domain.msh", gctl::Packed); +``` + +## 注意事项 + +1. 三角形网格适用于二维区域的离散化 +2. 每个单元由三个节点定义，按逆时针顺序排列 +3. 节点和单元的编号从0开始 +4. 提供了完整的网格质量评估功能 +5. 支持复杂的拓扑关系查询 +6. 可以自动识别和提取边界边 +7. 支持Gmsh和二进制格式的文件操作 +8. 适用于有限元分析、流体动力学等数值模拟 +9. 网格质量对计算结果有重要影响，建议进行质量检查 \ No newline at end of file -- 2.45.0 From 2a4f54cf333c011c7dce75ed233c47be4e582abd Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Mon, 13 Jan 2025 12:08:35 +0800 Subject: [PATCH 05/14] tmp --- lib/mesh/mesh.cpp | 10 ++ lib/mesh/mesh.h | 40 ++++-- lib/mesh/regular_grid.cpp | 120 +++++++++--------- lib/mesh/regular_grid.h | 257 +++++++++++++++++++++++++++++++++++--- 4 files changed, 332 insertions(+), 95 deletions(-) diff --git a/lib/mesh/mesh.cpp b/lib/mesh/mesh.cpp index 5ae0907..3fccb81 100644 --- a/lib/mesh/mesh.cpp +++ b/lib/mesh/mesh.cpp @@ -78,6 +78,16 @@ gctl::meshdata &gctl::base_mesh::get_data(std::string datname) return datalist_[data_index(datname)]; } +const gctl::meshdata &gctl::base_mesh::get_data(std::string datname) const +{ + return datalist_[data_index(datname)]; +} + +gctl::meshdata *gctl::base_mesh::get_data_ptr(std::string datname) +{ + return &datalist_[data_index(datname)]; +} + void gctl::base_mesh::remove_data(std::string datname) { int idx = data_index(datname); diff --git a/lib/mesh/mesh.h b/lib/mesh/mesh.h index 9347c74..175a464 100644 --- a/lib/mesh/mesh.h +++ b/lib/mesh/mesh.h @@ -151,7 +151,7 @@ namespace gctl void set_meshinfo(std::string in_info); /** - * @brief 添加网格数据。 + * @brief 添加网格数据，并返回数据对象的引用。 * * @param in_loctype 网格数据类型（块体或顶点数据） * @param in_valtype 网格数据值类型 @@ -160,13 +160,13 @@ namespace gctl * @param if_output 数据是否可用于输出 * @param nan_val 数据无效值标记 * - * @return 数据对象 + * @return 数据对象的引用（非常量的） */ meshdata &add_data(mesh_data_type_e in_loctype, mesh_data_value_e in_valtype, std::string name, double init_val, bool if_output = true, double nan_val = GCTL_BDL_MAX); /** - * @brief 添加网格数据。 + * @brief 添加网格数据，并返回数据对象的引用。 * * @param in_loctype 网格数据类型（块体或顶点数据） * @param name 数据名称 @@ -174,13 +174,13 @@ namespace gctl * @param if_output 数据是否可用于输出 * @param nan_val 数据无效值标记 * - * @return 数据对象 + * @return 数据对象的引用（非常量的） */ meshdata &add_data(mesh_data_type_e in_loctype, std::string name, const array &init_arr, bool if_output = true, double nan_val = GCTL_BDL_MAX); /** - * @brief 添加网格数据。 + * @brief 添加网格数据，并返回数据对象的引用。 * * @param in_loctype 网格数据类型（块体或顶点数据） * @param name 数据名称 @@ -188,13 +188,13 @@ namespace gctl * @param if_output 数据是否可用于输出 * @param nan_val 数据无效值标记 * - * @return 数据对象 + * @return 数据对象的引用（非常量的） */ meshdata &add_data(mesh_data_type_e in_loctype, std::string name, const array &init_arr, bool if_output = true, double nan_val = GCTL_BDL_MAX); /** - * @brief 添加网格数据。 + * @brief 添加网格数据，并返回数据对象的引用。 * * @param in_loctype 网格数据类型（块体或顶点数据） * @param name 数据名称 @@ -202,19 +202,35 @@ namespace gctl * @param if_output 数据是否可用于输出 * @param nan_val 数据无效值标记 * - * @return 数据对象 + * @return 数据对象的引用（非常量的） */ meshdata &add_data(mesh_data_type_e in_loctype, std::string name, const array &init_arr, bool if_output = true, double nan_val = GCTL_BDL_MAX); /** - * @brief 返回对应名称的数据对象指针。 + * @brief 返回对应名称的数据对象引用。 * * @param datname 数据名 - * @return 数据指针 + * @return 数据对象的引用（非常量的） */ meshdata &get_data(std::string datname); + /** + * @brief 返回对应名称的数据对象常量引用。 + * + * @param datname 数据名 + * @return 数据对象的引用（常量的） + */ + const meshdata &get_data(std::string datname) const; + + /** + * @brief 返回对应名称的数据对象指针。 + * + * @param datname 数据名 + * @return 数据对象的指针 + */ + meshdata *get_data_ptr(std::string datname); + /** * @brief 删除对应名称的数据对象。 * @@ -242,7 +258,7 @@ namespace gctl void save_gmsh_withdata(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); /** - * @brief （基类虚函数）保存网格到Gmsh文件。 + * @brief （基类纯虚函数）保存网格到Gmsh文件。 * * @param filename 文件名 * @param packed 索引是否为紧凑（从0开始） @@ -250,7 +266,7 @@ namespace gctl virtual void save_gmsh(std::string filename, index_packed_e packed = Packed) = 0; /** - * @brief 显示网格的维度信息 + * @brief （基类纯虚函数）显示网格的维度信息 * */ virtual void show_mesh_dimension(std::ostream &os) const = 0; diff --git a/lib/mesh/regular_grid.cpp b/lib/mesh/regular_grid.cpp index 0e1e5d8..c9bbc97 100644 --- a/lib/mesh/regular_grid.cpp +++ b/lib/mesh/regular_grid.cpp @@ -190,7 +190,7 @@ void gctl::regular_grid::clear_regular_grid() int gctl::regular_grid::view(std::string datname) { - meshdata data = get_data(datname); + meshdata &data = get_data(datname); 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); @@ -422,36 +422,34 @@ void gctl::regular_grid::save_netcdf_grid(std::string filename, mesh_data_type_e check_initiated(); // check to see if the mesh is not initiated bool if_append = false; - meshdata curr_data; for (size_t i = 0; i < datalist_.size(); i++) { - curr_data = datalist_[i]; - if (curr_data.loctype_ == d_type && d_type == NodeData && - curr_data.valtype_ == Scalar && curr_data.output_ok_) + if (datalist_[i].loctype_ == d_type && d_type == NodeData && + datalist_[i].valtype_ == Scalar && datalist_[i].output_ok_) { if (!if_append) { - gctl::save_netcdf_grid(filename, curr_data.datval_, rg_xnum, rg_ynum, rg_xmin, - rg_dx, rg_ymin, rg_dy, xname, yname, curr_data.name_); + gctl::save_netcdf_grid(filename, datalist_[i].datval_, rg_xnum, rg_ynum, rg_xmin, + rg_dx, rg_ymin, rg_dy, xname, yname, datalist_[i].name_); if_append = true; } else { - gctl::append_netcdf_grid(filename, curr_data.datval_, xname, yname, curr_data.name_); + gctl::append_netcdf_grid(filename, datalist_[i].datval_, xname, yname, datalist_[i].name_); } } - else if (curr_data.loctype_ == d_type && d_type == ElemData && - curr_data.valtype_ == Scalar && curr_data.output_ok_) + else if (datalist_[i].loctype_ == d_type && d_type == ElemData && + datalist_[i].valtype_ == Scalar && datalist_[i].output_ok_) { if (!if_append) { - gctl::save_netcdf_grid(filename, curr_data.datval_, rg_xnum-1, rg_ynum-1, rg_xmin+0.5*rg_dx, - rg_dx, rg_ymin+0.5*rg_dy, rg_dy, xname, yname, curr_data.name_); + gctl::save_netcdf_grid(filename, datalist_[i].datval_, rg_xnum-1, rg_ynum-1, rg_xmin+0.5*rg_dx, + rg_dx, rg_ymin+0.5*rg_dy, rg_dy, xname, yname, datalist_[i].name_); if_append = true; } else { - gctl::append_netcdf_grid(filename, curr_data.datval_, xname, yname, curr_data.name_); + gctl::append_netcdf_grid(filename, datalist_[i].datval_, xname, yname, datalist_[i].name_); } } } @@ -461,7 +459,7 @@ void gctl::regular_grid::save_netcdf_grid(std::string filename, mesh_data_type_e void gctl::regular_grid::save_netcdf_grid(std::string filename, std::string datname, std::string xname, std::string yname) { - meshdata curr_data = get_data(datname); + meshdata &curr_data = get_data(datname); if (!curr_data.output_ok_) { @@ -593,7 +591,7 @@ void gctl::regular_grid::load_surfer_grid(std::string filename, std::string datn void gctl::regular_grid::save_surfer_grid(std::string filename, std::string datname, surfer_file_type_e grid_type) { - meshdata curr_data = get_data(datname); + meshdata &curr_data = get_data(datname); if (!curr_data.output_ok_) { @@ -673,13 +671,10 @@ void gctl::regular_grid::save_gmsh(std::string filename, std::string datname, ou void gctl::regular_grid::save_text(std::string filename, const array &datname) { - mesh_data_type_e d_type; - meshdata curr_data = get_data(datname[0]); - d_type = curr_data.loctype_; - for (size_t i = 1; i < datname.size(); i++) + meshdata &curr_data = get_data(datname[0]); + for (size_t i = 1; i < datalist_.size(); i++) { - curr_data = get_data(datname[i]); - if (d_type != curr_data.loctype_) + if (curr_data.loctype_ != datalist_[i].loctype_) { throw std::runtime_error("[gctl::regular_grid] multiple data location types found."); } @@ -700,10 +695,9 @@ void gctl::regular_grid::save_text(std::string filename, const arrayx + elements[i].ur->x) << " " << 0.5*(elements[i].dl->y + elements[i].ur->y); - for (size_t n = 0; n < datname.size(); n++) + for (size_t n = 0; n < datalist_.size(); n++) { - curr_data = get_data(datname[n]); - ofile << " " << curr_data.datval_[i]; + ofile << " " << datalist_[n].datval_[i]; } ofile << "\n"; } @@ -767,7 +760,7 @@ void gctl::regular_grid::load_data_cloud(const array &in_posi, const a in_val.get(), in_posi.size(), search_xlen, search_ylen, search_deg); // create a new data object - meshdata curr_data = add_data(d_type, Scalar, datname, 0.0, true, GCTL_BDL_MAX); + meshdata &curr_data = add_data(d_type, Scalar, datname, 0.0, true, GCTL_BDL_MAX); for (int i = 0; i < curr_data.datval_.size(); i++) { curr_data.datval_[i] = inte_data->at(i); @@ -785,7 +778,7 @@ void gctl::regular_grid::extract_points(std::string datname, const array parser; if (!parser.compile(expression_str, expression)) throw std::runtime_error("[gctl::regular_grid] Fail to compile the math expression."); - array datas(var.size()); + array datas_ptr(var.size()); mesh_data_value_e val_type1, val_type2; mesh_data_type_e data_type1, data_type2; // Remeber we put the output at the first place. for (size_t i = 1; i < var.size(); i++) { - datas[i] = get_data(data_list[i]); + datas_ptr[i] = get_data_ptr(data_list[i]); } - val_type1 = datas[1].valtype_; - data_type1= datas[1].loctype_; + val_type1 = datas_ptr[1]->valtype_; + data_type1= datas_ptr[1]->loctype_; for (size_t i = 2; i < var.size(); i++) { - val_type2 = datas[i].valtype_; - data_type2= datas[i].loctype_; + val_type2 = datas_ptr[i]->valtype_; + data_type2= datas_ptr[i]->loctype_; if (val_type1 != val_type2 || data_type1 != data_type2) { throw std::runtime_error("[gctl::regular_grid] Can't preform the calculation on selected data."); @@ -1101,22 +1091,24 @@ void gctl::regular_grid::calculator(std::string expression_str, const arrayvaltype_; + data_type2= datas_ptr[0]->loctype_; if (val_type1 != val_type2 || data_type1 != data_type2) { throw std::runtime_error("[gctl::regular_grid] Can't preform the calculation on selected data."); } - for (size_t i = 0; i < datas[0].datval_.size(); i++) + for (size_t i = 0; i < datas_ptr[0]->datval_.size(); i++) { for (size_t v = 0; v < var.size(); v++) { - var[v] = datas[v].datval_[i]; + var[v] = datas_ptr[v]->datval_[i]; } - datas[0].datval_[i] = expression.value(); + datas_ptr[0]->datval_[i] = expression.value(); } return; } @@ -1127,7 +1119,7 @@ void gctl::regular_grid::calculator(std::string expression_str, const arrayJ), 0.0, true, GCTL_BDL_MAX); + meshdata &new_data = add_data(data_type, value_type, datname+"_A"+std::to_string(wt->J), 0.0, true, GCTL_BDL_MAX); idwt2(wt, wavecoeffs, new_data.datval_.get()); int coeff_idx; diff --git a/lib/mesh/regular_grid.h b/lib/mesh/regular_grid.h index ccd3392..b575609 100644 --- a/lib/mesh/regular_grid.h +++ b/lib/mesh/regular_grid.h @@ -48,91 +48,310 @@ namespace gctl /** * 以下为mesh类型的虚函数实现 */ + + /** + * @brief （基类纯虚函数的具体实现）保存网格到Gmsh文件。 + * + * @param filename 文件名 + * @param packed 索引是否为紧凑（从0开始） + */ + void save_gmsh(std::string filename, index_packed_e packed = Packed); - void init(std::string in_name, std::string in_info, int xnum, int ynum, - double xmin, double ymin, double dx, double dy); - + /** + * @brief （基类纯虚函数的具体实现）显示网格的维度信息 + */ void show_mesh_dimension(std::ostream &os) const; + /** + * @brief （基类纯虚函数的具体实现）读入二进制网格文件 + * + * @param filename 文件名 + */ void load_binary(std::string filename); + + /** + * @brief （基类纯虚函数的具体实现）写入二进制网格文件 + * + * @param filename 文件名 + */ void save_binary(std::string filename); /** * 以下为regular_grid的专有函数 */ - regular_grid(); + regular_grid(); ///< 构造函数 + + /** + * @brief 构造函数 + * + * @param in_name 网格名称 + * @param in_info 网格说明 + * @param xnum 网格x方向单元数量 + * @param ynum 网格y方向单元数量 + * @param xmin 网格x方向最小值 + * @param ymin 网格y方向最小值 + * @param dx 网格x方向单元长度 + * @param dy 网格y方向单元长度 + */ regular_grid(std::string in_name, std::string in_info, int xnum, int ynum, double xmin, double ymin, double dx, double dy); - virtual ~regular_grid(); + virtual ~regular_grid(); ///< 析构函数 + + /** + * @brief 初始化规则网格 + * + * @param in_name 网格名称 + * @param in_info 网格说明 + * @param xnum 网格x方向单元数量 + * @param ynum 网格y方向单元数量 + * @param xmin 网格x方向最小值 + * @param ymin 网格y方向最小值 + * @param dx 网格x方向单元长度 + * @param dy 网格y方向单元长度 + */ + void init(std::string in_name, std::string in_info, int xnum, int ynum, + double xmin, double ymin, double dx, double dy); + + /** + * @brief 清除规则网格 + */ void clear_regular_grid(); + + /** + * @brief 使用mathgl显示规则网格 + * + * @param datname 数据名称 + * @return 状态代码 + */ int view(std::string datname); + + /** + * @brief 使用gmt绘制规则网格 + * + * @param datname 数据名称 + */ void plot(std::string datname); - int get_xdim() const; - int get_ydim() const; - double get_xmin() const; - double get_ymin() const; - double get_dx() const; - double get_dy() const; + int get_xdim() const; ///< 获取规则网格的x方向单元数量 + int get_ydim() const; ///< 获取规则网格的y方向单元数量 + double get_xmin() const; ///< 获取规则网格的x方向最小值 + double get_ymin() const; ///< 获取规则网格的y方向最小值 + double get_dx() const; ///< 获取规则网格的x方向单元长度 + double get_dy() const; ///< 获取规则网格的y方向单元长度 #ifdef GCTL_NETCDF + /** + * @brief 从netcdf文件中读取规则网格数据 + * + * @param filename 文件名 + * @param d_type 数据类型 + * @param xname x坐标变量名 + * @param yname y坐标变量名 + * @param zname z坐标变量名 + */ void load_netcdf_grid(std::string filename, mesh_data_type_e d_type, std::string xname = "x", std::string yname = "y", std::string zname = "null"); + + /** + * @brief 保存规则网格数据到netcdf文件中 + * + * @param filename 文件名 + * @param d_type 数据类型 + * @param xname x坐标变量名 + * @param yname y坐标变量名 + */ void save_netcdf_grid(std::string filename, mesh_data_type_e d_type, std::string xname = "x", std::string yname = "y"); + + /** + * @brief 保存规则网格数据到netcdf文件中 + * + * @param filename 文件名 + * @param datname 数据名称 + * @param xname x坐标变量名 + * @param yname y坐标变量名 + */ void save_netcdf_grid(std::string filename, std::string datname, std::string xname = "x", std::string yname = "y"); #endif // GCTL_NETCDF + /** + * @brief 从surfer文件中读取规则网格数据 + * + * @param filename 文件名 + * @param datname 数据名称 + * @param d_type 数据类型 + * @param grid_type 网格类型 + */ void load_surfer_grid(std::string filename, std::string datname, mesh_data_type_e d_type, surfer_file_type_e grid_type = Surfer7Grid); + + /** + * @brief 保存规则网格数据到surfer文件中 + * + * @param filename 文件名 + * @param datname 数据名称 + * @param grid_type 网格类型 + */ void save_surfer_grid(std::string filename, std::string datname, surfer_file_type_e grid_type = Surfer7Grid); - void save_gmsh(std::string filename, index_packed_e packed = Packed); + /** + * @brief 保存规则网格数据到Gmsh文件中 + * + * @param filename 文件名 + * @param out_mode 输出模式 + * @param packed 索引是否为紧凑（从0开始） + */ void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); + + /** + * @brief 保存规则网格数据到Gmsh文件中 + * + * @param filename 文件名 + * @param datname 数据名称 + * @param out_mode 输出模式 + * @param packed 索引是否为紧凑（从0开始） + */ void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); + /** + * @brief 保存规则网格数据到文本文件中 + * + * @param filename 文件名 + * @param datname 数据名称 + */ void save_text(std::string filename, const array &datname); + /** + * @brief 从点云数据中提取规则网格数据 + * + * @param in_posi 点云位置数组 + * @param in_val 点云数据数组 + * @param search_xlen 搜索范围x方向长度 + * @param search_ylen 搜索范围y方向长度 + * @param search_deg 搜索范围角度 + * @param datname 新建数据名称 + * @param d_type 新建数据类型 + */ void load_data_cloud(const array &in_posi, const array &in_val, double search_xlen, double search_ylen, double search_deg, std::string datname, mesh_data_type_e d_type = NodeData); + /** + * @brief 从规则网格数据中提取点云数据 + * + * @param datname 数据名称 + * @param in_posi 点云位置数组 + * @param out_val 输出的点云数据数组 + */ void extract_points(std::string datname, const array &in_posi, array &out_val); + + /** + * @brief 从规则网格数据中提取剖面数据 + * + * @param datname 数据名称 + * @param start_p 剖面起点 + * @param end_p 剖面终点 + * @param size_p 剖面点数 + * @param out_posi 输出的剖面位置数组 + * @param out_val 输出的剖面数据数组 + */ void extract_profile(std::string datname, const point2dc &start_p, const point2dc &end_p, int size_p, array &out_posi, array &out_val); + /** + * @brief 计算规则网格数据的梯度数据 + * + * @param datname 数据名称 + * @param gradname 梯度数据名称 + * @param d_type 梯度数据类型 + * @param order 梯度阶数 + */ void gradient(std::string datname, std::string gradname, gradient_type_e d_type, int order = 1); + + /** + * @brief 计算两个规则网格数据的和 + * + * @param newname 新数据名称 + * @param datname 数据名称 + * @param datname2 数据名称2 + */ void sum(std::string newname, std::string datname, std::string datname2); + + /** + * @brief 计算两个规则网格数据的差 + * + * @param newname 新数据名称 + * @param datname 数据名称 + * @param datname2 数据名称2 + */ void diff(std::string newname, std::string datname, std::string datname2); + + /** + * @brief 计算规则网格数据的布尔数据 + * + * @param newname 新数据名称 + * @param datname 数据名称 + * @param maskname 掩码数据名称 + * @param reverse 是否反转掩码 + */ void boolean(std::string newname, std::string datname, std::string maskname, bool reverse = false); #ifdef GCTL_MESH_EXPRTK + + /** + * @brief 计算规则网格数据的函数值，其中f为节点位置（x，y）的函数 + * + * @param expression_str 表达式字符串 + * @param newname 新数据名称 + * @param x_str x变量名称 + * @param y_str y变量名称 + * @param f_str f变量名称 + */ void function(std::string expression_str, std::string newname, std::string x_str = "x", std::string y_str = "y", std::string f_str = "f"); + + /** + * @brief 计算规则网格数据的函数值，计算不同网格数据合成的函数值 + * + * @param expression_str 表达式字符串 + * @param var_list 变量名称列表 + * @param data_list 数据名称列表 + */ void calculator(std::string expression_str, const array &var_list, const array &data_list); + #endif // GCTL_MESH_EXPRTK #ifdef GCTL_MESH_WAVELIB + + /** + * @brief 计算规则网格数据的小波数据 + * + * @param datname 数据名称 + * @param wavename 小波数据名称 + * @param order 小波阶数 + * @param summary 是否输出小波处理摘要 + */ void wavelet(std::string datname, std::string wavename, int order, bool summary = true); + #endif // GCTL_MESH_WAVELIB protected: - int rg_xnum, rg_ynum; - double rg_xmin, rg_ymin; - double rg_dx, rg_dy; + int rg_xnum, rg_ynum; ///< 规则网格的x方向单元数量和y方向单元数量 + double rg_xmin, rg_ymin; ///< 规则网格的x方向最小值和y方向最小值 + double rg_dx, rg_dy; ///< 规则网格的x方向单元长度和y方向单元长度 #ifdef GCTL_GRAPHIC_MATHGL - mathgl_dens plt; + mathgl_dens plt; ///< mathgl绘图对象 #endif // GCTL_GRAPHIC_MATHGL #ifdef GCTL_GRAPHIC_GMT - gmt_JX_single pic; + gmt_JX_single pic; ///< gmt绘图对象 #endif // GCTL_GRAPHIC_GMT - array nodes; - array elements; + array nodes; ///< 规则网格的节点数组 + array elements; ///< 规则网格的单元数组 }; } -- 2.45.0 From 51467bcec05a329e4af7b35a08c186f2de66838e Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Mon, 13 Jan 2025 14:49:46 +0800 Subject: [PATCH 06/14] tmp update --- tool/gridmanager/gridmanager.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tool/gridmanager/gridmanager.cpp b/tool/gridmanager/gridmanager.cpp index 8efcac8..8d1f3ca 100644 --- a/tool/gridmanager/gridmanager.cpp +++ b/tool/gridmanager/gridmanager.cpp @@ -621,21 +621,21 @@ void data_output(const std::vector &cmd_units) copy_str[i - 1] = cmd_units[i]; } - meshdata curr_data; + meshdata *data_ptr; if (copy_str[0] == "enable") { for (size_t i = 1; i < copy_str.size(); i++) { - curr_data = rg.get_data(copy_str[i]); - curr_data.output_ok_ = true; + data_ptr = rg.get_data_ptr(copy_str[i]); + data_ptr->output_ok_ = true; } } else if (copy_str[0] == "disable") { for (size_t i = 1; i < copy_str.size(); i++) { - curr_data = rg.get_data(copy_str[i]); - curr_data.output_ok_ = false; + data_ptr = rg.get_data_ptr(copy_str[i]); + data_ptr->output_ok_ = false; } } else throw std::runtime_error("data-output: invalid operation type."); @@ -653,7 +653,7 @@ void data_rename(const std::vector &cmd_units) copy_str[i - 1] = cmd_units[i]; } - meshdata curr_data = rg.get_data(copy_str[0]); + meshdata &curr_data = rg.get_data(copy_str[0]); curr_data.name_ = copy_str[1]; return; } @@ -693,13 +693,13 @@ void get_stats(const std::vector &cmd_units) copy_str[i - 1] = cmd_units[i]; } - meshdata curr_data; + meshdata *data_ptr; std::vector stats; for (size_t i = 0; i < copy_str.size(); i++) { - curr_data = rg.get_data(copy_str[i]); - curr_data.show_info(); - curr_data.show_stats(); + data_ptr = rg.get_data_ptr(copy_str[i]); + data_ptr->show_info(); + data_ptr->show_stats(); } return; } -- 2.45.0 From cc2f1d49b5e59bf65c5b24bc8c789c77dc46b22a Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Tue, 14 Jan 2025 08:56:58 +0800 Subject: [PATCH 07/14] tmp --- example/mesh_ex8.cpp | 4 +-- lib/mesh.h | 2 +- lib/mesh/{tri_mesh.cpp => tri2d_mesh.cpp} | 30 +++++++++++------------ lib/mesh/{tri_mesh.h => tri2d_mesh.h} | 10 ++++---- 4 files changed, 23 insertions(+), 23 deletions(-) rename lib/mesh/{tri_mesh.cpp => tri2d_mesh.cpp} (81%) rename lib/mesh/{tri_mesh.h => tri2d_mesh.h} (92%) diff --git a/example/mesh_ex8.cpp b/example/mesh_ex8.cpp index 46bcfac..9616ac1 100644 --- a/example/mesh_ex8.cpp +++ b/example/mesh_ex8.cpp @@ -29,14 +29,14 @@ int main(int argc, char *argv[]) try { - gctl::triangle_mesh t_mesh; + gctl::triangle2d_mesh t_mesh; t_mesh.load_triangle("sample8", gctl::Packed); t_mesh.add_data(gctl::ElemData, gctl::Scalar, "example", 1.0); t_mesh.save_gmsh("sample8-out", "example", gctl::OverWrite, gctl::NotPacked); t_mesh.save_binary("sample8-out"); - gctl::triangle_mesh t2_mesh; + gctl::triangle2d_mesh t2_mesh; t2_mesh.load_binary("sample8-out"); t2_mesh.show_info(); return 0; diff --git a/lib/mesh.h b/lib/mesh.h index e0e62ce..69e7545 100644 --- a/lib/mesh.h +++ b/lib/mesh.h @@ -35,7 +35,7 @@ #include "mesh/regular_mesh_3d.h" #include "mesh/linear_mesh_2d.h" #include "mesh/linear_mesh_3d.h" -#include "mesh/tri_mesh.h" +#include "mesh/tri2d_mesh.h" #include "mesh/tet_mesh.h" #include "mesh/regular_mesh_sph_3d.h" diff --git a/lib/mesh/tri_mesh.cpp b/lib/mesh/tri2d_mesh.cpp similarity index 81% rename from lib/mesh/tri_mesh.cpp rename to lib/mesh/tri2d_mesh.cpp index 6177c73..c6656c6 100644 --- a/lib/mesh/tri_mesh.cpp +++ b/lib/mesh/tri2d_mesh.cpp @@ -25,9 +25,9 @@ * Also add information on how to contact you by electronic and paper mail. ******************************************************/ -#include "tri_mesh.h" +#include "tri2d_mesh.h" -void gctl::triangle_mesh::init(std::string in_name, std::string in_info, const array &in_nodes, +void gctl::triangle2d_mesh::init(std::string in_name, std::string in_info, const array &in_nodes, const array &in_triangles) { check_initiated(true); // 检查是否已经初始化 @@ -56,14 +56,14 @@ void gctl::triangle_mesh::init(std::string in_name, std::string in_info, const a return; } -void gctl::triangle_mesh::show_mesh_dimension(std::ostream &os) const +void gctl::triangle2d_mesh::show_mesh_dimension(std::ostream &os) const { os << "node num: " << node_num_ << std::endl; os << "elem num: " << ele_num_ << std::endl; return; } -void gctl::triangle_mesh::load_binary(std::string filename) +void gctl::triangle2d_mesh::load_binary(std::string filename) { check_initiated(true); // 检查是否已经初始化 @@ -105,7 +105,7 @@ void gctl::triangle_mesh::load_binary(std::string filename) return; } -void gctl::triangle_mesh::save_binary(std::string filename) +void gctl::triangle2d_mesh::save_binary(std::string filename) { check_initiated(); // 检查是否已经初始化 @@ -142,29 +142,29 @@ void gctl::triangle_mesh::save_binary(std::string filename) return; } -gctl::triangle_mesh::triangle_mesh() : base_mesh::base_mesh(){} +gctl::triangle2d_mesh::triangle2d_mesh() : base_mesh::base_mesh(){} -gctl::triangle_mesh::triangle_mesh(std::string in_name, std::string in_info, const array &in_nodes, +gctl::triangle2d_mesh::triangle2d_mesh(std::string in_name, std::string in_info, const array &in_nodes, const array &in_triangles) { init(in_name, in_info, in_nodes, in_triangles); } -gctl::triangle_mesh::~triangle_mesh(){} +gctl::triangle2d_mesh::~triangle2d_mesh(){} -const gctl::array &gctl::triangle_mesh::get_nodes() const +const gctl::array &gctl::triangle2d_mesh::get_nodes() const { check_initiated(); // 检查是否已经初始化 return nodes; } -const gctl::array &gctl::triangle_mesh::get_elements() const +const gctl::array &gctl::triangle2d_mesh::get_elements() const { check_initiated(); // 检查是否已经初始化 return elements; } -void gctl::triangle_mesh::load_triangle(std::string filename, index_packed_e packed) +void gctl::triangle2d_mesh::load_triangle(std::string filename, index_packed_e packed) { gctl::read_Triangle_node(filename, nodes, packed); gctl::read_Triangle_element(filename, elements, nodes, packed); @@ -177,7 +177,7 @@ void gctl::triangle_mesh::load_triangle(std::string filename, index_packed_e pac return; } -void gctl::triangle_mesh::load_gmsh(std::string filename, index_packed_e packed) +void gctl::triangle2d_mesh::load_gmsh(std::string filename, index_packed_e packed) { std::ifstream infile; gctl::open_infile(infile, filename, ".msh"); @@ -193,7 +193,7 @@ void gctl::triangle_mesh::load_gmsh(std::string filename, index_packed_e packed) return; } -void gctl::triangle_mesh::save_gmsh(std::string filename, index_packed_e packed) +void gctl::triangle2d_mesh::save_gmsh(std::string filename, index_packed_e packed) { std::ofstream outfile; gctl::open_outfile(outfile, filename, ".msh"); @@ -202,13 +202,13 @@ void gctl::triangle_mesh::save_gmsh(std::string filename, index_packed_e packed) return; } -void gctl::triangle_mesh::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) +void gctl::triangle2d_mesh::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) { base_mesh::save_gmsh_withdata(filename, out_mode, packed); return; } -void gctl::triangle_mesh::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) +void gctl::triangle2d_mesh::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) { base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); return; diff --git a/lib/mesh/tri_mesh.h b/lib/mesh/tri2d_mesh.h similarity index 92% rename from lib/mesh/tri_mesh.h rename to lib/mesh/tri2d_mesh.h index da5f2d1..145a0a4 100644 --- a/lib/mesh/tri_mesh.h +++ b/lib/mesh/tri2d_mesh.h @@ -32,7 +32,7 @@ namespace gctl { - class triangle_mesh : public base_mesh + class triangle2d_mesh : public base_mesh { public: @@ -49,13 +49,13 @@ namespace gctl void save_binary(std::string filename); /** - * 以下为triangle_mesh的专有函数 + * 以下为triangle2d_mesh的专有函数 */ - triangle_mesh(); - triangle_mesh(std::string in_name, std::string in_info, const array &in_nodes, + triangle2d_mesh(); + triangle2d_mesh(std::string in_name, std::string in_info, const array &in_nodes, const array &in_triangles); - virtual ~triangle_mesh(); + virtual ~triangle2d_mesh(); const array &get_nodes() const; const array &get_elements() const; -- 2.45.0 From bde2b5fa883d56e5e692647b45df2940e88e6736 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Thu, 16 Jan 2025 09:51:10 +0800 Subject: [PATCH 08/14] bug fixed --- lib/mesh/regular_grid.cpp | 8 +++++--- lib/mesh/regular_grid.h | 8 -------- 2 files changed, 5 insertions(+), 11 deletions(-) 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; ///< 规则网格的单元数组 }; -- 2.45.0 From 0a7c3b495e38d82df2fc57a291dc215be4a8faff Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Thu, 16 Jan 2025 10:29:48 +0800 Subject: [PATCH 09/14] function update --- lib/mesh/meshdata.cpp | 15 ++++++++++++++- lib/mesh/regular_grid.cpp | 12 ++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/mesh/meshdata.cpp b/lib/mesh/meshdata.cpp index 4a7015d..a0681a9 100644 --- a/lib/mesh/meshdata.cpp +++ b/lib/mesh/meshdata.cpp @@ -141,7 +141,9 @@ void gctl::meshdata::show_stats(std::ostream &os) const } } - os << "mean = (" << tmp_x.mean() << ", " << tmp_y.mean() << ", " << tmp_z.mean() << ")\n" + os << "max = (" << tmp_x.max() << ", " << tmp_y.max() << ", " << tmp_z.max() << ")\n" + << "min = (" << tmp_x.min() << ", " << tmp_y.min() << ", " << tmp_z.min() << ")\n" + << "mean = (" << tmp_x.mean() << ", " << tmp_y.mean() << ", " << tmp_z.mean() << ")\n" << "std = (" << tmp_x.std() << ", " << tmp_y.std() << ", " << tmp_z.std() << ")\n" << "rms = (" << tmp_x.rms() << ", " << tmp_y.rms() << ", " << tmp_z.rms() << ")\n"; } @@ -174,6 +176,16 @@ void gctl::meshdata::show_stats(std::ostream &os) const } } + os << "max = \n" + << tmp_xx.max() << ", " << tmp_xy.max() << ", " << tmp_xz.max() << "\n" + << tmp_yx.max() << ", " << tmp_yy.max() << ", " << tmp_yz.max() << "\n" + << tmp_zx.max() << ", " << tmp_zy.max() << ", " << tmp_zz.max() << "\n"; + + os << "min = \n" + << tmp_xx.min() << ", " << tmp_xy.min() << ", " << tmp_xz.min() << "\n" + << tmp_yx.min() << ", " << tmp_yy.min() << ", " << tmp_yz.min() << "\n" + << tmp_zx.min() << ", " << tmp_zy.min() << ", " << tmp_zz.min() << "\n"; + os << "mean = \n" << tmp_xx.mean() << ", " << tmp_xy.mean() << ", " << tmp_xz.mean() << "\n" << tmp_yx.mean() << ", " << tmp_yy.mean() << ", " << tmp_yz.mean() << "\n" @@ -208,6 +220,7 @@ void gctl::meshdata::show_stats(std::ostream &os) const } } + os << "max = " << tmp.max() << ", min = " << tmp.min() << std::endl; os << "mean = " << tmp.mean() << ", std = " << tmp.std() << ", rms = " << tmp.rms() << std::endl; } return; diff --git a/lib/mesh/regular_grid.cpp b/lib/mesh/regular_grid.cpp index d482a53..29b788e 100644 --- a/lib/mesh/regular_grid.cpp +++ b/lib/mesh/regular_grid.cpp @@ -78,12 +78,12 @@ void gctl::regular_grid::init(std::string in_name, std::string in_info, int xnum void gctl::regular_grid::show_mesh_dimension(std::ostream &os) const { - os << "node num: " << node_num_ << std::endl; - os << "elem num: " << ele_num_ << std::endl; - os << "x-range: " << rg_xmin << " -> " << rg_xmin + (rg_xnum - 1)*rg_dx << "\n"; - os << "y-range: " << rg_ymin << " -> " << rg_ymin + (rg_ynum - 1)*rg_dy << "\n"; - os << "interval: " << rg_dx << ", " << rg_dy << "\n"; - os << "dimension: " << rg_xnum << ", " << rg_ynum << "\n"; + os << "Node num: " << node_num_ << std::endl; + os << "Elem num: " << ele_num_ << std::endl; + os << "X-range: " << rg_xmin << " -> " << rg_xmin + (rg_xnum - 1)*rg_dx << "\n"; + os << "Y-range: " << rg_ymin << " -> " << rg_ymin + (rg_ynum - 1)*rg_dy << "\n"; + os << "Interval: " << rg_dx << ", " << rg_dy << "\n"; + os << "Dimension: " << rg_xnum << ", " << rg_ynum << "\n"; return; } -- 2.45.0 From f25100399b8ea184f36eda50e1dc7cc40c757834 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Thu, 16 Jan 2025 15:17:21 +0800 Subject: [PATCH 10/14] tmp --- lib/mesh/regular_grid.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mesh/regular_grid.cpp b/lib/mesh/regular_grid.cpp index 29b788e..0b28627 100644 --- a/lib/mesh/regular_grid.cpp +++ b/lib/mesh/regular_grid.cpp @@ -388,7 +388,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); @@ -406,7 +406,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); -- 2.45.0 From 8949847d5a510a20cfa1f7f655cb30d3cf3bff4c Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Fri, 17 Jan 2025 16:34:58 +0800 Subject: [PATCH 11/14] tmp --- example/mesh_ex10.cpp | 2 +- example/mesh_ex6.cpp | 2 +- example/mesh_ex7.cpp | 2 +- example/mesh_ex8.cpp | 2 +- example/mesh_ex9.cpp | 2 +- lib/mesh/linear_mesh_2d.cpp | 15 +-- lib/mesh/linear_mesh_2d.h | 15 ++- lib/mesh/linear_mesh_3d.cpp | 14 +-- lib/mesh/linear_mesh_3d.h | 17 ++-- lib/mesh/mesh.cpp | 87 ++++++++++++++--- lib/mesh/mesh.h | 32 +++++- lib/mesh/regular_grid.cpp | 12 --- lib/mesh/regular_grid.h | 31 ++---- lib/mesh/regular_mesh_2d.cpp | 14 +-- lib/mesh/regular_mesh_2d.h | 15 ++- lib/mesh/regular_mesh_3d.cpp | 42 +------- lib/mesh/regular_mesh_3d.h | 18 ++-- lib/mesh/regular_mesh_sph_3d.cpp | 14 +-- lib/mesh/regular_mesh_sph_3d.h | 18 ++-- lib/mesh/tet_mesh.cpp | 14 +-- lib/mesh/tet_mesh.h | 15 ++- lib/mesh/tri2d_mesh.cpp | 161 ++++++++++++++++++++++--------- lib/mesh/tri2d_mesh.h | 33 +++++-- tool/gridmanager/gridmanager.cpp | 2 +- 24 files changed, 304 insertions(+), 275 deletions(-) diff --git a/example/mesh_ex10.cpp b/example/mesh_ex10.cpp index cbf2dd2..fdf3300 100644 --- a/example/mesh_ex10.cpp +++ b/example/mesh_ex10.cpp @@ -32,6 +32,6 @@ int main(int argc, char *argv[]) gctl::regular_mesh_sph_3d rm_3ds; rm_3ds.init("mesh-1", "null", 30.25, 30.25, 2005, 0.5, 0.5, 10, 40, 40, 50); rm_3ds.add_data(gctl::ElemData, gctl::Scalar, "data-1", 2.5); - rm_3ds.save_gmsh("mesh_sample10",gctl::OverWrite, gctl::NotPacked); + rm_3ds.save_gmsh_withdata("mesh_sample10",gctl::OverWrite, gctl::NotPacked); return 0; } \ No newline at end of file diff --git a/example/mesh_ex6.cpp b/example/mesh_ex6.cpp index 53f01b2..dac659c 100644 --- a/example/mesh_ex6.cpp +++ b/example/mesh_ex6.cpp @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) try } } - rg_mesh.save_gmsh("sample6-out", gctl::OverWrite); + rg_mesh.save_gmsh_withdata("sample6-out", gctl::OverWrite); return 0; } catch(std::exception &e) diff --git a/example/mesh_ex7.cpp b/example/mesh_ex7.cpp index 3750a5e..2c36e9f 100644 --- a/example/mesh_ex7.cpp +++ b/example/mesh_ex7.cpp @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) try } } - rg_mesh.save_gmsh("sample7-out", "double-data", gctl::OverWrite); + rg_mesh.save_gmsh_withdata("sample7-out", "double-data", gctl::OverWrite); return 0; } catch(std::exception &e) diff --git a/example/mesh_ex8.cpp b/example/mesh_ex8.cpp index 9616ac1..532eede 100644 --- a/example/mesh_ex8.cpp +++ b/example/mesh_ex8.cpp @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) try t_mesh.load_triangle("sample8", gctl::Packed); t_mesh.add_data(gctl::ElemData, gctl::Scalar, "example", 1.0); - t_mesh.save_gmsh("sample8-out", "example", gctl::OverWrite, gctl::NotPacked); + t_mesh.save_gmsh_withdata("sample8-out", "example", gctl::OverWrite, gctl::NotPacked); t_mesh.save_binary("sample8-out"); gctl::triangle2d_mesh t2_mesh; diff --git a/example/mesh_ex9.cpp b/example/mesh_ex9.cpp index 611ecf0..bba0587 100644 --- a/example/mesh_ex9.cpp +++ b/example/mesh_ex9.cpp @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) try } } - l2d_mesh.save_gmsh("sample9-out", gctl::OverWrite, gctl::NotPacked); + l2d_mesh.save_gmsh_withdata("sample9-out", gctl::OverWrite, gctl::NotPacked); return 0; } catch(std::exception &e) diff --git a/lib/mesh/linear_mesh_2d.cpp b/lib/mesh/linear_mesh_2d.cpp index 03e1294..1a5f6a2 100644 --- a/lib/mesh/linear_mesh_2d.cpp +++ b/lib/mesh/linear_mesh_2d.cpp @@ -281,17 +281,4 @@ void gctl::linear_mesh_2d::save_gmsh(std::string filename, index_packed_e packed gctl::save2gmsh(outfile, elements, nodes, packed); outfile.close(); return; -} - - -void gctl::linear_mesh_2d::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, out_mode, packed); - return; -} - -void gctl::linear_mesh_2d::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); - return; -} +} \ No newline at end of file diff --git a/lib/mesh/linear_mesh_2d.h b/lib/mesh/linear_mesh_2d.h index df505ef..d4fc000 100644 --- a/lib/mesh/linear_mesh_2d.h +++ b/lib/mesh/linear_mesh_2d.h @@ -40,14 +40,14 @@ namespace gctl * 以下为mesh类型的虚函数实现 */ - void init(std::string in_name, std::string in_info, double xmin, double ymin, - const array &xsizes, const array &ysizes); - - void show_mesh_dimension(std::ostream &os) const; + void load_gmsh(std::string filename, index_packed_e packed = Packed){} + void save_gmsh(std::string filename, index_packed_e packed = Packed); void load_binary(std::string filename); void save_binary(std::string filename); + void show_mesh_dimension(std::ostream &os) const; + /** * 以下为regular_mesh_2d的专有函数 */ @@ -57,6 +57,9 @@ namespace gctl const array &xsizes, const array &ysizes); virtual ~linear_mesh_2d(); + void init(std::string in_name, std::string in_info, double xmin, double ymin, + const array &xsizes, const array &ysizes); + int get_xbnum() const; int get_ybnum() const; double get_xmin() const; @@ -66,10 +69,6 @@ namespace gctl const array *get_xsizes() const; const array *get_ysizes() const; - void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); - void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); - protected: int lm_xbnum, lm_ybnum; double lm_xmin, lm_ymin; diff --git a/lib/mesh/linear_mesh_3d.cpp b/lib/mesh/linear_mesh_3d.cpp index c5df6d9..161e60e 100644 --- a/lib/mesh/linear_mesh_3d.cpp +++ b/lib/mesh/linear_mesh_3d.cpp @@ -371,16 +371,4 @@ void gctl::linear_mesh_3d::save_gmsh(std::string filename, index_packed_e packed gctl::save2gmsh(outfile, elements, nodes, packed); outfile.close(); return; -} - -void gctl::linear_mesh_3d::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, out_mode, packed); - return; -} - -void gctl::linear_mesh_3d::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); - return; -} +} \ No newline at end of file diff --git a/lib/mesh/linear_mesh_3d.h b/lib/mesh/linear_mesh_3d.h index b27b537..9a0684f 100644 --- a/lib/mesh/linear_mesh_3d.h +++ b/lib/mesh/linear_mesh_3d.h @@ -40,15 +40,14 @@ namespace gctl * 以下为mesh类型的虚函数实现 */ - void init(std::string in_name, std::string in_info, double xmin, double ymin, - double zmin, const array &xsizes, const array &ysizes, - const array &zsizes); - - void show_mesh_dimension(std::ostream &os) const; + void load_gmsh(std::string filename, index_packed_e packed = Packed){} + void save_gmsh(std::string filename, index_packed_e packed = Packed); void load_binary(std::string filename); void save_binary(std::string filename); + void show_mesh_dimension(std::ostream &os) const; + /** * 以下为regular_mesh_2d的专有函数 */ @@ -59,6 +58,10 @@ namespace gctl const array &zsizes); virtual ~linear_mesh_3d(); + void init(std::string in_name, std::string in_info, double xmin, double ymin, + double zmin, const array &xsizes, const array &ysizes, + const array &zsizes); + int get_xbnum() const; int get_ybnum() const; int get_zbnum() const; @@ -72,10 +75,6 @@ namespace gctl const array *get_ysizes() const; const array *get_zsizes() const; - void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); - void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); - protected: int lm_xbnum, lm_ybnum, lm_zbnum; double lm_xmin, lm_ymin, lm_zmin; diff --git a/lib/mesh/mesh.cpp b/lib/mesh/mesh.cpp index 3fccb81..fc48f88 100644 --- a/lib/mesh/mesh.cpp +++ b/lib/mesh/mesh.cpp @@ -306,14 +306,15 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out { if (out_mode == OverWrite) save_gmsh(filename, packed); - std::ofstream outfile; - gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); + //std::ofstream outfile; + //gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); for (size_t i = 0; i < datalist_.size(); i++) { if (datalist_[i].loctype_ == NodeData) { - if (datalist_[i].valtype_ == Scalar) gctl::save_gmsh_data(outfile, datalist_[i].name_, datalist_[i].datval_, gctl::NodeData, packed); + //gctl::save_gmsh_data(outfile, datalist_[i].name_, datalist_[i].datval_, gctl::NodeData, packed); + if (datalist_[i].valtype_ == Scalar) meshio_.save_data(datalist_[i].name_, datalist_[i].datval_, NodeData); else if (datalist_[i].valtype_ == Vector) { array vec_data(node_num_); @@ -324,7 +325,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out vec_data[j].z = datalist_[i].datval_[3*j+2]; } - gctl::save_gmsh_data(outfile, datalist_[i].name_, vec_data, gctl::NodeData, packed); + //gctl::save_gmsh_data(outfile, datalist_[i].name_, vec_data, gctl::NodeData, packed); + meshio_.save_data(datalist_[i].name_, vec_data, NodeData); } //else if (datalist_[i].valtype_ == Tensor) //{ @@ -348,7 +350,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out } else if (datalist_[i].loctype_ == ElemData) { - if (datalist_[i].valtype_ == Scalar) gctl::save_gmsh_data(outfile, datalist_[i].name_, datalist_[i].datval_, gctl::ElemData, packed); + //gctl::save_gmsh_data(outfile, datalist_[i].name_, datalist_[i].datval_, gctl::ElemData, packed); + if (datalist_[i].valtype_ == Scalar) meshio_.save_data(datalist_[i].name_, datalist_[i].datval_, ElemData); else if (datalist_[i].valtype_ == Vector) { array vec_data(ele_num_); @@ -359,7 +362,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out vec_data[j].z = datalist_[i].datval_[3*j+2]; } - gctl::save_gmsh_data(outfile, datalist_[i].name_, vec_data, gctl::ElemData, packed); + //gctl::save_gmsh_data(outfile, datalist_[i].name_, vec_data, gctl::ElemData, packed); + meshio_.save_data(datalist_[i].name_, vec_data, ElemData); } //else if (datalist_[i].valtype_ == Tensor) //{ @@ -383,8 +387,6 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out } else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); } - - outfile.close(); return; } @@ -392,13 +394,14 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna { if (out_mode == OverWrite) save_gmsh(filename, packed); - std::ofstream outfile; - gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); + //std::ofstream outfile; + //gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); const meshdata &data = get_data(datname); if (data.loctype_ == NodeData) { - if (data.valtype_ == Scalar) gctl::save_gmsh_data(outfile, data.name_, data.datval_, gctl::NodeData, packed); + //gctl::save_gmsh_data(outfile, data.name_, data.datval_, gctl::NodeData, packed); + if (data.valtype_ == Scalar) meshio_.save_data(data.name_, data.datval_, NodeData); else if (data.valtype_ == Vector) { array vec_data(node_num_); @@ -409,7 +412,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna vec_data[j].z = data.datval_[3*j+2]; } - gctl::save_gmsh_data(outfile, data.name_, vec_data, gctl::NodeData, packed); + //gctl::save_gmsh_data(outfile, data.name_, vec_data, gctl::NodeData, packed); + meshio_.save_data(data.name_, vec_data, NodeData); } //else if (data.valtype_ == Tensor) //{ @@ -433,7 +437,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna } else if (data.loctype_ == ElemData) { - if (data.valtype_ == Scalar) gctl::save_gmsh_data(outfile, data.name_, data.datval_, gctl::ElemData, packed); + //gctl::save_gmsh_data(outfile, data.name_, data.datval_, gctl::ElemData, packed); + if (data.valtype_ == Scalar) meshio_.save_data(data.name_, data.datval_, ElemData); else if (data.valtype_ == Vector) { array vec_data(ele_num_); @@ -444,7 +449,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna vec_data[j].z = data.datval_[3*j+2]; } - gctl::save_gmsh_data(outfile, data.name_, vec_data, gctl::ElemData, packed); + //gctl::save_gmsh_data(outfile, data.name_, vec_data, gctl::ElemData, packed); + meshio_.save_data(data.name_, vec_data, ElemData); } //else if (data.valtype_ == Tensor) //{ @@ -467,8 +473,59 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); + return; +} - outfile.close(); +void gctl::base_mesh::load_gmsh_withdata(std::string filename, index_packed_e packed) +{ + load_gmsh(filename, packed); + + _2d_vector all_node_data, all_elem_data; + _1s_vector nodedata_names, elemdata_names; + meshio_.read_data(all_node_data, nodedata_names, NodeData); + meshio_.read_data(all_elem_data, elemdata_names, ElemData); + + array tmp_data; + meshdata *data_ptr = nullptr; + for (size_t i = 0; i < nodedata_names.size(); i++) + { + add_data(NodeData, Scalar, nodedata_names[i], 0.0); + data_ptr = get_data_ptr(nodedata_names[i]); + if (data_ptr != nullptr) + { + for (size_t n = 0; n < node_num_; n++) + { + data_ptr->datval_[i] = all_node_data[i][n]; + } + } + } + + for (size_t i = 0; i < elemdata_names.size(); i++) + { + add_data(ElemData, Scalar, elemdata_names[i], 0.0); + data_ptr = get_data_ptr(elemdata_names[i]); + if (data_ptr != nullptr) + { + for (size_t n = 0; n < ele_num_; n++) + { + data_ptr->datval_[i] = all_elem_data[i][n]; + } + } + } + return; +} + +void gctl::base_mesh::load_gmsh_withdata(std::string filename, std::string datname, + mesh_data_type_e type, index_packed_e packed) +{ + load_gmsh(filename, packed); + + array tmp_data; + meshio_.read_data(tmp_data, datname); + + if (type == NodeData) add_data(NodeData, datname, tmp_data); + else if (type == ElemData) add_data(NodeData, datname, tmp_data); + else throw std::runtime_error("[gctl::base_mesh] Invalid mesh data type."); return; } diff --git a/lib/mesh/mesh.h b/lib/mesh/mesh.h index 175a464..949dc8e 100644 --- a/lib/mesh/mesh.h +++ b/lib/mesh/mesh.h @@ -237,7 +237,7 @@ namespace gctl * @param datname 数据名 */ void remove_data(std::string datname); - + /** * @brief 保存网格到Gmsh文件，并保存所有数据。 * @@ -257,6 +257,22 @@ namespace gctl */ void save_gmsh_withdata(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); + /** + * @brief 保存网格到Gmsh文件，并读入所有数据。 + * + * @param filename 文件名 + * @param packed 索引是否为紧凑（从0开始） + */ + void load_gmsh_withdata(std::string filename, index_packed_e packed = Packed); + + /** + * @brief 保存网格到Gmsh文件，并读入特定数据。 + * + * @param filename 文件名 + * @param packed 索引是否为紧凑（从0开始） + */ + void load_gmsh_withdata(std::string filename, std::string datname, mesh_data_type_e type, index_packed_e packed = Packed); + /** * @brief （基类纯虚函数）保存网格到Gmsh文件。 * @@ -266,10 +282,12 @@ namespace gctl virtual void save_gmsh(std::string filename, index_packed_e packed = Packed) = 0; /** - * @brief （基类纯虚函数）显示网格的维度信息 - * + * @brief （基类纯虚函数）读入Gmsh文件。 + * + * @param filename 文件名 + * @param packed 索引是否为紧凑（从0开始） */ - virtual void show_mesh_dimension(std::ostream &os) const = 0; + virtual void load_gmsh(std::string filename, index_packed_e packed = Packed) = 0; /** * @brief （基类纯虚函数）读入二进制网格文件 @@ -285,11 +303,17 @@ namespace gctl */ virtual void save_binary(std::string filename) = 0; + /** + * @brief （基类纯虚函数）显示网格的维度信息 + */ + virtual void show_mesh_dimension(std::ostream &os) const = 0; + protected: mesh_type_e meshtype_; mesh_dim_e meshdim_; std::string meshname_; std::string meshinfo_; + gmshio meshio_; int node_num_, ele_num_; bool initialized_; diff --git a/lib/mesh/regular_grid.cpp b/lib/mesh/regular_grid.cpp index 0b28627..819d000 100644 --- a/lib/mesh/regular_grid.cpp +++ b/lib/mesh/regular_grid.cpp @@ -659,18 +659,6 @@ void gctl::regular_grid::save_gmsh(std::string filename, index_packed_e packed) return; } -void gctl::regular_grid::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, out_mode, packed); - return; -} - -void gctl::regular_grid::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); - return; -} - void gctl::regular_grid::save_text(std::string filename, const array &datname) { meshdata &curr_data = get_data(datname[0]); diff --git a/lib/mesh/regular_grid.h b/lib/mesh/regular_grid.h index 4885950..2068fff 100644 --- a/lib/mesh/regular_grid.h +++ b/lib/mesh/regular_grid.h @@ -48,6 +48,8 @@ namespace gctl /** * 以下为mesh类型的虚函数实现 */ + + void load_gmsh(std::string filename, index_packed_e packed = Packed){} /** * @brief （基类纯虚函数的具体实现）保存网格到Gmsh文件。 @@ -57,11 +59,6 @@ namespace gctl */ void save_gmsh(std::string filename, index_packed_e packed = Packed); - /** - * @brief （基类纯虚函数的具体实现）显示网格的维度信息 - */ - void show_mesh_dimension(std::ostream &os) const; - /** * @brief （基类纯虚函数的具体实现）读入二进制网格文件 * @@ -76,6 +73,11 @@ namespace gctl */ void save_binary(std::string filename); + /** + * @brief （基类纯虚函数的具体实现）显示网格的维度信息 + */ + void show_mesh_dimension(std::ostream &os) const; + /** * 以下为regular_grid的专有函数 */ @@ -198,25 +200,6 @@ namespace gctl */ void save_surfer_grid(std::string filename, std::string datname, surfer_file_type_e grid_type = Surfer7Grid); - /** - * @brief 保存规则网格数据到Gmsh文件中 - * - * @param filename 文件名 - * @param out_mode 输出模式 - * @param packed 索引是否为紧凑（从0开始） - */ - void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); - - /** - * @brief 保存规则网格数据到Gmsh文件中 - * - * @param filename 文件名 - * @param datname 数据名称 - * @param out_mode 输出模式 - * @param packed 索引是否为紧凑（从0开始） - */ - void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); - /** * @brief 保存规则网格数据到文本文件中 * diff --git a/lib/mesh/regular_mesh_2d.cpp b/lib/mesh/regular_mesh_2d.cpp index 209e64d..d8742df 100644 --- a/lib/mesh/regular_mesh_2d.cpp +++ b/lib/mesh/regular_mesh_2d.cpp @@ -218,16 +218,4 @@ void gctl::regular_mesh_2d::save_gmsh(std::string filename, index_packed_e packe gctl::save2gmsh(outfile, elements, nodes, packed); outfile.close(); return; -} - -void gctl::regular_mesh_2d::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, out_mode, packed); - return; -} - -void gctl::regular_mesh_2d::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); - return; -} +} \ No newline at end of file diff --git a/lib/mesh/regular_mesh_2d.h b/lib/mesh/regular_mesh_2d.h index 39f7bb4..6eb4405 100644 --- a/lib/mesh/regular_mesh_2d.h +++ b/lib/mesh/regular_mesh_2d.h @@ -40,14 +40,14 @@ namespace gctl * 以下为mesh类型的虚函数实现 */ - void init(std::string in_name, std::string in_info, int xbnum, int ybnum, - double xmin, double ymin, double xsize, double ysize); - - void show_mesh_dimension(std::ostream &os) const; + void load_gmsh(std::string filename, index_packed_e packed = Packed){} + void save_gmsh(std::string filename, index_packed_e packed = Packed); void load_binary(std::string filename); void save_binary(std::string filename); + void show_mesh_dimension(std::ostream &os) const; + /** * 以下为regular_mesh_2d的专有函数 */ @@ -57,6 +57,9 @@ namespace gctl double xmin, double ymin, double xsize, double ysize); virtual ~regular_mesh_2d(); + void init(std::string in_name, std::string in_info, int xbnum, int ybnum, + double xmin, double ymin, double xsize, double ysize); + int get_xbnum() const; int get_ybnum() const; double get_xmin() const; @@ -64,10 +67,6 @@ namespace gctl double get_xsize() const; double get_ysize() const; - void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); - void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); - protected: int rm_xbnum, rm_ybnum; double rm_xmin, rm_ymin; diff --git a/lib/mesh/regular_mesh_3d.cpp b/lib/mesh/regular_mesh_3d.cpp index 8883add..49e42ee 100644 --- a/lib/mesh/regular_mesh_3d.cpp +++ b/lib/mesh/regular_mesh_3d.cpp @@ -265,44 +265,4 @@ void gctl::regular_mesh_3d::save_gmsh(std::string filename, index_packed_e packe gctl::save2gmsh(outfile, elements, nodes, packed); outfile.close(); return; -} - -void gctl::regular_mesh_3d::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, out_mode, packed); - return; -} - -void gctl::regular_mesh_3d::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); - return; -} - -/* -void gctl::regular_mesh_3d::edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, double in_val) -{ - std::string err_str; - meshdata *dat_ptr = get_data(datname); - if (dat_ptr->get_valtype() != Double) - { - err_str = "Incompatible value type of data: " << datname << ". From regular_mesh_3d::edit_data(...)"; - throw runtime_error(err_str); - } - - array* val_ptr = (array*) dat_ptr->get_datval(); - // 按形体类型解析参数字符串 - if (p_type == Block) - { - double xmin, xmax, ymin, ymax, zmin, zmax; - block_parameter_parser(para_str, xmin, xmax, ymin, ymax, zmin, zmax); - - - } - else - { - err_str = "Invalid physical entity type. From regular_mesh_3d::edit_data(...)"; - throw runtime_error(err_str); - } -} -*/ +} \ No newline at end of file diff --git a/lib/mesh/regular_mesh_3d.h b/lib/mesh/regular_mesh_3d.h index ec42b47..ab65a04 100644 --- a/lib/mesh/regular_mesh_3d.h +++ b/lib/mesh/regular_mesh_3d.h @@ -40,14 +40,14 @@ namespace gctl * 以下为mesh类型的虚函数实现 */ - void init(std::string in_name, std::string in_info, int xbnum, int ybnum, int zbnum, - double xmin, double ymin, double zmin, double xsize, double ysize, double zsize); - - void show_mesh_dimension(std::ostream &os) const; + void load_gmsh(std::string filename, index_packed_e packed = Packed){} + void save_gmsh(std::string filename, index_packed_e packed = Packed); void load_binary(std::string filename); void save_binary(std::string filename); + void show_mesh_dimension(std::ostream &os) const; + /** * 以下为regular_mesh_3d的专有函数 */ @@ -57,6 +57,9 @@ namespace gctl double xmin, double ymin, double zmin, double xsize, double ysize, double zsize); virtual ~regular_mesh_3d(); + void init(std::string in_name, std::string in_info, int xbnum, int ybnum, int zbnum, + double xmin, double ymin, double zmin, double xsize, double ysize, double zsize); + int get_xbnum() const; int get_ybnum() const; int get_zbnum() const; @@ -67,13 +70,6 @@ namespace gctl double get_ysize() const; double get_zsize() const; - void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); - void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); - - //void edit_data(std::string datname, physical_type_e p_type, value_operator_e v_type, std::string para_str, double in_val); - //void purge_data(std::string datname, double in_val); - protected: int rm_xbnum, rm_ybnum, rm_zbnum; double rm_xmin, rm_ymin, rm_zmin; diff --git a/lib/mesh/regular_mesh_sph_3d.cpp b/lib/mesh/regular_mesh_sph_3d.cpp index 0849249..5dcecae 100644 --- a/lib/mesh/regular_mesh_sph_3d.cpp +++ b/lib/mesh/regular_mesh_sph_3d.cpp @@ -283,16 +283,4 @@ void gctl::regular_mesh_sph_3d::save_gmsh(std::string filename, index_packed_e p outfile.close(); tmp_nodes.clear(); return; -} - -void gctl::regular_mesh_sph_3d::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, out_mode, packed); - return; -} - -void gctl::regular_mesh_sph_3d::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); - return; -} +} \ No newline at end of file diff --git a/lib/mesh/regular_mesh_sph_3d.h b/lib/mesh/regular_mesh_sph_3d.h index fd4fcd5..fc7661e 100644 --- a/lib/mesh/regular_mesh_sph_3d.h +++ b/lib/mesh/regular_mesh_sph_3d.h @@ -39,13 +39,14 @@ namespace gctl /** * 以下为mesh类型的虚函数实现 */ - void init(std::string in_name, std::string in_info, double lon_min, double lat_min, double rad_min, - double lon_size, double lat_size, double rad_size, int lon_bnum, int lat_bnum, int rad_bnum); - void show_mesh_dimension(std::ostream &os) const; + void load_gmsh(std::string filename, index_packed_e packed = Packed){} + void save_gmsh(std::string filename, index_packed_e packed = Packed); - void load_binary(std::string filename); - void save_binary(std::string filename); + void load_binary(std::string filename); + void save_binary(std::string filename); + + void show_mesh_dimension(std::ostream &os) const; /** * 以下为regular_mesh_sph_3d的专有函数 @@ -55,6 +56,9 @@ namespace gctl double rad_min, double lon_size, double lat_size, double rad_size, int lon_bnum, int lat_bnum, int rad_bnum); virtual ~regular_mesh_sph_3d(); + void init(std::string in_name, std::string in_info, double lon_min, double lat_min, double rad_min, + double lon_size, double lat_size, double rad_size, int lon_bnum, int lat_bnum, int rad_bnum); + int get_lon_bnum() const; int get_lat_bnum() const; int get_rad_bnum() const; @@ -65,10 +69,6 @@ namespace gctl double get_lat_size() const; double get_rad_size() const; - void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); - void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); - protected: int rm_lon_bnum, rm_lat_bnum, rm_rad_bnum; double rm_lon_min, rm_lat_min, rm_rad_min; diff --git a/lib/mesh/tet_mesh.cpp b/lib/mesh/tet_mesh.cpp index 408d2e5..461e464 100644 --- a/lib/mesh/tet_mesh.cpp +++ b/lib/mesh/tet_mesh.cpp @@ -202,16 +202,4 @@ void gctl::tetrahedron_mesh::save_gmsh(std::string filename, index_packed_e pack gctl::save2gmsh(outfile, elements, nodes, packed); outfile.close(); return; -} - -void gctl::tetrahedron_mesh::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, out_mode, packed); - return; -} - -void gctl::tetrahedron_mesh::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); - return; -} +} \ No newline at end of file diff --git a/lib/mesh/tet_mesh.h b/lib/mesh/tet_mesh.h index ea87a83..16ab0ca 100644 --- a/lib/mesh/tet_mesh.h +++ b/lib/mesh/tet_mesh.h @@ -40,14 +40,14 @@ namespace gctl * 以下为mesh类型的虚函数实现 */ - void init(std::string in_name, std::string in_info, const array &in_nodes, - const array &in_tets); - - void show_mesh_dimension(std::ostream &os) const; + void load_gmsh(std::string filename, index_packed_e packed = Packed); + void save_gmsh(std::string filename, index_packed_e packed = Packed); void load_binary(std::string filename); void save_binary(std::string filename); + void show_mesh_dimension(std::ostream &os) const; + /** * 以下为triangle_mesh的专有函数 */ @@ -57,14 +57,13 @@ namespace gctl const array &in_tets); virtual ~tetrahedron_mesh(); + void init(std::string in_name, std::string in_info, const array &in_nodes, + const array &in_tets); + const array &get_nodes() const; const array &get_elements() const; void load_tetgen(std::string filename, index_packed_e packed = Packed); - void load_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); - void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); protected: array nodes; diff --git a/lib/mesh/tri2d_mesh.cpp b/lib/mesh/tri2d_mesh.cpp index c6656c6..9793084 100644 --- a/lib/mesh/tri2d_mesh.cpp +++ b/lib/mesh/tri2d_mesh.cpp @@ -27,28 +27,28 @@ #include "tri2d_mesh.h" -void gctl::triangle2d_mesh::init(std::string in_name, std::string in_info, const array &in_nodes, +void gctl::triangle2d_mesh::init(std::string in_name, std::string in_info, const array &in_nodes_, const array &in_triangles) { check_initiated(true); // 检查是否已经初始化 base_mesh::init(TRI_TET_MESH, MESH_2D, in_name, in_info); - node_num_ = in_nodes.size(); + node_num_ = in_nodes_.size(); ele_num_ = in_triangles.size(); - nodes.resize(node_num_); + nodes_.resize(node_num_); for (int i = 0; i < node_num_; i++) { - nodes[i] = in_nodes[i]; + nodes_[i] = in_nodes_[i]; } - elements.resize(ele_num_); + elems_.resize(ele_num_); for (int i = 0; i < ele_num_; i++) { - elements[i].id = i; + elems_[i].id = i; for (int j = 0; j < 3; j++) { - elements[i].vert[j] = nodes.get(in_triangles[i].vert[j]->id); + elems_[i].vert[j] = nodes_.get(in_triangles[i].vert[j]->id); } } @@ -58,8 +58,8 @@ void gctl::triangle2d_mesh::init(std::string in_name, std::string in_info, const void gctl::triangle2d_mesh::show_mesh_dimension(std::ostream &os) const { - os << "node num: " << node_num_ << std::endl; - os << "elem num: " << ele_num_ << std::endl; + os << "Node num: " << node_num_ << std::endl; + os << "Elem num: " << ele_num_ << std::endl; return; } @@ -68,8 +68,7 @@ void gctl::triangle2d_mesh::load_binary(std::string filename) check_initiated(true); // 检查是否已经初始化 std::ifstream infile; - gctl::open_infile(infile, filename, ".2m", - std::ios::in|std::ios::binary); + gctl::open_infile(infile, filename, ".2m", std::ios::in|std::ios::binary); // 读入网格头信息 load_headinfo(infile, TRI_TET_MESH, MESH_2D); @@ -78,22 +77,22 @@ void gctl::triangle2d_mesh::load_binary(std::string filename) infile.read((char*)&node_num_, sizeof(int)); infile.read((char*)&ele_num_, sizeof(int)); - nodes.resize(node_num_); - elements.resize(ele_num_); + nodes_.resize(node_num_); + elems_.resize(ele_num_); for (int i = 0; i < node_num_; i++) { - infile.read((char*)nodes.get(i), sizeof(gctl::vertex2dc)); + infile.read((char*)nodes_.get(i), sizeof(gctl::vertex2dc)); } int in_index; for (int i = 0; i < ele_num_; i++) { - elements[i].id = i; + elems_[i].id = i; for (int j = 0; j < 3; j++) { infile.read((char*)&in_index, sizeof(int)); - elements[i].vert[j] = nodes.get(in_index); + elems_[i].vert[j] = nodes_.get(in_index); } } @@ -110,8 +109,7 @@ void gctl::triangle2d_mesh::save_binary(std::string filename) check_initiated(); // 检查是否已经初始化 std::ofstream outfile; - gctl::open_outfile(outfile, filename, ".2m", - std::ios::out|std::ios::binary); + gctl::open_outfile(outfile, filename, ".2m", std::ios::out|std::ios::binary); // 首先输出网格的头信息 save_headinfo(outfile); @@ -122,7 +120,7 @@ void gctl::triangle2d_mesh::save_binary(std::string filename) for (int i = 0; i < node_num_; i++) { - outfile.write((char*)nodes.get(i), sizeof(gctl::vertex2dc)); + outfile.write((char*)nodes_.get(i), sizeof(gctl::vertex2dc)); } int in_index; @@ -130,7 +128,7 @@ void gctl::triangle2d_mesh::save_binary(std::string filename) { for (int j = 0; j < 3; j++) { - in_index = elements[i].vert[j]->id; + in_index = elems_[i].vert[j]->id; outfile.write((char*)&in_index, sizeof(int)); } } @@ -144,10 +142,10 @@ void gctl::triangle2d_mesh::save_binary(std::string filename) gctl::triangle2d_mesh::triangle2d_mesh() : base_mesh::base_mesh(){} -gctl::triangle2d_mesh::triangle2d_mesh(std::string in_name, std::string in_info, const array &in_nodes, +gctl::triangle2d_mesh::triangle2d_mesh(std::string in_name, std::string in_info, const array &in_nodes_, const array &in_triangles) { - init(in_name, in_info, in_nodes, in_triangles); + init(in_name, in_info, in_nodes_, in_triangles); } gctl::triangle2d_mesh::~triangle2d_mesh(){} @@ -155,23 +153,39 @@ gctl::triangle2d_mesh::~triangle2d_mesh(){} const gctl::array &gctl::triangle2d_mesh::get_nodes() const { check_initiated(); // 检查是否已经初始化 - return nodes; + return nodes_; } const gctl::array &gctl::triangle2d_mesh::get_elements() const { check_initiated(); // 检查是否已经初始化 - return elements; + return elems_; +} + +void gctl::triangle2d_mesh::reorder2anticlockwise() +{ + check_initiated(); // 检查是否已经初始化 + vertex2dc *v_ptr; + for (size_t i = 0; i < get_elenum(); i++) + { + if (cross(*elems_[i].vert[1] - *elems_[i].vert[0], *elems_[i].vert[2] - *elems_[i].vert[0]) < 0) + { + v_ptr = elems_[i].vert[1]; + elems_[i].vert[1] = elems_[i].vert[2]; + elems_[i].vert[2] = v_ptr; + } + } + return; } void gctl::triangle2d_mesh::load_triangle(std::string filename, index_packed_e packed) { - gctl::read_Triangle_node(filename, nodes, packed); - gctl::read_Triangle_element(filename, elements, nodes, packed); + gctl::read_Triangle_node(filename, nodes_, packed); + gctl::read_Triangle_element(filename, elems_, nodes_, packed); // 设置名称与信息等 - node_num_ = nodes.size(); - ele_num_ = elements.size(); + node_num_ = nodes_.size(); + ele_num_ = elems_.size(); base_mesh::init(TRI_TET_MESH, MESH_2D, filename, "Imported from a .node and .ele file."); initialized_ = true; return; @@ -179,37 +193,96 @@ void gctl::triangle2d_mesh::load_triangle(std::string filename, index_packed_e p void gctl::triangle2d_mesh::load_gmsh(std::string filename, index_packed_e packed) { - std::ifstream infile; - gctl::open_infile(infile, filename, ".msh"); - gctl::read_gmsh_node(infile, nodes, packed); - gctl::read_gmsh_element(infile, elements, nodes, packed); - infile.close(); + meshio_.init_file(filename, Input); + meshio_.set_packed(packed, Input); + meshio_.read_mesh(elems_, nodes_, &elems_tag_); // 设置名称与信息等 - node_num_ = nodes.size(); - ele_num_ = elements.size(); + node_num_ = nodes_.size(); + ele_num_ = elems_.size(); base_mesh::init(TRI_TET_MESH, MESH_2D, filename, "Imported from a .msh file."); initialized_ = true; return; } +void gctl::triangle2d_mesh::load_gmsh_groups() +{ + check_initiated(); // 检查是否已经初始化 + meshio_.read_physical_groups(groups_); + return; +} + void gctl::triangle2d_mesh::save_gmsh(std::string filename, index_packed_e packed) { std::ofstream outfile; gctl::open_outfile(outfile, filename, ".msh"); - gctl::save2gmsh(outfile, elements, nodes, packed); + gctl::save2gmsh(outfile, elems_, nodes_, packed); outfile.close(); + + meshio_.init_file(filename, Output); + meshio_.set_packed(packed, Output); + meshio_.save_mesh(elems_, nodes_); return; } -void gctl::triangle2d_mesh::save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed) +void gctl::triangle2d_mesh::groups2data(std::string datname, _1s_vector phynames, _1d_vector phyvals) { - base_mesh::save_gmsh_withdata(filename, out_mode, packed); - return; -} + check_initiated(); // 检查是否已经初始化 -void gctl::triangle2d_mesh::save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed) -{ - base_mesh::save_gmsh_withdata(filename, datname, out_mode, packed); + if (phynames.size() != phyvals.size() || phynames.empty()) + { + throw std::invalid_argument("The size of phynames and phyvals must be the same and non-empty."); + } + + if (groups_.empty() || elems_tag_.empty()) + { + throw std::invalid_argument("No physical groups found."); + } + + if (elems_tag_.empty()) throw std::invalid_argument("No physical tags found."); + for (size_t i = 0; i < ele_num_; i++) + { + if (elems_tag_[i].empty()) throw std::invalid_argument("No physical tags found."); + } + + array tag_idx(phynames.size()); + for (size_t i = 0; i < phynames.size(); i++) + { + tag_idx[i] = meshio_.physical_name2tag(groups_, phynames[i]); + } + + if (saved(datname)) + { + meshdata &dat = get_data(datname); + if (dat.loctype_ != ElemData) throw std::invalid_argument("The data type must be ElemData."); + + for (size_t i = 0; i < ele_num_; i++) + { + for (size_t e = 0; e < phynames.size(); e++) + { + if (elems_tag_[i][0] == tag_idx[e]) + { + dat.datval_[i] = phyvals[e]; + break; + } + } + } + } + else + { + meshdata &newdat = add_data(ElemData, Scalar, datname, 0.0); + + for (size_t i = 0; i < ele_num_; i++) + { + for (size_t e = 0; e < phynames.size(); e++) + { + if (elems_tag_[i][0] == tag_idx[e]) + { + newdat.datval_[i] = phyvals[e]; + break; + } + } + } + } return; -} +} \ No newline at end of file diff --git a/lib/mesh/tri2d_mesh.h b/lib/mesh/tri2d_mesh.h index 145a0a4..a12f3e8 100644 --- a/lib/mesh/tri2d_mesh.h +++ b/lib/mesh/tri2d_mesh.h @@ -40,14 +40,14 @@ namespace gctl * 以下为mesh类型的虚函数实现 */ - void init(std::string in_name, std::string in_info, const array &in_nodes, - const array &in_triangles); - - void show_mesh_dimension(std::ostream &os) const; + void load_gmsh(std::string filename, index_packed_e packed = Packed); + void save_gmsh(std::string filename, index_packed_e packed = Packed); void load_binary(std::string filename); void save_binary(std::string filename); + void show_mesh_dimension(std::ostream &os) const; + /** * 以下为triangle2d_mesh的专有函数 */ @@ -57,18 +57,31 @@ namespace gctl const array &in_triangles); virtual ~triangle2d_mesh(); + void init(std::string in_name, std::string in_info, const array &in_nodes, + const array &in_triangles); + const array &get_nodes() const; const array &get_elements() const; + void reorder2anticlockwise(); + void load_triangle(std::string filename, index_packed_e packed = Packed); - void load_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, index_packed_e packed = Packed); - void save_gmsh(std::string filename, output_type_e out_mode, index_packed_e packed = Packed); - void save_gmsh(std::string filename, std::string datname, output_type_e out_mode, index_packed_e packed = Packed); + void load_gmsh_groups(); + + /** + * @brief 将模型物理分组转换为模型数据组 + * + * @param datname 赋值给模型数据组的名称（如果数组不存在则新建） + * @param phynames 物理组名称 + * @param phyvals 物理组值 + */ + void groups2data(std::string datname, _1s_vector phynames, _1d_vector phyvals); protected: - array nodes; - array elements; + array nodes_; + array elems_; + array groups_; + _2i_vector elems_tag_; }; } diff --git a/tool/gridmanager/gridmanager.cpp b/tool/gridmanager/gridmanager.cpp index 8d1f3ca..e49a073 100644 --- a/tool/gridmanager/gridmanager.cpp +++ b/tool/gridmanager/gridmanager.cpp @@ -377,7 +377,7 @@ void save_gmsh(const std::vector &cmd_units) // save gmsh if (cmd_units.size() < 3) throw std::runtime_error("save: insufficient parameters."); - rg.save_gmsh(cmd_units[2], OverWrite, NotPacked); + rg.save_gmsh_withdata(cmd_units[2], OverWrite, NotPacked); return; } -- 2.45.0 From d4a5ca2db20b6d4ae8ff6866a5ae681dbde6942c Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Mon, 20 Jan 2025 16:25:56 +0800 Subject: [PATCH 12/14] bug fixed --- lib/mesh/mesh.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/mesh/mesh.cpp b/lib/mesh/mesh.cpp index fc48f88..ccfe9ad 100644 --- a/lib/mesh/mesh.cpp +++ b/lib/mesh/mesh.cpp @@ -485,30 +485,37 @@ void gctl::base_mesh::load_gmsh_withdata(std::string filename, index_packed_e pa meshio_.read_data(all_node_data, nodedata_names, NodeData); meshio_.read_data(all_elem_data, elemdata_names, ElemData); - array tmp_data; - meshdata *data_ptr = nullptr; for (size_t i = 0; i < nodedata_names.size(); i++) { add_data(NodeData, Scalar, nodedata_names[i], 0.0); + } + + for (size_t i = 0; i < elemdata_names.size(); i++) + { + add_data(ElemData, Scalar, elemdata_names[i], 0.0); + } + + meshdata *data_ptr = nullptr; + for (size_t i = 0; i < nodedata_names.size(); i++) + { data_ptr = get_data_ptr(nodedata_names[i]); if (data_ptr != nullptr) { for (size_t n = 0; n < node_num_; n++) { - data_ptr->datval_[i] = all_node_data[i][n]; + data_ptr->datval_[n] = all_node_data[i][n]; } } } for (size_t i = 0; i < elemdata_names.size(); i++) { - add_data(ElemData, Scalar, elemdata_names[i], 0.0); data_ptr = get_data_ptr(elemdata_names[i]); if (data_ptr != nullptr) { for (size_t n = 0; n < ele_num_; n++) { - data_ptr->datval_[i] = all_elem_data[i][n]; + data_ptr->datval_[n] = all_elem_data[i][n]; } } } @@ -524,7 +531,7 @@ void gctl::base_mesh::load_gmsh_withdata(std::string filename, std::string datna meshio_.read_data(tmp_data, datname); if (type == NodeData) add_data(NodeData, datname, tmp_data); - else if (type == ElemData) add_data(NodeData, datname, tmp_data); + else if (type == ElemData) add_data(ElemData, datname, tmp_data); else throw std::runtime_error("[gctl::base_mesh] Invalid mesh data type."); return; } -- 2.45.0 From 3cd0cc307b77484b67c05e6bee31895c06f5fde5 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Mon, 3 Feb 2025 10:45:36 +0800 Subject: [PATCH 13/14] update --- lib/mesh/mesh.cpp | 85 ----------------------------------------- lib/mesh/tri2d_mesh.cpp | 5 --- 2 files changed, 90 deletions(-) diff --git a/lib/mesh/mesh.cpp b/lib/mesh/mesh.cpp index ccfe9ad..8808404 100644 --- a/lib/mesh/mesh.cpp +++ b/lib/mesh/mesh.cpp @@ -306,14 +306,10 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out { if (out_mode == OverWrite) save_gmsh(filename, packed); - //std::ofstream outfile; - //gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); - for (size_t i = 0; i < datalist_.size(); i++) { if (datalist_[i].loctype_ == NodeData) { - //gctl::save_gmsh_data(outfile, datalist_[i].name_, datalist_[i].datval_, gctl::NodeData, packed); if (datalist_[i].valtype_ == Scalar) meshio_.save_data(datalist_[i].name_, datalist_[i].datval_, NodeData); else if (datalist_[i].valtype_ == Vector) { @@ -325,32 +321,12 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out vec_data[j].z = datalist_[i].datval_[3*j+2]; } - //gctl::save_gmsh_data(outfile, datalist_[i].name_, vec_data, gctl::NodeData, packed); meshio_.save_data(datalist_[i].name_, vec_data, NodeData); } - //else if (datalist_[i].valtype_ == Tensor) - //{ - // array ten_data(node_num_); - // for (size_t j = 0; j < node_num_; j++) - // { - // ten_data[j].val[0][0] = datalist_[i].datval_[9*j]; - // ten_data[j].val[0][1] = datalist_[i].datval_[9*j+1]; - // ten_data[j].val[0][2] = datalist_[i].datval_[9*j+2]; - // ten_data[j].val[1][0] = datalist_[i].datval_[9*j+3]; - // ten_data[j].val[1][1] = datalist_[i].datval_[9*j+4]; - // ten_data[j].val[1][2] = datalist_[i].datval_[9*j+5]; - // ten_data[j].val[2][0] = datalist_[i].datval_[9*j+6]; - // ten_data[j].val[2][1] = datalist_[i].datval_[9*j+7]; - // ten_data[j].val[2][2] = datalist_[i].datval_[9*j+8]; - // } - // - // gctl::save_gmsh_data(outfile, datalist_[i].name_, ten_data, gctl::NodeData, packed); - //} else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } else if (datalist_[i].loctype_ == ElemData) { - //gctl::save_gmsh_data(outfile, datalist_[i].name_, datalist_[i].datval_, gctl::ElemData, packed); if (datalist_[i].valtype_ == Scalar) meshio_.save_data(datalist_[i].name_, datalist_[i].datval_, ElemData); else if (datalist_[i].valtype_ == Vector) { @@ -362,27 +338,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, output_type_e out vec_data[j].z = datalist_[i].datval_[3*j+2]; } - //gctl::save_gmsh_data(outfile, datalist_[i].name_, vec_data, gctl::ElemData, packed); meshio_.save_data(datalist_[i].name_, vec_data, ElemData); } - //else if (datalist_[i].valtype_ == Tensor) - //{ - // array ten_data(ele_num_); - // for (size_t j = 0; j < ele_num_; j++) - // { - // ten_data[j].val[0][0] = datalist_[i].datval_[9*j]; - // ten_data[j].val[0][1] = datalist_[i].datval_[9*j+1]; - // ten_data[j].val[0][2] = datalist_[i].datval_[9*j+2]; - // ten_data[j].val[1][0] = datalist_[i].datval_[9*j+3]; - // ten_data[j].val[1][1] = datalist_[i].datval_[9*j+4]; - // ten_data[j].val[1][2] = datalist_[i].datval_[9*j+5]; - // ten_data[j].val[2][0] = datalist_[i].datval_[9*j+6]; - // ten_data[j].val[2][1] = datalist_[i].datval_[9*j+7]; - // ten_data[j].val[2][2] = datalist_[i].datval_[9*j+8]; - // } - // - // gctl::save_gmsh_data(outfile, datalist_[i].name_, ten_data, gctl::ElemData, packed); - //} else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); @@ -394,13 +351,9 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna { if (out_mode == OverWrite) save_gmsh(filename, packed); - //std::ofstream outfile; - //gctl::open_outfile(outfile, filename, ".msh", std::ios::out|std::ios::app); - const meshdata &data = get_data(datname); if (data.loctype_ == NodeData) { - //gctl::save_gmsh_data(outfile, data.name_, data.datval_, gctl::NodeData, packed); if (data.valtype_ == Scalar) meshio_.save_data(data.name_, data.datval_, NodeData); else if (data.valtype_ == Vector) { @@ -412,27 +365,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna vec_data[j].z = data.datval_[3*j+2]; } - //gctl::save_gmsh_data(outfile, data.name_, vec_data, gctl::NodeData, packed); meshio_.save_data(data.name_, vec_data, NodeData); } - //else if (data.valtype_ == Tensor) - //{ - // array ten_data(node_num_); - // for (size_t j = 0; j < node_num_; j++) - // { - // ten_data[j].val[0][0] = data.datval_[9*j]; - // ten_data[j].val[0][1] = data.datval_[9*j+1]; - // ten_data[j].val[0][2] = data.datval_[9*j+2]; - // ten_data[j].val[1][0] = data.datval_[9*j+3]; - // ten_data[j].val[1][1] = data.datval_[9*j+4]; - // ten_data[j].val[1][2] = data.datval_[9*j+5]; - // ten_data[j].val[2][0] = data.datval_[9*j+6]; - // ten_data[j].val[2][1] = data.datval_[9*j+7]; - // ten_data[j].val[2][2] = data.datval_[9*j+8]; - // } - // - // gctl::save_gmsh_data(outfile, data.name_, ten_data, gctl::NodeData, packed); - //} else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } else if (data.loctype_ == ElemData) @@ -449,27 +383,8 @@ void gctl::base_mesh::save_gmsh_withdata(std::string filename, std::string datna vec_data[j].z = data.datval_[3*j+2]; } - //gctl::save_gmsh_data(outfile, data.name_, vec_data, gctl::ElemData, packed); meshio_.save_data(data.name_, vec_data, ElemData); } - //else if (data.valtype_ == Tensor) - //{ - // array ten_data(ele_num_); - // for (size_t j = 0; j < ele_num_; j++) - // { - // ten_data[j].val[0][0] = data.datval_[9*j]; - // ten_data[j].val[0][1] = data.datval_[9*j+1]; - // ten_data[j].val[0][2] = data.datval_[9*j+2]; - // ten_data[j].val[1][0] = data.datval_[9*j+3]; - // ten_data[j].val[1][1] = data.datval_[9*j+4]; - // ten_data[j].val[1][2] = data.datval_[9*j+5]; - // ten_data[j].val[2][0] = data.datval_[9*j+6]; - // ten_data[j].val[2][1] = data.datval_[9*j+7]; - // ten_data[j].val[2][2] = data.datval_[9*j+8]; - // } - // - // gctl::save_gmsh_data(outfile, data.name_, ten_data, gctl::ElemData, packed); - //} else throw std::runtime_error("[gctl::base_mesh] Invalid input data value type."); } else throw std::runtime_error("[gctl::base_mesh] Invalid input data location."); diff --git a/lib/mesh/tri2d_mesh.cpp b/lib/mesh/tri2d_mesh.cpp index 9793084..1ab8173 100644 --- a/lib/mesh/tri2d_mesh.cpp +++ b/lib/mesh/tri2d_mesh.cpp @@ -214,11 +214,6 @@ void gctl::triangle2d_mesh::load_gmsh_groups() void gctl::triangle2d_mesh::save_gmsh(std::string filename, index_packed_e packed) { - std::ofstream outfile; - gctl::open_outfile(outfile, filename, ".msh"); - gctl::save2gmsh(outfile, elems_, nodes_, packed); - outfile.close(); - meshio_.init_file(filename, Output); meshio_.set_packed(packed, Output); meshio_.save_mesh(elems_, nodes_); -- 2.45.0 From 432f555a520537eaf40be57c9a1e2cd2f7d864f7 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Mon, 3 Feb 2025 11:09:59 +0800 Subject: [PATCH 14/14] update readme --- README.md | 156 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 123 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index e7027c6..3aebb27 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,95 @@ GCTL Mesh是地球物理计算工具库(Geophysical Computational Tools & Librar - 支持网格数据的导入导出（包括Gmsh格式和二进制格式） - 支持标量、矢量和张量数据的处理 +## 代码库结构 + +### 核心库 (lib/) +``` +lib/ +├── mesh/ # 核心网格实现 +│ ├── mesh.h # 网格基类 +│ ├── meshdata.h # 网格数据结构 +│ ├── regular_grid.h # 规则网格实现 +│ ├── linear_mesh_2d.h # 2D线性网格 +│ ├── linear_mesh_3d.h # 3D线性网格 +│ ├── tri_mesh.h # 三角形网格 +│ ├── tet_mesh.h # 四面体网格 +│ └── regular_mesh_sph_3d.h # 球面网格 +├── io/ # 输入输出处理 +│ ├── gmsh_io.h # Gmsh格式支持 +│ ├── netcdf_io.h # NetCDF格式支持 +│ └── binary_io.h # 二进制格式支持 +└── utils/ # 工具函数 + ├── math_utils.h # 数学工具 + └── geo_utils.h # 几何工具 +``` + +### 依赖关系 +- `mesh.h` → 基类，定义网格接口 +- `meshdata.h` → 依赖 mesh.h，实现数据管理 +- 具体网格类 → 继承自 mesh.h，实现特定网格功能 + +## 实现细节 + +### 数据结构 + +#### 网格节点 (Node) +```cpp +struct Node { + int id; // 节点ID + double x, y, z; // 节点坐标 + array elems; // 相邻单元列表 +}; +``` + +#### 网格单元 (Element) +```cpp +struct Element { + int id; // 单元ID + array vertices; // 顶点列表 + array neighbors; // 相邻单元 +}; +``` + +#### 数据管理 (MeshData) +```cpp +class MeshData { + string name; // 数据名称 + DataType type; // 数据类型 + array values; // 数据值 + bool output_enabled; // 输出控制 +}; +``` + +### 核心功能实现 + +#### 网格生成 +- 规则网格：基于给定维度和间距生成 +- 非规则网格：支持从外部文件导入或程序化生成 +- 球面网格：基于经纬度和径向参数生成 + +#### 数据操作 +- 插值：支持线性插值和高阶插值 +- 梯度计算：支持一阶和二阶导数 +- 数据过滤：支持平滑和降噪操作 + +#### 文件格式支持 +- Gmsh格式：`.msh`文件，支持网格和数据的导入导出 +- NetCDF格式：`.nc`文件，支持结构化数据的存储 +- 二进制格式：`.bin`文件，用于高效的数据存储和读取 + +### 性能优化 + +#### 数据结构优化 +- 使用连续内存存储提高访问效率 +- 采用邻接表存储拓扑关系 +- 使用哈希表加速查找操作 + +#### 算法优化 +- 网格生成采用增量构建策略 +- 查找操作使用空间分区技术 +- 并行计算支持（可选） + ## 文档 ### 基础类 @@ -33,42 +122,31 @@ GCTL Mesh是地球物理计算工具库(Geophysical Computational Tools & Librar - [`tri_mesh.h`](doc/tri_mesh.md): 三角形网格，用于复杂2D区域的离散化 - [`tet_mesh.h`](doc/tet_mesh.md): 四面体网格，用于复杂3D区域的离散化 -## 核心功能 +## 编译和安装 -### 网格数据管理 -- 支持在顶点或单元上定义数据 -- 支持三种数据类型： - - 标量数据 (Scalar) - - 矢量数据 (Vector) - - 张量数据 (Tensor) -- 数据操作功能： - - 添加/删除数据 - - 数据导入导出 - - 数据统计分析 +### 系统要求 +- C++11或更高版本 +- CMake 3.10或更高版本 +- 可选依赖： + - NetCDF (用于NetCDF格式支持) + - MathGL (用于可视化支持) + - GMT (用于地理数据处理) -### 网格操作 -- 网格初始化和清理 -- 网格信息查询（节点数、单元数等） -- 网格文件导入导出 - - 支持Gmsh格式 - - 支持二进制格式 - - 支持NetCDF格式（部分网格类型） -- 网格数据可视化输出 +### 编译步骤 +```bash +mkdir build +cd build +cmake .. +make +make install +``` -### 网格类型 -支持的网格维度： -- 0D网格 (MESH_0D) -- 2D网格 (MESH_2D) -- 3D网格 (MESH_3D) - -支持的网格类别： -- 规则网格 (REGULAR_MESH) -- 线性网格 (LINEAR_MESH) -- 三角形/四面体网格 (TRI_TET_MESH) -- 球面规则网格 (REGULAR_MESH_SPH) -- 球面线性网格 (LINEAR_MESH_SPH) -- 球面三角形/四面体网格 (TRI_TET_MESH_SPH) -- 规则网格 (REGULAR_GRID) +### 配置选项 +- `GCTL_ENABLE_NETCDF`: 启用NetCDF支持 +- `GCTL_ENABLE_MATHGL`: 启用MathGL可视化 +- `GCTL_ENABLE_GMT`: 启用GMT支持 +- `GCTL_BUILD_EXAMPLES`: 构建示例程序 +- `GCTL_BUILD_TESTS`: 构建测试程序 ## 应用场景 @@ -80,6 +158,18 @@ GCTL Mesh是地球物理计算工具库(Geophysical Computational Tools & Librar - **四面体网格**：适用于复杂3D区域的有限元分析、计算流体力学等 - **球面网格**：特别适用于地球物理学、大气科学等全球尺度的模拟 +## 性能考虑 + +### 内存管理 +- 大规模网格处理时注意内存使用 +- 支持数据流式处理 +- 提供内存使用估算功能 + +### 计算效率 +- 网格操作采用高效算法 +- 支持并行计算（可选） +- 提供性能分析工具 + ## API示例 详细的API使用示例请参考各个网格类型的文档。基本使用模式如下： -- 2.45.0