move all generic modules to core header and fix includes

LLNL · Jan 7, 2025 · 9a56b0b · 9a56b0b
1 parent 9b1ea4e
commit 9a56b0b
Show file tree

Hide file tree

Showing 31 changed files with 8,237 additions and 7,410 deletions.
diff --git a/examples/arkode/C_serial/ark_lotka_volterra_ASA.c b/examples/arkode/C_serial/ark_lotka_volterra_ASA.c
@@ -44,8 +44,8 @@
 
 #include <nvector/nvector_manyvector.h>
 #include <nvector/nvector_serial.h>
-#include <sunadjoint/sunadjoint_checkpointscheme_fixed.h>
-#include <sunadjoint/sunadjoint_stepper.h>
+#include <sunadjointcheckpointscheme/sunadjoint_checkpointscheme_fixed.h>
+#include <sundials/sundials_adjointstepper.h>
 #include <sunmatrix/sunmatrix_dense.h>
 #include <sunmemory/sunmemory_system.h>
 

diff --git a/include/arkode/arkode.h b/include/arkode/arkode.h
@@ -30,7 +30,7 @@
 
 #include <arkode/arkode_butcher.h>
 #include <stdio.h>
-#include <sunadjoint/sunadjoint_stepper.h>
+#include <sundials/sundials_adjointstepper.h>
 #include <sundials/sundials_core.h>
 #include <sundials/sundials_stepper.h>
 

diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h
@@ -23,7 +23,7 @@
 #include <arkode/arkode_ls.h>
 #include <sunadaptcontroller/sunadaptcontroller_imexgus.h>
 #include <sunadaptcontroller/sunadaptcontroller_soderlind.h>
-#include <sunadjoint/sunadjoint_stepper.h>
+#include <sundials/sundials_adjointstepper.h>
 #include <sundials/sundials_stepper.h>
 
 #ifdef __cplusplus /* wrapper to enable C++ usage */

diff --git a/include/arkode/arkode_erkstep.h b/include/arkode/arkode_erkstep.h
@@ -21,7 +21,7 @@
 #include <arkode/arkode_butcher_erk.h>
 #include <sunadaptcontroller/sunadaptcontroller_imexgus.h>
 #include <sunadaptcontroller/sunadaptcontroller_soderlind.h>
-#include <sunadjoint/sunadjoint_stepper.h>
+#include <sundials/sundials_adjointstepper.h>
 #include <sundials/sundials_stepper.h>
 
 #ifdef __cplusplus /* wrapper to enable C++ usage */

diff --git a/...joint/sunadjoint_checkpointscheme_fixed.h → ...cheme/sunadjoint_checkpointscheme_fixed.h b/...joint/sunadjoint_checkpointscheme_fixed.h → ...cheme/sunadjoint_checkpointscheme_fixed.h
@@ -15,7 +15,7 @@
 #ifndef _sunadjoint_checkpointscheme_fixed_H
 #define _sunadjoint_checkpointscheme_fixed_H
 
-#include <sunadjoint/sunadjoint_checkpointscheme.h>
+#include <sundials/sundials_adjointcheckpointscheme.h>
 #include <sundials/sundials_core.h>
 #include <sundials/sundials_export.h>
 #include <sundials/sundials_types.h>

diff --git a/.../sunadjoint/sunadjoint_checkpointscheme.h → ...ndials/sundials_adjointcheckpointscheme.h b/.../sunadjoint/sunadjoint_checkpointscheme.h → ...ndials/sundials_adjointcheckpointscheme.h
@@ -15,8 +15,8 @@
 #ifndef _SUNADJOINT_CHECKPOINTSCHEME_H
 #define _SUNADJOINT_CHECKPOINTSCHEME_H
 
-#include <sundials/sundials_core.h>
-#include "sundials/sundials_types.h"
+#include <sundials/sundials_nvector.h>
+#include <sundials/sundials_types.h>
 
 #ifdef __cplusplus /* wrapper to enable C++ usage */
 extern "C" {

diff --git a/include/sunadjoint/sunadjoint_stepper.h → include/sundials/sundials_adjointstepper.h b/include/sunadjoint/sunadjoint_stepper.h → include/sundials/sundials_adjointstepper.h
@@ -15,10 +15,10 @@
 #ifndef _SUNADJOINT_STEPPER_H
 #define _SUNADJOINT_STEPPER_H
 
-#include <sunadjoint/sunadjoint_checkpointscheme.h>
-#include <sundials/sundials_core.h>
+#include <sundials/sundials_adjointcheckpointscheme.h>
+#include <sundials/sundials_matrix.h>
+#include <sundials/sundials_nvector.h>
 #include <sundials/sundials_stepper.h>
-
 #include "sundials/sundials_types.h"
 
 struct SUNAdjointStepper_

diff --git a/include/sundials/sundials_core.h b/include/sundials/sundials_core.h
@@ -16,6 +16,8 @@
 #define _SUNDIALS_CORE_H
 
 #include <sundials/sundials_adaptcontroller.h>
+#include <sundials/sundials_adjointcheckpointscheme.h>
+#include <sundials/sundials_adjointstepper.h>
 #include <sundials/sundials_config.h>
 #include <sundials/sundials_context.h>
 #include <sundials/sundials_errors.h>
@@ -28,6 +30,7 @@
 #include <sundials/sundials_nonlinearsolver.h>
 #include <sundials/sundials_nvector.h>
 #include <sundials/sundials_profiler.h>
+#include <sundials/sundials_stepper.h>
 #include <sundials/sundials_types.h>
 #include <sundials/sundials_version.h>
 

diff --git a/include/sundials/sundials_stepper.h b/include/sundials/sundials_stepper.h
@@ -13,7 +13,9 @@
 #ifndef _SUNDIALS_STEPPER_H
 #define _SUNDIALS_STEPPER_H
 
-#include <sundials/sundials_core.h>
+#include <sundials/sundials_matrix.h>
+#include <sundials/sundials_nvector.h>
+#include <sundials/sundials_types.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/arkode/arkode_arkstep.c b/src/arkode/arkode_arkstep.c
@@ -22,8 +22,8 @@
 #include <sundials/sundials_math.h>
 #include <sundials/sundials_types.h>
 
-#include <sunadjoint/sunadjoint_checkpointscheme.h>
-#include <sunadjoint/sunadjoint_stepper.h>
+#include <sundials/sundials_adjointcheckpointscheme.h>
+#include <sundials/sundials_adjointstepper.h>
 
 #include <sunnonlinsol/sunnonlinsol_newton.h>
 

diff --git a/src/arkode/arkode_erkstep.c b/src/arkode/arkode_erkstep.c
@@ -22,8 +22,8 @@
 #include <sundials/sundials_context.h>
 #include <sundials/sundials_math.h>
 
-#include <sunadjoint/sunadjoint_checkpointscheme.h>
-#include <sunadjoint/sunadjoint_stepper.h>
+#include <sundials/sundials_adjointcheckpointscheme.h>
+#include <sundials/sundials_adjointstepper.h>
 
 #include <nvector/nvector_manyvector.h>
 

diff --git a/src/arkode/arkode_impl.h b/src/arkode/arkode_impl.h
@@ -25,11 +25,11 @@
 #include <arkode/arkode_butcher_erk.h>
 #include <arkode/arkode_mristep.h>
 
-#include <sunadjoint/sunadjoint_checkpointscheme.h>
-#include <sunadjoint/sunadjoint_stepper.h>
 #include <sundials/priv/sundials_context_impl.h>
 #include <sundials/priv/sundials_errors_impl.h>
 #include <sundials/sundials_adaptcontroller.h>
+#include <sundials/sundials_adjointcheckpointscheme.h>
+#include <sundials/sundials_adjointstepper.h>
 #include <sundials/sundials_context.h>
 #include <sundials/sundials_linearsolver.h>
 #include <sundials/sundials_types.h>

diff --git a/src/sunadjoint/CMakeLists.txt b/src/sunadjoint/CMakeLists.txt
@@ -16,9 +16,9 @@ sundials_add_library(
   SOURCES sunadjoint_stepper.c sunadjoint_checkpointscheme.c
           sunadjoint_checkpointscheme_fixed.c
   HEADERS
-    ${SUNDIALS_SOURCE_DIR}/include/sunadjoint/sunadjoint_stepper.h
-    ${SUNDIALS_SOURCE_DIR}/include/sunadjoint/sunadjoint_checkpointscheme.h
-    ${SUNDIALS_SOURCE_DIR}/include/sunadjoint/sunadjoint_checkpointscheme_fixed.h
+    ${SUNDIALS_SOURCE_DIR}/include/sundials/sundials_adjointstepper.h
+    ${SUNDIALS_SOURCE_DIR}/include/sundials/sundials_adjointcheckpointscheme.h
+    ${SUNDIALS_SOURCE_DIR}/include/sunadjointcheckpointscheme/sunadjoint_checkpointscheme_fixed.h
   LINK_LIBRARIES PUBLIC sundials_core
   OBJECT_LIBRARIES sundials_sunmemsys_obj
   INCLUDE_SUBDIR sunadjoint)