From cc2f1d49b5e59bf65c5b24bc8c789c77dc46b22a Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Tue, 14 Jan 2025 08:56:58 +0800 Subject: [PATCH] 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;