sync the MAESTROeX runtime parameter support up with Castro (#436)

this also resolves a clang-tidy issue with defining the parameters in .H instead of a .cpp file
AMReX-Astro · Apr 4, 2024 · b307ce6 · b307ce6
1 parent bd393b7
commit b307ce6
Show file tree

Hide file tree

Showing 5 changed files with 156 additions and 146 deletions.
diff --git a/Exec/Make.Maestro b/Exec/Make.Maestro
@@ -203,6 +203,8 @@ AUTO_BUILD_SOURCES += $(MAESTROEX_AUTO_SOURCE_DIR)/maestro_params.H
 
 CPP_PARAMETERS := $(TOP)/Source/param/_cpp_parameters
 
+$(MAESTROEX_AUTO_SOURCE_DIR)/runtime_params.cpp: $(MAESTROEX_AUTO_SOURCE_DIR)/maestro_params.H
+
 $(MAESTROEX_AUTO_SOURCE_DIR)/maestro_params.H: $(CPP_PARAMETERS)
 	@if [ ! -d $(MAESTROEX_AUTO_SOURCE_DIR) ]; then mkdir -p $(MAESTROEX_AUTO_SOURCE_DIR); fi
 	PYTHONPATH=$(MICROPHYSICS_HOME)/util/build_scripts $(TOP)/Source/param/parse_maestro_params.py -o $(MAESTROEX_AUTO_SOURCE_DIR) $(CPP_PARAMETERS)

diff --git a/Source/Make.package b/Source/Make.package
@@ -56,7 +56,7 @@ CEXE_sources += MaestroVelPred.cpp
 ifeq ($(USE_ROTATION), TRUE)
     CEXE_sources += MaestroRotation.cpp
 endif
-CEXE_sources += runparams_defaults.cpp
+CEXE_sources += runtime_params.cpp
 
 CEXE_headers += BaseState.H
 CEXE_headers += BaseStateGeometry.H