tmp

CMakeLists.txt

@@ -28,9 +28,6 @@ message(STATUS "[GCTL_POTENTIAL] Use the exprtk library: " ${GCTL_POTENTIAL_EXPR
 find_package(GCTL REQUIRED)
 include_directories(${GCTL_INC_DIR})
 
-find_package(GCTL_GRAPHIC REQUIRED)
-include_directories(${GCTL_GRAPHIC_INC_DIR})
-
 find_package(GCTL_MESH REQUIRED)
 include_directories(${GCTL_MESH_INC_DIR})
 
@@ -41,7 +38,7 @@ if(GCTL_POTENTIAL_FFTW3)
 	if(NOT FFTW3_FOUND)
 		find_package(FFTW3 REQUIRED)
 		message(STATUS "Found FFTW3")
-		include_directories(${FFTW3_INC_DIR})
+		include_directories(${FFTW3_INCLUDE_DIRS})
 	endif()
 endif()
 
@@ -72,6 +69,7 @@ if(GCTL_POTENTIAL_AUTODIFF)
 		find_package(autodiff REQUIRED)
 		if(autodiff_FOUND)
 			message(STATUS "autodiff Found.")
+			include_directories(${autodiff_INCLUDE_DIR})
 		endif()
 	endif()
 endif()

GCTL_POTENTIALConfig.cmake.in

@@ -40,7 +40,7 @@ endif()
 if(@PROJECT_NAME@_FFTW3)
     if(NOT FFTW3_FOUND)
         find_package(FFTW3 REQUIRED)
-        include_directories(${FFTW3_INC_DIR})
+        include_directories(${FFTW3_INCLUDE_DIRS})
     endif()
 endif()
 

example/gobser_tri2d_ex.cpp

@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
 
     geodsv_io tio;
     tio.init_table(obsp.size(), 8);
-    tio.set_column_names({"X", "Y", "Vx", "Vz", "Vxx", "Vxz", "Vzx", "Vzz"});
+    tio.column_names({"X", "Y", "Vx", "Vz", "Vxx", "Vxz", "Vzx", "Vzz"});
     tio.fill_column_point2dc(obsp, "X", "Y");
     tio.fill_column(vx, "Vx", 12);
     tio.fill_column(vz, "Vz", 12);

example/gobser_tri2d_sph_ex.cpp

@@ -25,12 +25,11 @@
  * Also add information on how to contact you by electronic and paper mail.
  ******************************************************/
 
+#include "toml.hpp"
+#include "../lib/potential.h"
 #include "gctl/core.h"
 #include "gctl/geometry.h"
 #include "gctl/io.h"
-#include "../lib/potential.h"
-
-#include "toml.hpp"
 
 using namespace gctl;
 int main(int argc, char *argv[]) try
@@ -94,7 +93,7 @@ int main(int argc, char *argv[]) try
 
     geodsv_io gio;
     gio.init_table(obsp.size(), 8);
-    gio.set_column_names({"rad", "deg", "gx", "gz", "gxx", "gxz", "gzx", "gzz"});
+    gio.column_names({"rad", "deg", "gx", "gz", "gxx", "gxz", "gzx", "gzz"});
     gio.fill_column(r, "rad");
     gio.fill_column(d, "deg");
     gio.fill_column(gx, "gx");

lib/CMakeLists.txt

@@ -41,20 +41,13 @@ target_link_libraries(gctl_potential_static ${GCTL_LIB})
 target_link_libraries(gctl_potential PUBLIC ${GCTL_MESH_LIB})
 target_link_libraries(gctl_potential_static ${GCTL_MESH_LIB})
 
-target_link_libraries(gctl_potential PUBLIC ${GCTL_GRAPHIC_LIB})
-target_link_libraries(gctl_potential_static ${GCTL_GRAPHIC_LIB})
-
 target_link_libraries(gctl_potential PUBLIC ${GCTL_OPTIMIZATION_LIB})
 target_link_libraries(gctl_potential_static ${GCTL_OPTIMIZATION_LIB})
 
-#if(GCTL_GRAPHIC_MATHGL)
-#	target_link_libraries(gctl_potential PUBLIC ${MathGL2_LIBRARIES} ${MathGL2_FLTK_LIBRARIES})
-#	target_link_libraries(gctl_potential_static ${MathGL2_LIBRARIES} ${MathGL2_FLTK_LIBRARIES})
-#endif()
-
 if(GCTL_POTENTIAL_FFTW3)
-	target_link_libraries(gctl_potential PUBLIC ${FFTW3_LIBRARIES})
+	find_library(FFTW_LIB ${FFTW3_LIBRARIES} HINTS ${FFTW3_LIBRARY_DIRS})
-	target_link_libraries(gctl_potential_static ${FFTW3_LIBRARIES})
+	target_link_libraries(gctl_potential PUBLIC ${FFTW_LIB})
+	target_link_libraries(gctl_potential_static ${FFTW_LIB})
 endif()
 
 if(GCTL_POTENTIAL_TESS)

lib/potential/gkernel_block.h

@@ -56,6 +56,6 @@ namespace gctl
 	 */
 	void gobser(array<double> &out_obs, const array<block> &ele, const array<point3dc> &obsp, 
 		const array<double> &rho, gravitational_field_type_e comp_id = Vz, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_GRAV_KERNEL_BLOCK_H

lib/potential/gkernel_polygon.h

@@ -43,6 +43,6 @@ namespace gctl
      */
 	void gobser(array<double> &out_obs, const array<vertex2dc> &cor_vert, const array<point2dc> &obsp, 
 		const double &rho, gravitational_field_type_e comp_id = Vz);
-}
+};
 
 #endif // _GCTL_GRAV_KERNEL_POLYGON_H

lib/potential/gkernel_rectangle2d.h

@@ -56,6 +56,6 @@ namespace gctl
 	 */
 	void gobser(array<double> &out_obs, const array<rectangle2d> &ele, const array<point2dc> &obsp, 
 		const array<double> &rho, gravitational_field_type_e comp_id = Vz, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_GRAV_KERNEL_RECTANGLE2D_H

lib/potential/gkernel_sphere.h

@@ -28,12 +28,8 @@
 #ifndef _GCTL_GRAV_KERNEL_SPHERE_H
 #define _GCTL_GRAV_KERNEL_SPHERE_H
 
-#include "gctl/core/array.h"
-#include "gctl/geometry/point3c.h"
-#include "gctl/geometry/sphere.h"
-#include "gctl/optimization/loss_func.h"
-
 #include "gm_data.h"
+#include "gctl/optimization/loss_func.h"
 
 #ifdef GCTL_POTENTIAL_AUTODIFF
 #include "autodiff/reverse/var.hpp"
@@ -84,6 +80,6 @@ namespace gctl
 
 #endif // GCTL_POTENTIAL_AUTODIFF
 
-}
+};
 
 #endif // _GCTL_GRAV_KERNEL_SPHERE_H

lib/potential/gkernel_tesseroid.h

@@ -61,7 +61,7 @@ namespace gctl
 	 */
 	void gobser(array<double> &out_obs, const array<tesseroid> &ele, const array<point3ds> &obsp, 
 		const array<double> &rho, gravitational_field_type_e comp_id = Vz, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // GCTL_POTENTIAL_TESS
 

lib/potential/gkernel_tetrahedron.h

@@ -152,6 +152,6 @@ namespace gctl
 	 */
 	void gobser(array<tensor> &out_obs, const array<grav_tetrahedron> &ele, const array<point3ds> &obsp, 
 		const array<double> &rho, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_GRAV_KERNEL_TETRAHEDRON_H

lib/potential/gkernel_triangle.h

@@ -123,6 +123,6 @@ namespace gctl
 	 */
 	void gobser(array<tensor> &out_obs, const array<grav_triangle> &ele, const array<point3ds> &obsp, 
 		double rho, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_GRAV_KERNEL_TRIANGLE_H

lib/potential/gkernel_triangle2d.h

@@ -81,6 +81,6 @@ namespace gctl
 	 */
 	void gobser(array<double> &out_obs, const array<triangle2d> &ele, const array<point2dp> &obsp, 
 		const array<double> &rho, gravitational_field_type_e comp_id = Vz, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_GRAV_KERNEL_TRIANGLE2D_H

lib/potential/gkernel_tricone.h

@@ -148,6 +148,6 @@ namespace gctl
 		const array<double> &obs_diff, const array<point3ds> &obsp, const array<double> &rho, 
 		const array<vertex3dc> *verts_ptr = nullptr, double ang_limit = -1.0, 
 		gravitational_field_type_e comp_id = Vz, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_GRAV_KERNEL_TRICONE_H

lib/potential/gm_data.h

@@ -28,17 +28,17 @@
 #ifndef _GCTL_GM_DATA_H
 #define _GCTL_GM_DATA_H
 
+#include "gctl_potential_config.h"
+#ifdef GCTL_POTENTIAL_OPENMP
+#include "omp.h"
+#include <thread>
+#endif
+
 #include "gctl/core.h"
 #include "gctl/utility.h"
 #include "gctl/geometry.h"
 #include "gctl/maths.h"
-#include "gctl/algorithm.h"
+#include "gctl/algorithms.h"
-#include "gctl_potential_config.h"
-
-#ifdef GCTL_POTENTIAL_OPENMP
-#include "omp.h"
-#include "thread"
-#endif
 
 namespace gctl
 {

lib/potential/gm_regular_grid.h

@@ -120,6 +120,6 @@ namespace gctl
 		 */
 		void trend(std::string datname, std::string regname, std::string resname, int wx_size, int wy_size, int x_order, int y_order);
 	};
-}
+};
 
 #endif //_GM_REGULAR_GRID_H

lib/potential/gm_regular_mesh_2d.h

@@ -46,6 +46,6 @@ namespace gctl
 		void gobser(array<double> &out_data, std::string data_name, const array<point2dc> &obs, 
 			gravitational_field_type_e comp_id = Vz, verbose_type_e verbose = FullMsg);
 	};
-}
+};
 
 #endif //_GRAV_REGULAR_MESH_2D_H

lib/potential/gm_regular_mesh_3d.h

@@ -64,6 +64,6 @@ namespace gctl
             const array<double> &inc_deg, const array<double> &dec_deg, 
             magnetic_field_type_e comp_id = Za, verbose_type_e verbose = FullMsg);
 	};
-}
+};
 
 #endif //_GM_REGULAR_MESH_3D_H

lib/potential/gm_regular_mesh_sph_3d.h

@@ -63,6 +63,6 @@ namespace gctl
             magnetic_field_type_e comp_id = Za, verbose_type_e verbose = FullMsg);
 #endif // GCTL_POTENTIAL_MAGTESS
 	};
-}
+};
 
 #endif //_GM_REGULAR_MESH_SPH_3D_H

lib/potential/gm_tet_mesh.h

@@ -87,6 +87,6 @@ namespace gctl
 		void magobser(array<tensor> &out_obs, std::string magz_name, const array<point3dc> &obsp, 
         	verbose_type_e verbose = FullMsg);
 	};
-}
+};
 
 #endif // _GM_TET_MESH_H

lib/potential/mkernel_block.h

@@ -77,5 +77,7 @@ namespace gctl
         magnetic_field_type_e comp_id = Za, verbose_type_e verbose = FullMsg);
 
 #endif // GCTL_POTENTIAL_AUTODIFF
-}
+
+};
+
 #endif // _GCTL_MAG_KERNEL_BLOCK_H

lib/potential/mkernel_dipole.h

@@ -97,6 +97,6 @@ namespace gctl
      */
     void magobser(array<point3dc> &out_obs, const array<mag_dipole> &dipoles, 
         const array<point3ds> &obsp, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_MAG_KERNEL_DIPOLE_H

lib/potential/mkernel_tesseroid.h

@@ -125,7 +125,7 @@ namespace gctl
 	void magobser(array<double> &out_obs, const array<mag_tesseroid> &ele, const array<point3ds> &obsp,
 		const array<double> &sus, magnetic_field_type_e comp_id = Za, int gauss_order = 4,
 		verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // GCTL_POTENTIAL_MAGTESS
 

lib/potential/mkernel_tetrahedron.h

@@ -129,6 +129,6 @@ namespace gctl
      */
     void magobser(array<point3dc> &out_obs, const array<mag_tetrahedron> &ele, const array<point3ds> &obsp, 
         const array<double> &sus, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_MAG_KERNEL_TETRAHEDRON_H

lib/potential/mkernel_tetrahedron_Ren2017.h

@@ -295,5 +295,6 @@ namespace gctl
      */
     void magobser(array<tensor> &out_obs, const array<magtet_ren17> &ele, const array<point3ds> &obsp, 
         const array<double> &sus, verbose_type_e verbose = FullMsg);
-}
+};
+
 #endif // _GCTL_MAG_KERNEL_TETRAHEDRON_REN2017_H

lib/potential/mkernel_triangle.h

@@ -129,6 +129,6 @@ namespace gctl
      */
     void magobser(array<point3dc> &out_obs, const array<mag_triangle> &ele, const array<point3ds> &obsp, 
         const array<double> &sus, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_MAG_KERNEL_TRIANGLE_H

lib/potential/mkernel_tricone.h

@@ -77,6 +77,6 @@ namespace gctl
 
     void magobser(array<point3dc> &out_obs, const array<magcone> &top_ele, const array<magcone> &btm_ele, 
 		const array<point3ds> &obsp, const array<double> &sus, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_MAG_KERNEL_TRICONE_H

lib/potential/mkernel_tricone_Ren2017.h

@@ -137,6 +137,6 @@ namespace gctl
      */
     void magobser(array<tensor> &out_obs, const array<magcone_ren17> &top_ele, const array<magcone_ren17> &btm_ele, 
 		  const array<point3ds> &obsp, const array<double> &sus, verbose_type_e verbose = FullMsg);
-}
+};
 
 #endif // _GCTL_MAG_KERNEL_TRICONE_REN2017_H

tool/gridmanager-potential/gridmanager-potential.cpp

@@ -372,7 +372,7 @@ void save_gmsh(const std::vector<std::string> &cmd_units)
     // save gmsh <file>
     if (cmd_units.size() < 3) throw std::runtime_error("save: insufficient parameters.");
 
-    rg.save_gmsh(cmd_units[2], OverWrite, NotPacked);
+    rg.save_gmsh(cmd_units[2], NotPacked);
     return;
 }