From c938ff266d26efdd842afa58b41d6ff9379070be Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Sat, 10 Feb 2024 10:43:28 -0500 Subject: [PATCH 1/2] rename *_simplified_sdc.H -> *_sdc.H since we've merged the code paths for true SDC and simplified SDC, this is a more accurate name --- integration/BackwardEuler/Make.package | 2 +- ..._integrator_simplified_sdc.H => actual_integrator_sdc.H} | 0 integration/BackwardEuler/be_integrator.H | 2 +- integration/BackwardEuler/be_type.H | 2 +- integration/Make.package | 6 +++--- integration/RKC/Make.package | 2 +- ..._integrator_simplified_sdc.H => actual_integrator_sdc.H} | 0 integration/RKC/rkc.H | 4 ++-- integration/RKC/rkc_type.H | 2 +- integration/VODE/Make.package | 2 +- ..._integrator_simplified_sdc.H => actual_integrator_sdc.H} | 0 integration/VODE/vode_dvhin.H | 2 +- integration/VODE/vode_dvjac.H | 2 +- integration/VODE/vode_dvode.H | 2 +- integration/VODE/vode_type.H | 2 +- integration/integrator.H | 2 +- ...integrator_rhs_simplified_sdc.H => integrator_rhs_sdc.H} | 0 ...tegrator_type_simplified_sdc.H => integrator_type_sdc.H} | 0 .../{nse_update_simplified_sdc.H => nse_update_sdc.H} | 0 integration/utils/circle_theorem.H | 4 ++-- 20 files changed, 18 insertions(+), 18 deletions(-) rename integration/BackwardEuler/{actual_integrator_simplified_sdc.H => actual_integrator_sdc.H} (100%) rename integration/RKC/{actual_integrator_simplified_sdc.H => actual_integrator_sdc.H} (100%) rename integration/VODE/{actual_integrator_simplified_sdc.H => actual_integrator_sdc.H} (100%) rename integration/{integrator_rhs_simplified_sdc.H => integrator_rhs_sdc.H} (100%) rename integration/{integrator_type_simplified_sdc.H => integrator_type_sdc.H} (100%) rename integration/{nse_update_simplified_sdc.H => nse_update_sdc.H} (100%) diff --git a/integration/BackwardEuler/Make.package b/integration/BackwardEuler/Make.package index 8e3bcc7145..ed1c886095 100644 --- 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/integration/BackwardEuler/actual_integrator_simplified_sdc.H b/integration/BackwardEuler/actual_integrator_sdc.H similarity index 100% rename from integration/BackwardEuler/actual_integrator_simplified_sdc.H rename to integration/BackwardEuler/actual_integrator_sdc.H diff --git a/integration/BackwardEuler/be_integrator.H b/integration/BackwardEuler/be_integrator.H index 9ef6532110..959437479a 100644 --- a/integration/BackwardEuler/be_integrator.H +++ b/integration/BackwardEuler/be_integrator.H @@ -14,7 +14,7 @@ #include #endif #ifdef SDC -#include +#include #endif #include #include diff --git a/integration/BackwardEuler/be_type.H b/integration/BackwardEuler/be_type.H index 6e44f1a84e..0efae612a7 100644 --- a/integration/BackwardEuler/be_type.H +++ b/integration/BackwardEuler/be_type.H @@ -11,7 +11,7 @@ #include #endif #ifdef SDC -#include +#include #endif #include diff --git a/integration/Make.package b/integration/Make.package index 23aaaed186..35c752a5a2 100644 --- a/integration/Make.package +++ b/integration/Make.package @@ -17,8 +17,8 @@ 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 @@ -26,7 +26,7 @@ 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 index 1ec07f04b3..811a9b76e8 100644 --- 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/integration/RKC/actual_integrator_simplified_sdc.H b/integration/RKC/actual_integrator_sdc.H similarity index 100% rename from integration/RKC/actual_integrator_simplified_sdc.H rename to integration/RKC/actual_integrator_sdc.H diff --git a/integration/RKC/rkc.H b/integration/RKC/rkc.H index ae8f05e972..0e7fb1d26e 100644 --- a/integration/RKC/rkc.H +++ b/integration/RKC/rkc.H @@ -9,8 +9,8 @@ #include #endif #ifdef SDC -#include -#include +#include +#include #endif #include #include diff --git a/integration/RKC/rkc_type.H b/integration/RKC/rkc_type.H index f93bc17f13..3ed5c39f7b 100644 --- a/integration/RKC/rkc_type.H +++ b/integration/RKC/rkc_type.H @@ -95,7 +95,7 @@ struct rkc_t { }; #ifdef SDC -#include +#include #endif #ifdef STRANG #include diff --git a/integration/VODE/Make.package b/integration/VODE/Make.package index 861f60ff97..3605ba4a49 100644 --- 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/integration/VODE/actual_integrator_simplified_sdc.H b/integration/VODE/actual_integrator_sdc.H similarity index 100% rename from integration/VODE/actual_integrator_simplified_sdc.H rename to integration/VODE/actual_integrator_sdc.H diff --git a/integration/VODE/vode_dvhin.H b/integration/VODE/vode_dvhin.H index 8fbd460aa3..be67bdf0d5 100644 --- a/integration/VODE/vode_dvhin.H +++ b/integration/VODE/vode_dvhin.H @@ -5,7 +5,7 @@ #include #endif #ifdef SDC -#include +#include #endif template diff --git a/integration/VODE/vode_dvjac.H b/integration/VODE/vode_dvjac.H index 482bce1b8c..96ffe6cfac 100644 --- a/integration/VODE/vode_dvjac.H +++ b/integration/VODE/vode_dvjac.H @@ -9,7 +9,7 @@ #include #endif #ifdef SDC -#include +#include #endif template diff --git a/integration/VODE/vode_dvode.H b/integration/VODE/vode_dvode.H index 505f08af48..987f94fca0 100644 --- a/integration/VODE/vode_dvode.H +++ b/integration/VODE/vode_dvode.H @@ -8,7 +8,7 @@ #include #endif #ifdef SDC -#include +#include #endif #ifdef NSE_TABLE #include diff --git a/integration/VODE/vode_type.H b/integration/VODE/vode_type.H index cc8aabcb24..cab1171cfc 100644 --- a/integration/VODE/vode_type.H +++ b/integration/VODE/vode_type.H @@ -241,7 +241,7 @@ void print_state(dvode_t& dvode_state) #endif #ifdef SDC -#include +#include #endif #ifdef STRANG #include diff --git a/integration/integrator.H b/integration/integrator.H index 4c50c71d30..2c69366ad5 100644 --- a/integration/integrator.H +++ b/integration/integrator.H @@ -2,7 +2,7 @@ #define INTEGRATOR_H #ifdef SDC -#include +#include #else #include #endif diff --git a/integration/integrator_rhs_simplified_sdc.H b/integration/integrator_rhs_sdc.H similarity index 100% rename from integration/integrator_rhs_simplified_sdc.H rename to integration/integrator_rhs_sdc.H diff --git a/integration/integrator_type_simplified_sdc.H b/integration/integrator_type_sdc.H similarity index 100% rename from integration/integrator_type_simplified_sdc.H rename to integration/integrator_type_sdc.H diff --git a/integration/nse_update_simplified_sdc.H b/integration/nse_update_sdc.H similarity index 100% rename from integration/nse_update_simplified_sdc.H rename to integration/nse_update_sdc.H diff --git a/integration/utils/circle_theorem.H b/integration/utils/circle_theorem.H index c70d9a0dae..aab6f23980 100644 --- a/integration/utils/circle_theorem.H +++ b/integration/utils/circle_theorem.H @@ -7,8 +7,8 @@ #include #endif #ifdef SDC -#include -#include +#include +#include #endif #include From 8369dc86c9d0e76825c8e40a9c92d1e0e86bee8b Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Sat, 10 Feb 2024 10:53:42 -0500 Subject: [PATCH 2/2] more fixes --- integration/integrator_rhs_sdc.H | 6 +++--- integration/integrator_type_sdc.H | 4 ++-- interfaces/burner.H | 2 +- unit_test/test_sdc_vode_rhs/vode_rhs_test.H | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/integration/integrator_rhs_sdc.H b/integration/integrator_rhs_sdc.H index ae6a4a3200..b6272fa5ea 100644 --- a/integration/integrator_rhs_sdc.H +++ b/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 #include #include -#include +#include #include #ifdef NEW_NETWORK_IMPLEMENTATION #include diff --git a/integration/integrator_type_sdc.H b/integration/integrator_type_sdc.H index a2a9377700..4d65e03c7e 100644 --- a/integration/integrator_type_sdc.H +++ b/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 #include diff --git a/interfaces/burner.H b/interfaces/burner.H index 94a725fb8d..e4381a114c 100644 --- a/interfaces/burner.H +++ b/interfaces/burner.H @@ -17,7 +17,7 @@ #include #endif #ifdef SDC -#include +#include #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 index 1915ba42a0..98c32224f7 100644 --- 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 #include #include -#include +#include #include using namespace unit_test_rp;