fix(cartesiandomain): correct inclusion of hpp files

yoctoyotta1024 · Apr 16, 2024 · b6ece2f · b6ece2f
1 parent 763e39d
commit b6ece2f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/libs/cartesiandomain/CMakeLists.txt b/libs/cartesiandomain/CMakeLists.txt
@@ -14,7 +14,6 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 set(SOURCES
 "cartesianmaps.cpp"
 "cartesianmotion.cpp"
-#"cartesianmotion_withreset.cpp"
 "createcartesianmaps.cpp"
 )
 # must use STATIC (not(!) SHARED) lib for linking to executable if build is CUDA enabled with Kokkos

diff --git a/libs/cartesiandomain/null_boundary_conditions.hpp b/libs/cartesiandomain/null_boundary_conditions.hpp
@@ -23,8 +23,11 @@
 #ifndef LIBS_CARTESIANDOMAIN_NULL_BOUNDARY_CONDITIONS_HPP_
 #define LIBS_CARTESIANDOMAIN_NULL_BOUNDARY_CONDITIONS_HPP_
 
+#include "../kokkosaliases.hpp"
+#include "cartesiandomain/cartesianmaps.hpp"
+
 struct NullBoundaryConditions {
-  void operator()(const GridboxMaps auto &gbxmaps, viewd_gbx d_gbxs,
+  void operator()(const CartesianMaps &gbxmaps, viewd_gbx d_gbxs,
                   const viewd_supers totsupers) const {}
 };
 

diff --git a/src/main_impl.hpp b/src/main_impl.hpp
@@ -31,8 +31,8 @@
 
 #include "cartesiandomain/cartesianmaps.hpp"
 #include "cartesiandomain/cartesianmotion.hpp"
-#include "cartesiandomain/cartesianmotion_withreset.hpp"
 #include "cartesiandomain/createcartesianmaps.hpp"
+#include "cartesiandomain/null_boundary_conditions.hpp"
 #include "coupldyn_fromfile/fromfile_cartesian_dynamics.hpp"
 #include "coupldyn_fromfile/fromfilecomms.hpp"
 #include "gridboxes/gridboxmaps.hpp"
@@ -107,7 +107,7 @@ inline Motion<CartesianMaps> auto create_motion(const unsigned int motionstep) {
   //                                 &step2dimlesstime,
   //                                 terminalv,
   //                                 ngbxs,
-  //                                 ngbxs4reset);
+  //                                 ngbxs4reset);  //TODO(CB) Delete option (!)
 
   return CartesianMotion(motionstep, &step2dimlesstime, terminalv);