Merge branch 'development' into sdc_newton_robustness

AMReX-Astro · Oct 9, 2023 · c2ab502 · c2ab502
2 parents 2b41b89 + f7cc698
commit c2ab502
Show file tree

Hide file tree

Showing 88 changed files with 271 additions and 1,134 deletions.
diff --git a/Exec/gravity_tests/hydrostatic_adjust/Problem_Derive.cpp b/Exec/gravity_tests/hydrostatic_adjust/Problem_Derive.cpp
@@ -2,7 +2,6 @@
 
 #include <Derive.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <model_parser.H>
 
 using namespace amrex;

diff --git a/Exec/gravity_tests/uniform_cube/Prob.cpp b/Exec/gravity_tests/uniform_cube/Prob.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 
 #include <Gravity.H>
 

diff --git a/Exec/gravity_tests/uniform_sphere/Prob.cpp b/Exec/gravity_tests/uniform_sphere/Prob.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 
 #include <Gravity.H>
 

diff --git a/Exec/hydro_tests/gamma_law_bubble/Problem_Derive.cpp b/Exec/hydro_tests/gamma_law_bubble/Problem_Derive.cpp
@@ -2,7 +2,6 @@
 
 #include <Derive.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <prob_util.H>
 
 using namespace amrex;

diff --git a/Exec/hydro_tests/rotating_torus/Prob.cpp b/Exec/hydro_tests/rotating_torus/Prob.cpp
@@ -1,7 +1,6 @@
 /* Implementations of functions in Problem.H go here */
 
 #include <Castro.H>
-#include <Castro_F.H>
 
 using namespace amrex;
 

diff --git a/Exec/radiation_tests/RadSphere/Problem_Derive.cpp b/Exec/radiation_tests/RadSphere/Problem_Derive.cpp
@@ -2,7 +2,6 @@
 
 #include <Derive.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <prob_parameters.H>
 #include <extern_parameters.H>
 #include <gravity_params.H>

diff --git a/Exec/radiation_tests/RadThermalWave/Problem_Derive.cpp b/Exec/radiation_tests/RadThermalWave/Problem_Derive.cpp
@@ -1,9 +1,7 @@
 #include <AMReX_REAL.H>
 
 #include <Derive.H>
-#include <Problem_Derive_F.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <fundamental_constants.H>
 #include <prob_parameters.H>
 #include <cmath>

diff --git a/Exec/reacting_tests/reacting_bubble/Problem_Derive.cpp b/Exec/reacting_tests/reacting_bubble/Problem_Derive.cpp
@@ -1,9 +1,7 @@
 #include <AMReX_REAL.H>
 
 #include <Derive.H>
-#include <Problem_Derive_F.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <model_parser.H>
 
 using namespace amrex;

diff --git a/Exec/reacting_tests/toy_flame/Prob.cpp b/Exec/reacting_tests/toy_flame/Prob.cpp
@@ -1,7 +1,6 @@
 /* Implementations of functions in Problem.H go here */
 
 #include <Castro.H>
-#include <Castro_F.H>
 
 using namespace amrex;
 

diff --git a/Exec/science/flame/Prob.cpp b/Exec/science/flame/Prob.cpp
@@ -1,7 +1,6 @@
 /* Implementations of functions in Problem.H go here */
 
 #include <Castro.H>
-#include <Castro_F.H>
 
 using namespace amrex;
 

diff --git a/Exec/science/wdmerger/Prob.cpp b/Exec/science/wdmerger/Prob.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 #include <Castro_util.H>
 
 #include <Gravity.H>

diff --git a/Exec/science/wdmerger/Problem_Derive.cpp b/Exec/science/wdmerger/Problem_Derive.cpp
@@ -2,7 +2,6 @@
 
 #include <Derive.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <fundamental_constants.H>
 #include <prob_parameters.H>
 #include <wdmerger_util.H>

diff --git a/Exec/science/xrb_layered/Problem_Derive.cpp b/Exec/science/xrb_layered/Problem_Derive.cpp
@@ -1,9 +1,7 @@
 #include <AMReX_REAL.H>
 
 #include <Derive.H>
-#include <Problem_Derive_F.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <model_parser.H>
 
 using namespace amrex;

diff --git a/Exec/unit_tests/diffusion_test/Prob.cpp b/Exec/unit_tests/diffusion_test/Prob.cpp
@@ -1,7 +1,6 @@
 /* Implementations of functions in Problem.H go here */
 
 #include <Castro.H>
-#include <Castro_F.H>
 
 using namespace amrex;
 

diff --git a/Exec/unit_tests/diffusion_test/Problem_Derive.cpp b/Exec/unit_tests/diffusion_test/Problem_Derive.cpp
@@ -2,7 +2,6 @@
 
 #include <Derive.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <prob_parameters.H>
 #include <prob_util.H>
 

diff --git a/Exec/unit_tests/particles_test/Prob.cpp b/Exec/unit_tests/particles_test/Prob.cpp
@@ -1,7 +1,6 @@
 /* Implementations of functions in Problem.H go here */
 
 #include <Castro.H>
-#include <Castro_F.H>
 #include <AMReX_TracerParticles.H>
 #include <AMReX_AmrParticles.H>
 

diff --git a/Source/diffusion/Castro_diffusion.cpp b/Source/diffusion/Castro_diffusion.cpp
@@ -1,6 +1,5 @@
 
 #include <Castro.H>
-#include <Castro_F.H>
 
 #include <diffusion_util.H>
 

diff --git a/Source/diffusion/Diffusion.cpp b/Source/diffusion/Diffusion.cpp
@@ -1,7 +1,6 @@
 #include <AMReX_ParmParse.H>
 #include <Diffusion.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <AMReX_MLABecLaplacian.H>
 #include <AMReX_MLMG.H>
 #include <MGutils.H>

diff --git a/Source/driver/Castro.cpp b/Source/driver/Castro.cpp
@@ -15,7 +15,6 @@
 #include <AMReX_Utility.H>
 #include <AMReX_CONSTANTS.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <runtime_parameters.H>
 #include <AMReX_VisMF.H>
 #include <AMReX_TagBox.H>

diff --git a/Source/driver/Castro_F.H b/Source/driver/Castro_F.H
diff --git a/Source/driver/Castro_advance.cpp b/Source/driver/Castro_advance.cpp
@@ -1,6 +1,5 @@
 
 #include <Castro.H>
-#include <Castro_F.H>
 
 #ifdef RADIATION
 #include <Radiation.H>

diff --git a/Source/driver/Castro_advance_ctu.cpp b/Source/driver/Castro_advance_ctu.cpp
@@ -1,6 +1,5 @@
 
 #include <Castro.H>
-#include <Castro_F.H>
 
 #ifdef RADIATION
 #include <Radiation.H>

diff --git a/Source/driver/Castro_io.cpp b/Source/driver/Castro_io.cpp
@@ -10,7 +10,6 @@
 
 #include <AMReX_Utility.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <Castro_io.H>
 #include <AMReX_ParmParse.H>
 

diff --git a/Source/driver/Castro_setup.cpp b/Source/driver/Castro_setup.cpp
@@ -3,7 +3,6 @@
 #include <AMReX_LevelBld.H>
 #include <AMReX_ParmParse.H>
 #include <Castro.H>
-#include <Castro_F.H>
 #include <Castro_bc_fill_nd.H>
 #include <Castro_generic_fill.H>
 #include <Derive.H>
@@ -13,7 +12,6 @@
 #include <RadDerive.H>
 #include <opacity.H>
 #endif
-#include <Problem_Derive_F.H>
 
 #include <AMReX_buildInfo.H>
 #include <eos.H>

diff --git a/Source/driver/Derive.cpp b/Source/driver/Derive.cpp
@@ -2,7 +2,6 @@
 
 #include <Derive.H>
 #include <Castro.H>
-#include <Castro_F.H>
 
 #ifdef DIFFUSION
 #include <diffusion_util.H>

diff --git a/Source/driver/Make.package b/Source/driver/Make.package
@@ -22,8 +22,6 @@ CEXE_headers += runtime_parameters.H
 CEXE_sources += sum_utils.cpp
 CEXE_sources += sum_integrated_quantities.cpp
 
-FEXE_headers += Castro_F.H
-
 CEXE_headers += Derive.H
 CEXE_sources += Derive.cpp
 

diff --git a/Source/driver/sum_integrated_quantities.cpp b/Source/driver/sum_integrated_quantities.cpp
@@ -1,7 +1,6 @@
 #include <iomanip>
 
 #include <Castro.H>
-#include <Castro_F.H>
 
 #ifdef GRAVITY
 #include <Gravity.H>

diff --git a/Source/driver/sum_utils.cpp b/Source/driver/sum_utils.cpp
@@ -1,7 +1,6 @@
 #include <iomanip>
 
 #include <Castro.H>
-#include <Castro_F.H>
 #include <Castro_util.H>
 
 #ifdef GRAVITY

diff --git a/Source/driver/timestep.cpp b/Source/driver/timestep.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 
 #ifdef DIFFUSION
 #include <conductivity.H>

diff --git a/Source/gravity/Castro_gravity.cpp b/Source/gravity/Castro_gravity.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 
 #include <Gravity.H>
 

diff --git a/Source/gravity/Castro_pointmass.cpp b/Source/gravity/Castro_pointmass.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 
 using namespace amrex;
 

diff --git a/Source/gravity/Gravity.cpp b/Source/gravity/Gravity.cpp
@@ -8,7 +8,6 @@
 #include <AMReX_ParmParse.H>
 #include <Gravity.H>
 #include <Castro.H>
-#include <Castro_F.H>
 
 #include <AMReX_FillPatchUtil.H>
 #include <AMReX_MLMG.H>

diff --git a/Source/hydro/Castro_ctu.cpp b/Source/hydro/Castro_ctu.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 #include <Castro_util.H>
 
 #ifdef RADIATION

diff --git a/Source/hydro/Castro_ctu_hydro.cpp b/Source/hydro/Castro_ctu_hydro.cpp
@@ -1,6 +1,5 @@
 #include <Castro.H>
 #include <Castro_util.H>
-#include <Castro_F.H>
 
 #ifdef RADIATION
 #include <Radiation.H>

diff --git a/Source/hydro/Castro_ctu_rad.cpp b/Source/hydro/Castro_ctu_rad.cpp
@@ -1,5 +1,4 @@
 #include "Castro.H"
-#include "Castro_F.H"
 #include "Castro_util.H"
 
 #include "Radiation.H"

diff --git a/Source/hydro/Castro_hybrid.cpp b/Source/hydro/Castro_hybrid.cpp
@@ -1,6 +1,5 @@
 #include <Castro.H>
 #include <Castro_util.H>
-#include <Castro_F.H>
 
 #include <hybrid.H>
 

diff --git a/Source/hydro/Castro_hydro.cpp b/Source/hydro/Castro_hydro.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 
 #ifdef RADIATION
 #include <Radiation.H>

diff --git a/Source/hydro/Castro_mol.cpp b/Source/hydro/Castro_mol.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 
 #ifdef RADIATION
 #include <Radiation.H>

diff --git a/Source/hydro/Castro_mol_hydro.cpp b/Source/hydro/Castro_mol_hydro.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 #include <Castro_util.H>
 
 #ifdef DIFFUSION

diff --git a/Source/hydro/advection_util.cpp b/Source/hydro/advection_util.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 
 #ifdef ROTATION
 #include <Rotation.H>

diff --git a/Source/hydro/flatten.cpp b/Source/hydro/flatten.cpp
@@ -1,5 +1,4 @@
 #include <Castro.H>
-#include <Castro_F.H>
 
 #include <cmath>