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

Jump to bottom

Rename model_parser_cxx to strip unnecessary C++ identifier #2546

Merged
merged 1 commit into from
Sep 8, 2023
Merged

Rename model_parser_cxx to strip unnecessary C++ identifier #2546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .clang-tidy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$'
2 changes: 1 addition & 1 deletion .github/workflows/c-linter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/good_defines.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Docs/source/creating_a_problem.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions Exec/Make.Castro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Exec/gravity_tests/StarGrav/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Exec/gravity_tests/advecting_white_dwarf/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ DIM ?= 3

USE_GRAV ?= TRUE

USE_CXX_MODEL_PARSER = TRUE
USE_MODEL_PARSER = TRUE
NUM_MODELS = 1

COMP ?= gnu
Expand Down
2 changes: 1 addition & 1 deletion Exec/gravity_tests/hse_convergence/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Exec/gravity_tests/hse_convergence_general/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 := ../../..
Expand Down
2 changes: 1 addition & 1 deletion Exec/gravity_tests/hydrostatic_adjust/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ USE_MPI = TRUE

USE_GRAV = TRUE

USE_CXX_MODEL_PARSER = TRUE
USE_MODEL_PARSER = TRUE

CASTRO_HOME = ../../..

Expand Down
2 changes: 1 addition & 1 deletion Exec/hydro_tests/double_bubble/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 := ../../..
Expand Down
2 changes: 1 addition & 1 deletion Exec/hydro_tests/gamma_law_bubble/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Exec/hydro_tests/test_convect/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Exec/hydro_tests/toy_convect/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ USE_OMP = FALSE
USE_GRAV = TRUE
USE_REACT = FALSE

USE_CXX_MODEL_PARSER = TRUE
USE_MODEL_PARSER = TRUE

CASTRO_HOME = ../../..

Expand Down
2 changes: 1 addition & 1 deletion Exec/radiation_tests/RadBreakout/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ USE_GRAV = TRUE

USE_RAD = TRUE

USE_CXX_MODEL_PARSER = TRUE
USE_MODEL_PARSER = TRUE

CASTRO_HOME = ../../..

Expand Down
2 changes: 1 addition & 1 deletion Exec/reacting_tests/bubble_convergence/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Exec/reacting_tests/reacting_bubble/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ../../..
Expand Down
2 changes: 1 addition & 1 deletion Exec/science/bwp-rad/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ USE_RAD = TRUE
USE_GRAV = TRUE
USE_REACT = FALSE

USE_CXX_MODEL_PARSER = TRUE
USE_MODEL_PARSER = TRUE

CASTRO_HOME = ../../..

Expand Down
2 changes: 1 addition & 1 deletion Exec/science/celldet/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ USE_MHD = FALSE

#USE_PROB_PARAMS = TRUE

USE_CXX_MODEL_PARSER = TRUE
USE_MODEL_PARSER = TRUE

CASTRO_HOME = ../../..

Expand Down
2 changes: 1 addition & 1 deletion Exec/science/convective_flame/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ../../..
Expand Down
2 changes: 1 addition & 1 deletion Exec/science/flame_wave/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Exec/science/massive_star/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Exec/science/nova/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Exec/science/planet/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ../../..

Expand Down
2 changes: 1 addition & 1 deletion Exec/science/subchandra/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Exec/science/subchandra/GNUmakefile.nse_net
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Exec/science/wdmerger/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Exec/science/xrb_mixed/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ USE_OMP = FALSE
USE_GRAV = TRUE
USE_REACT = TRUE

USE_CXX_MODEL_PARSER = TRUE
USE_MODEL_PARSER = TRUE

CASTRO_HOME = ../../..

Expand Down
2 changes: 1 addition & 1 deletion Exec/unit_tests/model_burner/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Source/reactions/Castro_react.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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};

Expand Down Expand Up @@ -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};

Expand Down
0 Util/model_parser_cxx/Make.package → Util/model_parser/Make.package
View file
Open in desktop
File renamed without changes.
0 Util/model_parser_cxx/model_parser.H → Util/model_parser/model_parser.H
View file
Open in desktop
File renamed without changes.
0 Util/model_parser_cxx/model_parser_data.H → Util/model_parser/model_parser_data.H
View file
Open in desktop
File renamed without changes.
0 Util/model_parser_cxx/model_parser_data.cpp → Util/model_parser/model_parser_data.cpp
View file
Open in desktop
File renamed without changes.