From 20d0bd6fa41dc0379c685639e68f92a311e7c016 Mon Sep 17 00:00:00 2001
From: Max Katz <maxpkatz@gmail.com>
Date: Thu, 7 Sep 2023 23:14:01 -0400
Subject: [PATCH] Rename model_parser_cxx to strip unnecessary C++ identifier

---
 .clang-tidy                                               | 2 +-
 .github/workflows/c-linter.yml                            | 2 +-
 .github/workflows/good_defines.txt                        | 2 +-
 Docs/source/creating_a_problem.rst                        | 2 +-
 Exec/Make.Castro                                          | 6 +++---
 Exec/gravity_tests/StarGrav/GNUmakefile                   | 2 +-
 Exec/gravity_tests/advecting_white_dwarf/GNUmakefile      | 2 +-
 Exec/gravity_tests/hse_convergence/GNUmakefile            | 2 +-
 Exec/gravity_tests/hse_convergence_general/GNUmakefile    | 2 +-
 Exec/gravity_tests/hydrostatic_adjust/GNUmakefile         | 2 +-
 Exec/hydro_tests/double_bubble/GNUmakefile                | 2 +-
 Exec/hydro_tests/gamma_law_bubble/GNUmakefile             | 2 +-
 Exec/hydro_tests/test_convect/GNUmakefile                 | 2 +-
 Exec/hydro_tests/toy_convect/GNUmakefile                  | 2 +-
 Exec/radiation_tests/RadBreakout/GNUmakefile              | 2 +-
 Exec/reacting_tests/bubble_convergence/GNUmakefile        | 2 +-
 Exec/reacting_tests/reacting_bubble/GNUmakefile           | 2 +-
 Exec/science/bwp-rad/GNUmakefile                          | 2 +-
 Exec/science/celldet/GNUmakefile                          | 2 +-
 Exec/science/convective_flame/GNUmakefile                 | 2 +-
 Exec/science/flame_wave/GNUmakefile                       | 2 +-
 Exec/science/massive_star/GNUmakefile                     | 2 +-
 Exec/science/nova/GNUmakefile                             | 2 +-
 Exec/science/planet/GNUmakefile                           | 2 +-
 Exec/science/subchandra/GNUmakefile                       | 2 +-
 Exec/science/subchandra/GNUmakefile.nse_net               | 2 +-
 Exec/science/wdmerger/GNUmakefile                         | 2 +-
 Exec/science/xrb_mixed/GNUmakefile                        | 2 +-
 Exec/unit_tests/model_burner/GNUmakefile                  | 2 +-
 Source/reactions/Castro_react.cpp                         | 8 ++++----
 Util/{model_parser_cxx => model_parser}/Make.package      | 0
 Util/{model_parser_cxx => model_parser}/model_parser.H    | 0
 .../model_parser_data.H                                   | 0
 .../model_parser_data.cpp                                 | 0
 34 files changed, 35 insertions(+), 35 deletions(-)
 rename Util/{model_parser_cxx => model_parser}/Make.package (100%)
 rename Util/{model_parser_cxx => model_parser}/model_parser.H (100%)
 rename Util/{model_parser_cxx => model_parser}/model_parser_data.H (100%)
 rename Util/{model_parser_cxx => model_parser}/model_parser_data.cpp (100%)

diff --git a/.clang-tidy b/.clang-tidy
index 69ff7f95ab..36809183ac 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -38,4 +38,4 @@ Checks: >
      mpi-*,
      openmp-*
 
-HeaderFilterRegex: '(/Source/*/|/Util/model_parser_cxx|^\./|^tmp_build_dir/castro_sources/*/).*\.H$'
+HeaderFilterRegex: '(/Source/*/|/Util/model_parser|^\./|^tmp_build_dir/castro_sources/*/).*\.H$'
diff --git a/.github/workflows/c-linter.yml b/.github/workflows/c-linter.yml
index 602e92f48f..295ac4ede4 100644
--- a/.github/workflows/c-linter.yml
+++ b/.github/workflows/c-linter.yml
@@ -52,7 +52,7 @@ jobs:
           python3 external/cpp-linter-action/run_on_changed_files.py ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }} \
           -ignore-files="amrex|Microphysics" \
           -config-file="${GITHUB_WORKSPACE}/.clang-tidy" \
-          -header-filter='/Source/|/Util/model_parser_cxx|^\./' \
+          -header-filter='/Source/|/Util/model_parser|^\./' \
           -run-linter
 
       - name: Archive clang tidy report
diff --git a/.github/workflows/good_defines.txt b/.github/workflows/good_defines.txt
index 5c72004163..4bd680f9fd 100644
--- a/.github/workflows/good_defines.txt
+++ b/.github/workflows/good_defines.txt
@@ -12,7 +12,7 @@ BL_FORT_USE_UPPERCASE
 BL_LANG_FORT
 BL_LAZY
 BL_USE_SETBUF
-CXX_MODEL_PARSER
+MODEL_PARSER
 DIFFUSION
 DO_PROBLEM_POST_INIT
 DO_PROBLEM_POST_RESTART
diff --git a/Docs/source/creating_a_problem.rst b/Docs/source/creating_a_problem.rst
index 72332477df..4ab653511c 100644
--- a/Docs/source/creating_a_problem.rst
+++ b/Docs/source/creating_a_problem.rst
@@ -234,7 +234,7 @@ Many problem setups begin with a 1-d initial model that is mapped onto
 the grid.  The ``model_parser.H`` provides the functions that read in
 the initial model and map it on the Castro grid.  To enable this, add::
 
-  USE_CXX_MODEL_PARSER = TRUE
+  USE_MODEL_PARSER = TRUE
 
 to the problem ``GNUmakefile``.  There are 2 other parameters that can
 be set in the makefile to control the initial model storage:
diff --git a/Exec/Make.Castro b/Exec/Make.Castro
index 2db7d6aa36..8b105eff6d 100644
--- a/Exec/Make.Castro
+++ b/Exec/Make.Castro
@@ -161,9 +161,9 @@ endif
 MAX_NPTS_MODEL ?= 10000
 NUM_MODELS ?= 1
 
-ifeq ($(USE_CXX_MODEL_PARSER), TRUE)
-  Bdirs += Util/model_parser_cxx
-  DEFINES += -DCXX_MODEL_PARSER -DNPTS_MODEL=$(MAX_NPTS_MODEL) -DNUM_MODELS=$(NUM_MODELS)
+ifeq ($(USE_MODEL_PARSER), TRUE)
+  Bdirs += Util/model_parser
+  DEFINES += -DMODEL_PARSER -DNPTS_MODEL=$(MAX_NPTS_MODEL) -DNUM_MODELS=$(NUM_MODELS)
 endif
 
 # add / define any special physics we need
diff --git a/Exec/gravity_tests/StarGrav/GNUmakefile b/Exec/gravity_tests/StarGrav/GNUmakefile
index d57c94e246..1da2677910 100644
--- a/Exec/gravity_tests/StarGrav/GNUmakefile
+++ b/Exec/gravity_tests/StarGrav/GNUmakefile
@@ -14,7 +14,7 @@ USE_MPI    = TRUE
 USE_GRAV   = TRUE
 USE_REACT  = FALSE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 # This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
 EOS_DIR     := helmholtz
diff --git a/Exec/gravity_tests/advecting_white_dwarf/GNUmakefile b/Exec/gravity_tests/advecting_white_dwarf/GNUmakefile
index 9855a3ad7c..15bea2a7bc 100644
--- a/Exec/gravity_tests/advecting_white_dwarf/GNUmakefile
+++ b/Exec/gravity_tests/advecting_white_dwarf/GNUmakefile
@@ -12,7 +12,7 @@ DIM ?= 3
 
 USE_GRAV ?= TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 NUM_MODELS = 1
 
 COMP ?= gnu
diff --git a/Exec/gravity_tests/hse_convergence/GNUmakefile b/Exec/gravity_tests/hse_convergence/GNUmakefile
index 5664dc6a6a..d40da803b8 100644
--- a/Exec/gravity_tests/hse_convergence/GNUmakefile
+++ b/Exec/gravity_tests/hse_convergence/GNUmakefile
@@ -9,7 +9,7 @@ USE_MPI          = TRUE
 USE_GRAV         = TRUE
 USE_REACT        = FALSE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 USE_MAESTRO_INIT = FALSE
 
diff --git a/Exec/gravity_tests/hse_convergence_general/GNUmakefile b/Exec/gravity_tests/hse_convergence_general/GNUmakefile
index dd847a3b05..eb0da8b33d 100644
--- a/Exec/gravity_tests/hse_convergence_general/GNUmakefile
+++ b/Exec/gravity_tests/hse_convergence_general/GNUmakefile
@@ -15,7 +15,7 @@ USE_REACT  = FALSE
 USE_ROTATION  = FALSE
 USE_DIFFUSION = FALSE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 # define the location of the CASTRO top directory
 CASTRO_HOME  := ../../..
diff --git a/Exec/gravity_tests/hydrostatic_adjust/GNUmakefile b/Exec/gravity_tests/hydrostatic_adjust/GNUmakefile
index 5b0e31cba4..16a572c93a 100644
--- a/Exec/gravity_tests/hydrostatic_adjust/GNUmakefile
+++ b/Exec/gravity_tests/hydrostatic_adjust/GNUmakefile
@@ -11,7 +11,7 @@ USE_MPI    = TRUE
 
 USE_GRAV   = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 CASTRO_HOME = ../../..
 
diff --git a/Exec/hydro_tests/double_bubble/GNUmakefile b/Exec/hydro_tests/double_bubble/GNUmakefile
index 6d02a208c1..3b72168d0a 100644
--- a/Exec/hydro_tests/double_bubble/GNUmakefile
+++ b/Exec/hydro_tests/double_bubble/GNUmakefile
@@ -10,7 +10,7 @@ COMP	   = gnu
 USE_MPI    = TRUE
 USE_GRAV   = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 # define the location of the CASTRO top directory
 CASTRO_HOME  := ../../..
diff --git a/Exec/hydro_tests/gamma_law_bubble/GNUmakefile b/Exec/hydro_tests/gamma_law_bubble/GNUmakefile
index 1a7ea30d68..2c3f509d34 100644
--- a/Exec/hydro_tests/gamma_law_bubble/GNUmakefile
+++ b/Exec/hydro_tests/gamma_law_bubble/GNUmakefile
@@ -12,7 +12,7 @@ COMP	   = gnu
 USE_MPI    = TRUE
 USE_GRAV   = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 USE_MAESTRO_INIT = FALSE
 
diff --git a/Exec/hydro_tests/test_convect/GNUmakefile b/Exec/hydro_tests/test_convect/GNUmakefile
index 08fb971c0b..5b429411cb 100644
--- a/Exec/hydro_tests/test_convect/GNUmakefile
+++ b/Exec/hydro_tests/test_convect/GNUmakefile
@@ -13,7 +13,7 @@ USE_OMP          = FALSE
 USE_GRAV         = TRUE
 USE_REACT        = FALSE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 # This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
 EOS_DIR     := helmholtz
diff --git a/Exec/hydro_tests/toy_convect/GNUmakefile b/Exec/hydro_tests/toy_convect/GNUmakefile
index 2a17f65e9d..915f919313 100644
--- a/Exec/hydro_tests/toy_convect/GNUmakefile
+++ b/Exec/hydro_tests/toy_convect/GNUmakefile
@@ -11,7 +11,7 @@ USE_OMP          = FALSE
 USE_GRAV         = TRUE
 USE_REACT        = FALSE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 CASTRO_HOME = ../../..
 
diff --git a/Exec/radiation_tests/RadBreakout/GNUmakefile b/Exec/radiation_tests/RadBreakout/GNUmakefile
index 95fb7f1be8..b3efa40ef8 100644
--- a/Exec/radiation_tests/RadBreakout/GNUmakefile
+++ b/Exec/radiation_tests/RadBreakout/GNUmakefile
@@ -11,7 +11,7 @@ USE_GRAV   = TRUE
 
 USE_RAD = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 CASTRO_HOME = ../../..
 
diff --git a/Exec/reacting_tests/bubble_convergence/GNUmakefile b/Exec/reacting_tests/bubble_convergence/GNUmakefile
index b384806ee0..857acab958 100644
--- a/Exec/reacting_tests/bubble_convergence/GNUmakefile
+++ b/Exec/reacting_tests/bubble_convergence/GNUmakefile
@@ -9,7 +9,7 @@ USE_MPI          = TRUE
 USE_GRAV         = TRUE
 USE_REACT        = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 USE_MAESTRO_INIT = FALSE
 
diff --git a/Exec/reacting_tests/reacting_bubble/GNUmakefile b/Exec/reacting_tests/reacting_bubble/GNUmakefile
index 20d7c78c34..887e91cead 100644
--- a/Exec/reacting_tests/reacting_bubble/GNUmakefile
+++ b/Exec/reacting_tests/reacting_bubble/GNUmakefile
@@ -9,7 +9,7 @@ USE_MPI          = TRUE
 USE_GRAV         = TRUE
 USE_REACT        = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 USE_MAESTRO_INIT = FALSE
 
 CASTRO_HOME = ../../..
diff --git a/Exec/science/bwp-rad/GNUmakefile b/Exec/science/bwp-rad/GNUmakefile
index 74e7684924..ec43f0c0f2 100644
--- a/Exec/science/bwp-rad/GNUmakefile
+++ b/Exec/science/bwp-rad/GNUmakefile
@@ -17,7 +17,7 @@ USE_RAD = TRUE
 USE_GRAV         = TRUE
 USE_REACT        = FALSE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 CASTRO_HOME = ../../..
 
diff --git a/Exec/science/celldet/GNUmakefile b/Exec/science/celldet/GNUmakefile
index 49bcaf5f44..96210ab02a 100644
--- a/Exec/science/celldet/GNUmakefile
+++ b/Exec/science/celldet/GNUmakefile
@@ -18,7 +18,7 @@ USE_MHD = FALSE
 
 #USE_PROB_PARAMS = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 CASTRO_HOME = ../../..
 
diff --git a/Exec/science/convective_flame/GNUmakefile b/Exec/science/convective_flame/GNUmakefile
index d897ecefc0..d89ef1ee16 100644
--- a/Exec/science/convective_flame/GNUmakefile
+++ b/Exec/science/convective_flame/GNUmakefile
@@ -15,7 +15,7 @@ USE_REACT = TRUE
 USE_ROTATION = TRUE
 USE_DIFFUSION = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 NUM_MODELS := 2
 
 CASTRO_HOME = ../../..
diff --git a/Exec/science/flame_wave/GNUmakefile b/Exec/science/flame_wave/GNUmakefile
index 6b5b2633c6..abfba80c98 100644
--- a/Exec/science/flame_wave/GNUmakefile
+++ b/Exec/science/flame_wave/GNUmakefile
@@ -19,7 +19,7 @@ USE_DIFFUSION = TRUE
 CASTRO_HOME  := ../../..
 
 USE_JACOBIAN_CACHING = TRUE
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 NUM_MODELS := 2
 
 # This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
diff --git a/Exec/science/massive_star/GNUmakefile b/Exec/science/massive_star/GNUmakefile
index 638579dc93..25207f8628 100644
--- a/Exec/science/massive_star/GNUmakefile
+++ b/Exec/science/massive_star/GNUmakefile
@@ -17,7 +17,7 @@ USE_NSE_TABLE    = TRUE
 
 BL_NO_FORT := TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 # This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
 EOS_DIR     := helmholtz
diff --git a/Exec/science/nova/GNUmakefile b/Exec/science/nova/GNUmakefile
index 4600608769..54a237a4c1 100644
--- a/Exec/science/nova/GNUmakefile
+++ b/Exec/science/nova/GNUmakefile
@@ -15,7 +15,7 @@ USE_GRAV         = TRUE
 
 CASTRO_HOME := ../../..
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 # This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
 EOS_DIR     := helmholtz
diff --git a/Exec/science/planet/GNUmakefile b/Exec/science/planet/GNUmakefile
index 56b7c84aa7..e61590baed 100644
--- a/Exec/science/planet/GNUmakefile
+++ b/Exec/science/planet/GNUmakefile
@@ -21,7 +21,7 @@ USE_PARTICLE     = FALSE
 USE_SHOCK_VAR    = TRUE
 USE_ROTATION = FALSE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 CASTRO_HOME = ../../..
 
diff --git a/Exec/science/subchandra/GNUmakefile b/Exec/science/subchandra/GNUmakefile
index bc66f50e7a..6038c63e3a 100644
--- a/Exec/science/subchandra/GNUmakefile
+++ b/Exec/science/subchandra/GNUmakefile
@@ -14,7 +14,7 @@ USE_MPI    = TRUE
 USE_GRAV   = TRUE
 USE_REACT  = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 USE_SIMPLIFIED_SDC=TRUE
 
diff --git a/Exec/science/subchandra/GNUmakefile.nse_net b/Exec/science/subchandra/GNUmakefile.nse_net
index a80714864c..869a30c04c 100644
--- a/Exec/science/subchandra/GNUmakefile.nse_net
+++ b/Exec/science/subchandra/GNUmakefile.nse_net
@@ -16,7 +16,7 @@ USE_REACT  = TRUE
 
 USE_NSE_NET = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 # This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
 EOS_DIR     := helmholtz
diff --git a/Exec/science/wdmerger/GNUmakefile b/Exec/science/wdmerger/GNUmakefile
index 5a9aa8a9e6..8ce0736eac 100644
--- a/Exec/science/wdmerger/GNUmakefile
+++ b/Exec/science/wdmerger/GNUmakefile
@@ -14,7 +14,7 @@ USE_GRAV ?= TRUE
 USE_REACT ?= TRUE
 USE_ROTATION ?= TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 NUM_MODELS = 2
 
 # define the location of the CASTRO top directory
diff --git a/Exec/science/xrb_mixed/GNUmakefile b/Exec/science/xrb_mixed/GNUmakefile
index c3d000428f..2d69ec6f98 100644
--- a/Exec/science/xrb_mixed/GNUmakefile
+++ b/Exec/science/xrb_mixed/GNUmakefile
@@ -11,7 +11,7 @@ USE_OMP          = FALSE
 USE_GRAV         = TRUE
 USE_REACT        = TRUE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 CASTRO_HOME = ../../..
 
diff --git a/Exec/unit_tests/model_burner/GNUmakefile b/Exec/unit_tests/model_burner/GNUmakefile
index b05a7facbc..d899b36b0a 100644
--- a/Exec/unit_tests/model_burner/GNUmakefile
+++ b/Exec/unit_tests/model_burner/GNUmakefile
@@ -15,7 +15,7 @@ USE_RAD          = FALSE
 USE_PARTICLES    = FALSE
 USE_ROTATION     = FALSE
 
-USE_CXX_MODEL_PARSER = TRUE
+USE_MODEL_PARSER = TRUE
 
 USE_REACT        = TRUE
 
diff --git a/Source/reactions/Castro_react.cpp b/Source/reactions/Castro_react.cpp
index 1f62920b18..580516f722 100644
--- a/Source/reactions/Castro_react.cpp
+++ b/Source/reactions/Castro_react.cpp
@@ -2,7 +2,7 @@
 #include <Castro.H>
 #include <Castro_F.H>
 #include <advection_util.H>
-#ifdef CXX_MODEL_PARSER
+#ifdef MODEL_PARSER
 #include <model_parser.H>
 #endif
 
@@ -204,7 +204,7 @@ Castro::react_state(MultiFab& s, MultiFab& r, Real time, Real dt, const int stra
         auto mask = mask_covered_zones ? mask_mf.array(mfi) : Array4<Real>{};
 
         const auto dx = geom.CellSizeArray();
-#ifdef CXX_MODEL_PARSER
+#ifdef MODEL_PARSER
         const auto problo = geom.ProbLoArray();
 #endif
 
@@ -262,7 +262,7 @@ Castro::react_state(MultiFab& s, MultiFab& r, Real time, Real dt, const int stra
 
             burn_state.T_fixed = -1.e30_rt;
 
-#ifdef CXX_MODEL_PARSER
+#ifdef MODEL_PARSER
             if (drive_initial_convection) {
                 Real rr[3] = {0.0_rt};
 
@@ -604,7 +604,7 @@ Castro::react_state(Real time, Real dt)
 
             burn_state.T_fixed = -1.e30_rt;
 
-#ifdef CXX_MODEL_PARSER
+#ifdef MODEL_PARSER
             if (drive_initial_convection) {
                 Real rr[3] = {0.0_rt};
 
diff --git a/Util/model_parser_cxx/Make.package b/Util/model_parser/Make.package
similarity index 100%
rename from Util/model_parser_cxx/Make.package
rename to Util/model_parser/Make.package
diff --git a/Util/model_parser_cxx/model_parser.H b/Util/model_parser/model_parser.H
similarity index 100%
rename from Util/model_parser_cxx/model_parser.H
rename to Util/model_parser/model_parser.H
diff --git a/Util/model_parser_cxx/model_parser_data.H b/Util/model_parser/model_parser_data.H
similarity index 100%
rename from Util/model_parser_cxx/model_parser_data.H
rename to Util/model_parser/model_parser_data.H
diff --git a/Util/model_parser_cxx/model_parser_data.cpp b/Util/model_parser/model_parser_data.cpp
similarity index 100%
rename from Util/model_parser_cxx/model_parser_data.cpp
rename to Util/model_parser/model_parser_data.cpp