rename *_simplified_sdc.H -> *_sdc.H (#1475)

since we've merged the code paths for true SDC and simplified SDC, this is a more accurate name
AMReX-Astro · Feb 12, 2024 · 2b623ab · 2b623ab
1 parent 348ca2f
commit 2b623ab
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 25 deletions.
diff --git a/integration/BackwardEuler/Make.package b/integration/BackwardEuler/Make.package
@@ -1,5 +1,5 @@
 ifeq ($(USE_ALL_SDC), TRUE)
-  CEXE_headers += actual_integrator_simplified_sdc.H
+  CEXE_headers += actual_integrator_sdc.H
 else
   CEXE_headers += actual_integrator.H
 endif

diff --git a/...dEuler/actual_integrator_simplified_sdc.H → ...ion/BackwardEuler/actual_integrator_sdc.H b/...dEuler/actual_integrator_simplified_sdc.H → ...ion/BackwardEuler/actual_integrator_sdc.H
diff --git a/integration/BackwardEuler/be_integrator.H b/integration/BackwardEuler/be_integrator.H
@@ -14,7 +14,7 @@
 #include <integrator_rhs_strang.H>
 #endif
 #ifdef SDC
-#include <integrator_rhs_simplified_sdc.H>
+#include <integrator_rhs_sdc.H>
 #endif
 #include <integrator_data.H>
 #include <initial_timestep.H>

diff --git a/integration/BackwardEuler/be_type.H b/integration/BackwardEuler/be_type.H
@@ -11,7 +11,7 @@
 #include <integrator_type_strang.H>
 #endif
 #ifdef SDC
-#include <integrator_type_simplified_sdc.H>
+#include <integrator_type_sdc.H>
 #endif
 #include <network.H>
 

diff --git a/integration/Make.package b/integration/Make.package
@@ -17,16 +17,16 @@ CEXE_headers += integrator_data.H
 CEXE_headers += integrator_type.H
 
 ifeq ($(USE_ALL_SDC), TRUE)
-  CEXE_headers += integrator_rhs_simplified_sdc.H
-  CEXE_headers += integrator_type_simplified_sdc.H
+  CEXE_headers += integrator_rhs_sdc.H
+  CEXE_headers += integrator_type_sdc.H
 else
   CEXE_headers += integrator_type_strang.H
   CEXE_headers += integrator_rhs_strang.H
 endif
 
 ifeq ($(USE_NSE_TABLE), TRUE)
   ifeq ($(USE_ALL_SDC), TRUE)
-    CEXE_headers += nse_update_simplified_sdc.H
+    CEXE_headers += nse_update_sdc.H
   else
     CEXE_headers += nse_update_strang.H
   endif

diff --git a/integration/RKC/Make.package b/integration/RKC/Make.package
@@ -1,5 +1,5 @@
 ifeq ($(USE_ALL_SDC), TRUE)
-  CEXE_headers += actual_integrator_simplified_sdc.H
+  CEXE_headers += actual_integrator_sdc.H
 else
   CEXE_headers += actual_integrator.H
 endif

diff --git a/...on/RKC/actual_integrator_simplified_sdc.H → integration/RKC/actual_integrator_sdc.H b/...on/RKC/actual_integrator_simplified_sdc.H → integration/RKC/actual_integrator_sdc.H
diff --git a/integration/RKC/rkc.H b/integration/RKC/rkc.H
@@ -9,8 +9,8 @@
 #include <integrator_rhs_strang.H>
 #endif
 #ifdef SDC
-#include <integrator_type_simplified_sdc.H>
-#include <integrator_rhs_simplified_sdc.H>
+#include <integrator_type_sdc.H>
+#include <integrator_rhs_sdc.H>
 #endif
 #include <circle_theorem.H>
 #include <integrator_data.H>

diff --git a/integration/RKC/rkc_type.H b/integration/RKC/rkc_type.H
@@ -95,7 +95,7 @@ struct rkc_t {
 };
 
 #ifdef SDC
-#include <integrator_type_simplified_sdc.H>
+#include <integrator_type_sdc.H>
 #endif
 #ifdef STRANG
 #include <integrator_type_strang.H>

diff --git a/integration/VODE/Make.package b/integration/VODE/Make.package
@@ -1,5 +1,5 @@
 ifeq ($(USE_ALL_SDC), TRUE)
-  CEXE_headers += actual_integrator_simplified_sdc.H
+  CEXE_headers += actual_integrator_sdc.H
 else
   CEXE_headers += actual_integrator.H
 endif

diff --git a/...n/VODE/actual_integrator_simplified_sdc.H → integration/VODE/actual_integrator_sdc.H b/...n/VODE/actual_integrator_simplified_sdc.H → integration/VODE/actual_integrator_sdc.H
diff --git a/integration/VODE/vode_dvhin.H b/integration/VODE/vode_dvhin.H
@@ -5,7 +5,7 @@
 #include <integrator_rhs_strang.H>
 #endif
 #ifdef SDC
-#include <integrator_rhs_simplified_sdc.H>
+#include <integrator_rhs_sdc.H>
 #endif
 
 template <typename BurnT, typename DvodeT>

diff --git a/integration/VODE/vode_dvjac.H b/integration/VODE/vode_dvjac.H
@@ -9,7 +9,7 @@
 #include <integrator_rhs_strang.H>
 #endif
 #ifdef SDC
-#include <integrator_rhs_simplified_sdc.H>
+#include <integrator_rhs_sdc.H>
 #endif
 
 template <typename BurnT, typename DvodeT>

diff --git a/integration/VODE/vode_dvode.H b/integration/VODE/vode_dvode.H
@@ -8,7 +8,7 @@
 #include <integrator_rhs_strang.H>
 #endif
 #ifdef SDC
-#include <integrator_rhs_simplified_sdc.H>
+#include <integrator_rhs_sdc.H>
 #endif
 #ifdef NSE_TABLE
 #include <nse_table_check.H>

diff --git a/integration/VODE/vode_type.H b/integration/VODE/vode_type.H
@@ -241,7 +241,7 @@ void print_state(dvode_t<int_neqs>& dvode_state)
 #endif
 
 #ifdef SDC
-#include <integrator_type_simplified_sdc.H>
+#include <integrator_type_sdc.H>
 #endif
 #ifdef STRANG
 #include <integrator_type_strang.H>

diff --git a/integration/integrator.H b/integration/integrator.H
@@ -2,7 +2,7 @@
 #define INTEGRATOR_H
 
 #ifdef SDC
-#include <actual_integrator_simplified_sdc.H>
+#include <actual_integrator_sdc.H>
 #else
 #include <actual_integrator.H>
 #endif

diff --git a/integration/integrator_rhs_simplified_sdc.H → integration/integrator_rhs_sdc.H b/integration/integrator_rhs_simplified_sdc.H → integration/integrator_rhs_sdc.H
@@ -1,11 +1,11 @@
-#ifndef INTEGRATOR_RHS_SIMPLIFIED_SDC_H
-#define INTEGRATOR_RHS_SIMPLIFIED_SDC_H
+#ifndef INTEGRATOR_RHS_SDC_H
+#define INTEGRATOR_RHS_SDC_H
 
 #include <network.H>
 #include <burn_type.H>
 #include <extern_parameters.H>
 
-#include <integrator_type_simplified_sdc.H>
+#include <integrator_type_sdc.H>
 #include <actual_network.H>
 #ifdef NEW_NETWORK_IMPLEMENTATION
 #include <rhs.H>

diff --git a/integration/integrator_type_simplified_sdc.H → integration/integrator_type_sdc.H b/integration/integrator_type_simplified_sdc.H → integration/integrator_type_sdc.H
@@ -1,5 +1,5 @@
-#ifndef INTEGRATOR_TYPE_SIMPLIFIED_SDC_H
-#define INTEGRATOR_TYPE_SIMPLIFIED_SDC_H
+#ifndef INTEGRATOR_TYPE_SDC_H
+#define INTEGRATOR_TYPE_SDC_H
 
 #include <eos.H>
 #include <eos_composition.H>

diff --git a/integration/nse_update_simplified_sdc.H → integration/nse_update_sdc.H b/integration/nse_update_simplified_sdc.H → integration/nse_update_sdc.H
diff --git a/integration/utils/circle_theorem.H b/integration/utils/circle_theorem.H
@@ -7,8 +7,8 @@
 #include <integrator_rhs_strang.H>
 #endif
 #ifdef SDC
-#include <integrator_type_simplified_sdc.H>
-#include <integrator_rhs_simplified_sdc.H>
+#include <integrator_type_sdc.H>
+#include <integrator_rhs_sdc.H>
 #endif
 #include <limits>
 

diff --git a/interfaces/burner.H b/interfaces/burner.H
@@ -17,7 +17,7 @@
 #include <nse_update_strang.H>
 #endif
 #ifdef SDC
-#include <nse_update_simplified_sdc.H>
+#include <nse_update_sdc.H>
 #endif
 #endif
 

diff --git a/unit_test/test_sdc_vode_rhs/vode_rhs_test.H b/unit_test/test_sdc_vode_rhs/vode_rhs_test.H
@@ -10,7 +10,7 @@
 #include <burner.H>
 #include <fstream>
 #include <iostream>
-#include <integrator_rhs_simplified_sdc.H>
+#include <integrator_rhs_sdc.H>
 #include <react_util.H>
 
 using namespace unit_test_rp;