Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Feb 12, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c938ff2
rename *_simplified_sdc.H -> *_sdc.H
zingale Feb 10, 2024
8369dc8
more fixes
zingale Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integration/BackwardEuler/Make.package
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...dEuler/actual_integrator_simplified_sdc.H → ...ion/BackwardEuler/actual_integrator_sdc.H
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion integration/BackwardEuler/be_integrator.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion integration/BackwardEuler/be_type.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions integration/Make.package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/RKC/Make.package
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...on/RKC/actual_integrator_simplified_sdc.H → integration/RKC/actual_integrator_sdc.H
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions integration/RKC/rkc.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion integration/RKC/rkc_type.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion integration/VODE/Make.package
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 ...n/VODE/actual_integrator_simplified_sdc.H → integration/VODE/actual_integrator_sdc.H
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion integration/VODE/vode_dvhin.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion integration/VODE/vode_dvjac.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion integration/VODE/vode_dvode.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion integration/VODE/vode_type.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion integration/integrator.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions integration/integrator_rhs_simplified_sdc.H → integration/integrator_rhs_sdc.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions integration/integrator_type_simplified_sdc.H → integration/integrator_type_sdc.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
0 integration/nse_update_simplified_sdc.H → integration/nse_update_sdc.H
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions integration/utils/circle_theorem.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion interfaces/burner.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion unit_test/test_sdc_vode_rhs/vode_rhs_test.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down