add 2d model incorporating centrifugal force for xrb_spherical

.github/workflows/good_defines.txt

@@ -14,6 +14,7 @@ BL_LANG_FORT
 BL_LAZY
 BL_USE_SETBUF
 MODEL_PARSER
+DIM_MODEL
 DIFFUSION
 DO_PROBLEM_POST_INIT
 DO_PROBLEM_POST_RESTART

Exec/Make.Castro

@@ -175,14 +175,36 @@ ifeq ($(USE_ALL_CASTRO), TRUE)
            Source/problems Source/sources
 endif
 
-MAX_NPTS_MODEL ?= 10000
 NUM_MODELS ?= 1
+DIM_MODEL  ?= 1
+
+# Only 1 or 2 dimensions are supported for now.
+ifeq ($(filter $(DIM_MODEL),1 2),)
+  $(error Invalid DIM_MODEL=$(DIM_MODEL). Must be 1 or 2.)
+endif
+
+ifeq ($(DIM_MODEL), 1)
+  MAX_NPTS_MODEL ?= 10000
+else ifeq ($(DIM_MODEL), 2)
+  MAX_NPTS_X_MODEL ?= 10000
+  MAX_NPTS_Y_MODEL ?= 10000
+endif
 
 ifeq ($(USE_MODEL_PARSER), TRUE)
   Bdirs += Util/model_parser
-  DEFINES += -DMODEL_PARSER -DNPTS_MODEL=$(MAX_NPTS_MODEL) -DNUM_MODELS=$(NUM_MODELS)
+  DEFINES += -DMODEL_PARSER \
+             -DNUM_MODELS=$(NUM_MODELS) \
+             -DDIM_MODEL=$(DIM_MODEL)
+
+  ifeq ($(DIM_MODEL), 1)
+    DEFINES += -DNPTS_MODEL=$(MAX_NPTS_MODEL)
+  else ifeq ($(DIM_MODEL), 2)
+    DEFINES += -DNPTS_X_MODEL=$(MAX_NPTS_X_MODEL) \
+               -DNPTS_Y_MODEL=$(MAX_NPTS_Y_MODEL)
+  endif
 endif
 
+
 ifeq ($(USE_RNG_STATE_INIT), TRUE)
   DEFINES += -DRNG_STATE_INIT
 endif
@@ -195,7 +217,7 @@ ifeq ($(USE_MHD), TRUE)
 endif
 
 ifeq ($(USE_GRAV), TRUE)
-  Bdirs += Source/gravity Source/scf 
+  Bdirs += Source/gravity Source/scf
   DEFINES += -DGRAVITY
   USE_MLMG = TRUE
 endif

Exec/science/xrb_spherical/GNUmakefile

@@ -20,13 +20,16 @@ CASTRO_HOME  ?= ../../..
 
 USE_JACOBIAN_CACHING = TRUE
 USE_MODEL_PARSER = TRUE
-NUM_MODELS := 2
+NUM_MODELS := 1
+DIM_MODEL := 2
+MAX_NPTS_X_MODEL = 3100
+MAX_NPTS_Y_MODEL = 1000
 
 # This sets the EOS directory in $(MICROPHYSICS_HOME)/EOS
 EOS_DIR     := helmholtz
 
 # This sets the network directory in $(MICROPHYSICS_HOME)/networks
-NETWORK_DIR := he-burn/he-burn-18a
+NETWORK_DIR := he-burn/ase
 
 INTEGRATOR_DIR := RKC