diff --git a/CMakeLists.txt b/CMakeLists.txt index 036bfcd..5bce944 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15.2) # 设置项目名称与语言 -project(GCTL_MESH VERSION 1.0) +project(GCTL_MESH VERSION 2.0) # 添加配置配件编写的函数 include(CMakePackageConfigHelpers) diff --git a/lib/mesh/gctl_mesh_config.h b/lib/mesh/gctl_mesh_config.h index 8b15abd..c2b6d06 100644 --- a/lib/mesh/gctl_mesh_config.h +++ b/lib/mesh/gctl_mesh_config.h @@ -1,3 +1,3 @@ -#define GCTL_MESH_INSTALL_PREFIX "/opt/stow/gctl_mesh" +#define GCTL_MESH_INSTALL_PREFIX "/usr/local" #define GCTL_MESH_EXPRTK #define GCTL_MESH_WAVELIB diff --git a/lib/mesh/mesh.h b/lib/mesh/mesh.h index a81459a..e6ff3b6 100644 --- a/lib/mesh/mesh.h +++ b/lib/mesh/mesh.h @@ -30,7 +30,7 @@ #include "meshdata.h" #include "gctl/io.h" -#include "gctl/algorithms.h" +#include "gctl/math.h" namespace gctl { diff --git a/lib/mesh/meshdata.h b/lib/mesh/meshdata.h index aa6e107..78d6490 100644 --- a/lib/mesh/meshdata.h +++ b/lib/mesh/meshdata.h @@ -29,8 +29,8 @@ #define _GCTL_MESHDATA_H #include "gctl_mesh_config.h" -#include "gctl/geometry/point3c.h" -#include "gctl/geometry/tensor.h" +#include "gctl/poly/point3c.h" +#include "gctl/poly/tensor.h" namespace gctl { diff --git a/lib/mesh/regular_mesh_sph_3d.cpp b/lib/mesh/regular_mesh_sph_3d.cpp index c4a4cf7..2ea4d20 100644 --- a/lib/mesh/regular_mesh_sph_3d.cpp +++ b/lib/mesh/regular_mesh_sph_3d.cpp @@ -271,7 +271,7 @@ void gctl::regular_mesh_sph_3d::save_gmsh(std::string filename, index_packed_e p gctl::array tmp_nodes(nodes.size()); for (int i = 0; i < nodes.size(); i++) { - tmp_c = nodes[i].s2c(); + tmp_c = s2c(nodes[i]); tmp_nodes[i].id = i; tmp_nodes[i].x = tmp_c.x; tmp_nodes[i].y = tmp_c.y;