Merge pull request #89 from streeve/separate_forces

Separate base and model-specific forces and models
ORNL · May 8, 2024 · 5a7c0d0 · 5a7c0d0
2 parents 47fbc04 + 091790e
commit 5a7c0d0
Show file tree

Hide file tree

Showing 9 changed files with 1,288 additions and 1,074 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,8 +1,10 @@
 configure_file(CabanaPD_config.hpp.cmakein CabanaPD_config.hpp @ONLY)
 
 file(GLOB HEADERS GLOB *.hpp)
+file(GLOB FORCE_HEADERS GLOB force/*.hpp)
 
 install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(FILES ${FORCE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/force)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CabanaPD_config.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 add_library(CabanaPD INTERFACE)

diff --git a/src/CabanaPD.hpp b/src/CabanaPD.hpp
@@ -17,6 +17,7 @@
 #include <CabanaPD_Comm.hpp>
 #include <CabanaPD_Fields.hpp>
 #include <CabanaPD_Force.hpp>
+#include <CabanaPD_ForceModels.hpp>
 #include <CabanaPD_Input.hpp>
 #include <CabanaPD_Integrate.hpp>
 #include <CabanaPD_Output.hpp>
@@ -26,4 +27,9 @@
 #include <CabanaPD_Types.hpp>
 #include <CabanaPD_config.hpp>
 
+#include <force/CabanaPD_ForceModels_LPS.hpp>
+#include <force/CabanaPD_ForceModels_PMB.hpp>
+#include <force/CabanaPD_Force_LPS.hpp>
+#include <force/CabanaPD_Force_PMB.hpp>
+
 #endif