diff --git a/.codespell-ignore-words b/.codespell-ignore-words index 5a235e1f40..642de727d6 100644 --- a/.codespell-ignore-words +++ b/.codespell-ignore-words @@ -12,3 +12,4 @@ nd ue bion aas +checkin \ No newline at end of file diff --git a/.github/workflows/check_params.py b/.github/workflows/check_params.py index c2807710d7..d17bcd047d 100644 --- a/.github/workflows/check_params.py +++ b/.github/workflows/check_params.py @@ -48,7 +48,7 @@ def doit(castro_dir): # remove comments idx = line.find("#") if idx > 0: - line = line[idx:] + line = line[:idx] found_param = pattern.match(line) if not found_param: diff --git a/.github/workflows/dependencies_hip.sh b/.github/workflows/dependencies_hip.sh index 36df2f384b..ab5185ce0a 100755 --- a/.github/workflows/dependencies_hip.sh +++ b/.github/workflows/dependencies_hip.sh @@ -17,10 +17,23 @@ set -eu -o pipefail # failed files the given number of times. echo 'Acquire::Retries "3";' | sudo tee /etc/apt/apt.conf.d/80-retries -# Ref.: https://rocmdocs.amd.com/en/latest/Installation_Guide/Installation-Guide.html#ubuntu +# Ref.: https://rocm.docs.amd.com/projects/install-on-linux/en/latest/how-to/native-install/ubuntu.html + +# Make the directory if it doesn't exist yet. +# This location is recommended by the distribution maintainers. +sudo mkdir --parents --mode=0755 /etc/apt/keyrings + +# Download the key, convert the signing-key to a full +# keyring required by apt and store in the keyring directory +wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | \ + gpg --dearmor | sudo tee /etc/apt/keyrings/rocm.gpg > /dev/null + curl -O https://repo.radeon.com/rocm/rocm.gpg.key sudo apt-key add rocm.gpg.key -echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${1-debian}/ ubuntu main" \ + +source /etc/os-release # set UBUNTU_CODENAME: focal or jammy or ... + +echo "deb [arch=amd64] https://repo.radeon.com/rocm/apt/${1-latest} ${UBUNTU_CODENAME} main" \ | sudo tee /etc/apt/sources.list.d/rocm.list echo 'export PATH=/opt/rocm/llvm/bin:/opt/rocm/bin:/opt/rocm/profiler/bin:/opt/rocm/opencl/bin:$PATH' \ | sudo tee -a /etc/profile.d/rocm.sh @@ -43,8 +56,10 @@ sudo apt-get install -y --no-install-recommends \ roctracer-dev \ rocprofiler-dev \ rocrand-dev \ - rocprim-dev \ - hiprand-dev + rocprim-dev + +# hiprand-dev is a new package that does not exist in old versions +sudo apt-get install -y --no-install-recommends hiprand-dev || true # activate # diff --git a/Docs/source/Hydrodynamics.rst b/Docs/source/Hydrodynamics.rst index 9c22cf8fa9..3c76706eda 100644 --- a/Docs/source/Hydrodynamics.rst +++ b/Docs/source/Hydrodynamics.rst @@ -609,7 +609,7 @@ behavior: Compute Primitive Variables --------------------------- -We compute the primtive variables from the conserved variables. +We compute the primitive variables from the conserved variables. - :math:`\rho, \rho e`: directly copy these from the conserved state vector diff --git a/Docs/source/Verification.rst b/Docs/source/Verification.rst index 631cba3ef6..d121821551 100644 --- a/Docs/source/Verification.rst +++ b/Docs/source/Verification.rst @@ -495,7 +495,7 @@ test problem. A hot sphere is centered at the origin in a spherical geometry. The spectrum from this sphere follows a Planck distribution. The ambient medium is at a much lower temperature. A frequency-dependent opacity makes the domain optically thin for high -frequecies and optically thick for low frequency. At long times, the +frequencies and optically thick for low frequency. At long times, the solution will be a combination of the blackbody radiation from the ambient medium plus the radiation that propagated from the hot sphere. An analytic solution exists :cite:`graziani:2008` which gives the diff --git a/Docs/source/conf.py b/Docs/source/conf.py index a81c165400..ca3eb4409c 100644 --- a/Docs/source/conf.py +++ b/Docs/source/conf.py @@ -218,6 +218,12 @@ def get_version(): ] +# -- Options for linkcheck + +linkcheck_retries = 3 +linkcheck_timeout = 100 + + # -- Options for Texinfo output ------------------------------------------- # Grouping the document tree into Texinfo files. List of tuples diff --git a/Docs/source/refs.bib b/Docs/source/refs.bib index 5c1d27b24a..737461e2eb 100644 --- a/Docs/source/refs.bib +++ b/Docs/source/refs.bib @@ -775,7 +775,6 @@ @article{SHESTAKOV2005 year = "2005", issn = "0022-4073", doi = "https://doi.org/10.1016/j.jqsrt.2004.05.052", -url = "http://www.sciencedirect.com/science/article/pii/S0022407304002092", author = "A.I. Shestakov and J.H. Bolstad", keywords = "Linearized, Multigroup diffusion, Radiation, Transfer, Transport", abstract = "An exact solution, based on Fourier and Laplace (FL) transforms, is developed for a linearization of the system modeling the multifrequency radiation diffusion and matter energy balance equations. The model uses an ideal gas equation of state. Opacities are proportional to the inverse of the cube of the frequency, thereby simulating free–free transitions. The solution is obtained in terms of integrals over the FL coefficients of the initial conditions and explicit sources. Results are presented for two special cases. (1) No sources, initially cold radiation field, and a localized matter energy profile. (2) Initially cold matter and radiation fields and a source of matter energy extending over finite space and time intervals." @@ -830,7 +829,6 @@ @article{suolson:1996 year = "1996", issn = "0022-4073", doi = "https://doi.org/10.1016/0022-4073(96)84524-9", -url = "http://www.sciencedirect.com/science/article/pii/0022407396845249", author = "Su Bingjing and Gordon L. Olson", abstract = "As an extension of previous work in the literature, this paper considers a particular one-dimensional, halfspace, non-equilibrium Marshak wave problem. The radiative transfer model employed is a one-group diffusion approximation with Marshak boundary condition, where the radiation and material fields are out of equilibrium. An analytic solution for the distribution of radiative energy and material temperature as a function of space and time to this problem is given and tables of numerical results are generated. These benchmark results, together with the previously published results, are useful as a reference for validating time-dependent radiation diffusion computer codes. A comparison with a finite difference solution is presented which shows excellent agreement when a fine spatial mesh and small time steps are used." } @@ -844,7 +842,6 @@ @article{suolson:1999 year = "1999", issn = "0022-4073", doi = "https://doi.org/10.1016/S0022-4073(98)00105-8", -url = "http://www.sciencedirect.com/science/article/pii/S0022407398001058", author = "Bingjing Su and Gordon L. Olson", abstract = "Benchmark solutions to time-dependent radiative transfer problems involving non-equilibrium coupling to the material temperature field are crucial for validating time-dependent radiation transport codes. Previous efforts on generating analytical solutions to non-equilibrium radiative transfer problems were all restricted to the one-group grey model. In this paper, a non-grey model, namely the picket-fence model, is considered for a two temperature non-equilibrium radiative transfer problem in an infinite medium. The analytical solutions, as functions of space and time, are constructed in the form of infinite integrals for both the diffusion description and transport description. These expressions are evaluated numerically and the benchmark results are generated. The asymptotic solutions for large and small times are also derived in terms of elementary functions and are compared with the exact results. Comparisons are given between the transport and diffusion solutions and between the grey and non-grey solutions." } diff --git a/Exec/gravity_tests/StarGrav/_prob_params b/Exec/gravity_tests/StarGrav/_prob_params index 1b043e43ed..d1d479d8b9 100644 --- a/Exec/gravity_tests/StarGrav/_prob_params +++ b/Exec/gravity_tests/StarGrav/_prob_params @@ -1,4 +1,4 @@ -model_name character "" y +model_name string "" y m_0 real 1.e30_rt y diff --git a/Exec/gravity_tests/hse_convergence_general/_prob_params b/Exec/gravity_tests/hse_convergence_general/_prob_params index 3362918c38..3647e400c3 100644 --- a/Exec/gravity_tests/hse_convergence_general/_prob_params +++ b/Exec/gravity_tests/hse_convergence_general/_prob_params @@ -14,19 +14,19 @@ H_star real 500.e0_rt y atm_delta real 25.e0_rt y -fuel1_name character "helium-4" y +fuel1_name string "helium-4" y -fuel2_name character "" y +fuel2_name string "" y -fuel3_name character "" y +fuel3_name string "" y -fuel4_name character "" y +fuel4_name string "" y -ash1_name character "iron-56" y +ash1_name string "iron-56" y -ash2_name character "" y +ash2_name string "" y -ash3_name character "" y +ash3_name string "" y fuel1_frac real 1.0_rt y diff --git a/Exec/gravity_tests/hydrostatic_adjust/_prob_params b/Exec/gravity_tests/hydrostatic_adjust/_prob_params index 7f50882129..dfcd01c1e1 100644 --- a/Exec/gravity_tests/hydrostatic_adjust/_prob_params +++ b/Exec/gravity_tests/hydrostatic_adjust/_prob_params @@ -1,6 +1,6 @@ prob_type integer 1 y -model_name character "" y +model_name string "" y hse_rho_top real 0.0_rt diff --git a/Exec/hydro_tests/test_convect/_prob_params b/Exec/hydro_tests/test_convect/_prob_params index 546f630a6f..8e96c2aa6c 100644 --- a/Exec/hydro_tests/test_convect/_prob_params +++ b/Exec/hydro_tests/test_convect/_prob_params @@ -1,4 +1,4 @@ -model_name character "" y +model_name string "" y apply_vel_field integer 0 y diff --git a/Exec/hydro_tests/toy_convect/_prob_params b/Exec/hydro_tests/toy_convect/_prob_params index 5e1b6ab214..f2bf4217d7 100644 --- a/Exec/hydro_tests/toy_convect/_prob_params +++ b/Exec/hydro_tests/toy_convect/_prob_params @@ -2,7 +2,7 @@ H_min real 1.e-4_rt y cutoff_density real 50.0_rt y -model_name character "" y +model_name string "" y apply_vel_field integer 0 y diff --git a/Exec/radiation_tests/RadBreakout/_prob_params b/Exec/radiation_tests/RadBreakout/_prob_params index ae414a6fed..6cc9007b99 100644 --- a/Exec/radiation_tests/RadBreakout/_prob_params +++ b/Exec/radiation_tests/RadBreakout/_prob_params @@ -7,7 +7,7 @@ rbasefac real 0.99e0_rt y filter_rhomax real -1.e20_rt y filter_timemax real -1.e20_rt y -model_file character "model.input" y +model_file string "model.input" y iye int -1 n iinvmu int -1 n diff --git a/Exec/reacting_tests/reacting_bubble/_prob_params b/Exec/reacting_tests/reacting_bubble/_prob_params index eefafd7cbc..1790add593 100644 --- a/Exec/reacting_tests/reacting_bubble/_prob_params +++ b/Exec/reacting_tests/reacting_bubble/_prob_params @@ -1,5 +1,5 @@ -model_name character "" y +model_name string "" y pert_temp_factor real 1.0_rt y diff --git a/Exec/reacting_tests/reacting_convergence/_prob_params b/Exec/reacting_tests/reacting_convergence/_prob_params index 75ea4508b4..90b2a6d686 100644 --- a/Exec/reacting_tests/reacting_convergence/_prob_params +++ b/Exec/reacting_tests/reacting_convergence/_prob_params @@ -13,17 +13,17 @@ p0 real 1.0_rt n xn_zone real 0.0_rt n nspec -spec1_name character "helium-4" y +spec1_name string "helium-4" y -spec2_name character "" y +spec2_name string "" y -spec3_name character "" y +spec3_name string "" y -spec4_name character "" y +spec4_name string "" y -spec5_name character "" y +spec5_name string "" y -spec6_name character "" y +spec6_name string "" y spec1_frac real 1.0_rt y diff --git a/Exec/science/Detonation/README.md b/Exec/science/Detonation/README.md index 77235b01bd..3e0ed244b8 100644 --- a/Exec/science/Detonation/README.md +++ b/Exec/science/Detonation/README.md @@ -1,7 +1,7 @@ -# detonation +# `Detonation` -A simple carbon detonation. The reaction network should be set -through the GNUmakefile. +A simple (carbon or helium) detonation. The reaction network should +be set through the GNUmakefile. This sets up a domain with a uniform density (dens). A large temperature (T_l) is placed in the left side of the domain, and an @@ -24,9 +24,25 @@ shockwave (as seen in the pressure field). Note: if the domain is too small, then the burning will decouple from the shock wave, and you will not get a detonation. -Some important inputs files: +## Inputs files + +Some important inputs files * `inputs-det-x.nse` : this produces a nice detonation that gets hot enough for the ash to be in NSE. + * `inputs-det-x.subch_base`: this produces a He4 detonation using the -same initial condition in the shell burning stage of the subchandra problem. + same initial condition in the shell burning stage of the subchandra + problem. + + +## Publications + +This problem setup has been used in the following papers: + +* *A Framework for Exploring Nuclear Physics Sensitivity in Numerical Simulations* + + Zhi Chen, Eric T. Johnson, Max Katz, Alexander Smith Clark, Brendan + Boyd, & Michael Zingale, 2024, Journal of Physics: Conference Series, + 2742, 1, 012021 (DOI: 10.1088/1742-6596/2742/1/012021) + diff --git a/Exec/science/bwp-rad/_prob_params b/Exec/science/bwp-rad/_prob_params index 7558b3bf57..c6918865aa 100644 --- a/Exec/science/bwp-rad/_prob_params +++ b/Exec/science/bwp-rad/_prob_params @@ -1 +1 @@ -model_name character "" y +model_name string "" y diff --git a/Exec/science/convective_flame/_prob_params b/Exec/science/convective_flame/_prob_params index 6d61d68dbe..a42ec2730c 100644 --- a/Exec/science/convective_flame/_prob_params +++ b/Exec/science/convective_flame/_prob_params @@ -10,7 +10,7 @@ cutoff_density real 1.e-8_rt y refine_cutoff_frac real 0.5_rt y -refine_cutoff_height real 0.0_rt +refine_cutoff_height real 0.0_rt T_hi real 5.e8_rt y @@ -24,17 +24,17 @@ H_star real 500e0_rt y atm_delta real 25.0e0_rt y -fuel1_name character "fuel" y +fuel1_name string "fuel" y -fuel2_name character "" y +fuel2_name string "" y -fuel3_name character "" y +fuel3_name string "" y -ash1_name character "inert" y +ash1_name string "inert" y -ash2_name character "" y +ash2_name string "" y -ash3_name character "" y +ash3_name string "" y fuel1_frac real 1.0_rt y @@ -51,4 +51,3 @@ ash3_frac real 0.0_rt y low_density_cutoff real 1.e-4_rt y smallx real 1.e-10_rt y - diff --git a/Exec/science/flame/_prob_params b/Exec/science/flame/_prob_params index 6f25859a0a..060d07dc5f 100644 --- a/Exec/science/flame/_prob_params +++ b/Exec/science/flame/_prob_params @@ -20,13 +20,13 @@ e_ash real 0.0_rt xn_ash real 0.0_rt n nspec -fuel1_name character "helium-4" y +fuel1_name string "helium-4" y -fuel2_name character "" y +fuel2_name string "" y -fuel3_name character "" y +fuel3_name string "" y -fuel4_name character "" y +fuel4_name string "" y X_fuel1 real 1.0_rt y @@ -36,13 +36,13 @@ X_fuel3 real 0.0_rt y X_fuel4 real 0.0_rt y -ash1_name character "oxygen-16" y +ash1_name string "oxygen-16" y -ash2_name character "" y +ash2_name string "" y -ash3_name character "" y +ash3_name string "" y -ash4_name character "" y +ash4_name string "" y X_ash1 real 1.0_rt y @@ -57,4 +57,3 @@ v_inflow real 0.0_rt y mass_flux real 0.0_rt smallx_init real 0.0_rt y - diff --git a/Exec/science/flame_tube/_prob_params b/Exec/science/flame_tube/_prob_params index dba7a81b8f..22f7a7cb7c 100644 --- a/Exec/science/flame_tube/_prob_params +++ b/Exec/science/flame_tube/_prob_params @@ -29,19 +29,19 @@ H_star real 500.e0_rt y atm_delta real 25.e0_rt y -fuel1_name character "helium-4" y +fuel1_name string "helium-4" y -fuel2_name character "" y +fuel2_name string "" y -fuel3_name character "" y +fuel3_name string "" y -fuel4_name character "" y +fuel4_name string "" y -ash1_name character "iron-56" y +ash1_name string "iron-56" y -ash2_name character "" y +ash2_name string "" y -ash3_name character "" y +ash3_name string "" y fuel1_frac real 1.0_rt y diff --git a/Exec/science/flame_wave/_prob_params b/Exec/science/flame_wave/_prob_params index dba7a81b8f..82014ed9b5 100644 --- a/Exec/science/flame_wave/_prob_params +++ b/Exec/science/flame_wave/_prob_params @@ -29,19 +29,19 @@ H_star real 500.e0_rt y atm_delta real 25.e0_rt y -fuel1_name character "helium-4" y +fuel1_name string "helium-4" y -fuel2_name character "" y +fuel2_name string "" y -fuel3_name character "" y +fuel3_name string "" y -fuel4_name character "" y +fuel4_name string "" y -ash1_name character "iron-56" y +ash1_name string "iron-56" y -ash2_name character "" y +ash2_name string "" y -ash3_name character "" y +ash3_name string "" y fuel1_frac real 1.0_rt y diff --git a/Exec/science/massive_star/_prob_params b/Exec/science/massive_star/_prob_params index 888bf80000..9263587e2d 100644 --- a/Exec/science/massive_star/_prob_params +++ b/Exec/science/massive_star/_prob_params @@ -1,4 +1,4 @@ -model_name character "" y +model_name string "" y interpolate_pres int 0 y diff --git a/Exec/science/nova/GNUmakefile b/Exec/science/nova/GNUmakefile index 8005099909..0f4d4109d3 100644 --- a/Exec/science/nova/GNUmakefile +++ b/Exec/science/nova/GNUmakefile @@ -13,9 +13,10 @@ USE_REACT = TRUE USE_DIFFUSION = TRUE USE_GRAV = TRUE -CASTRO_HOME ?= ../../.. +CASTRO_HOME := ../../.. USE_MODEL_PARSER = TRUE +MAX_NPTS_MODEL = 20000 # This sets the EOS directory in $(MICROPHYSICS_HOME)/eos EOS_DIR := helmholtz @@ -26,9 +27,7 @@ NETWORK_DIR := nova2 # Thi sets the conductivity EOS directory in $(MICROPHYSICS_HOME)/conductivity CONDUCTIVITY_DIR := stellar -PROBLEM_DIR ?= ./ - -Bpack := $(PROBLEM_DIR)/Make.package -Blocs := $(PROBLEM_DIR) +Bpack := ./Make.package +Blocs := . include $(CASTRO_HOME)/Exec/Make.Castro diff --git a/Exec/science/nova/_prob_params b/Exec/science/nova/_prob_params index 81973cc0f0..600f18f965 100644 --- a/Exec/science/nova/_prob_params +++ b/Exec/science/nova/_prob_params @@ -1,5 +1,5 @@ -model_name character "" y +model_name string "" y apply_vel_field integer 0 y diff --git a/Exec/science/nova/inputs_nova_t7 b/Exec/science/nova/inputs_nova_t7 index 37df192afe..74ef46c916 100644 --- a/Exec/science/nova/inputs_nova_t7 +++ b/Exec/science/nova/inputs_nova_t7 @@ -1,11 +1,12 @@ -max_step = 1200000 +# ------------------ INPUTS TO MAIN PROGRAM ------------------- +max_step = 2000000 # PROBLEM SIZE & GEOMETRY geometry.is_periodic = 1 0 geometry.coord_sys = 0 # 0 => cart, 1 => RZ 2=>spherical geometry.prob_lo = 0 0 geometry.prob_hi = 20.480e7 10.240e7 -amr.n_cell = 640 320 +amr.n_cell = 1280 640 # >>>>>>>>>>>>> BC FLAGS <<<<<<<<<<<<<<<< # 0 = Interior 3 = Symmetry @@ -68,22 +69,22 @@ amr.v = 1 # verbosity in Amr.cpp # REFINEMENT / REGRIDDING -amr.max_level = 3 # maximum level number allowed -amr.ref_ratio = 2 2 2 2 2 # refinement ratio -amr.regrid_int = 2 2 2 2 2 # how often to regrid +amr.max_level = 2 # maximum level number allowed +amr.ref_ratio = 4 2 # refinement ratio +amr.regrid_int = 2 2 # how often to regrid amr.max_grid_size = 256 amr.blocking_factor = 64 -amr.n_error_buf = 2 2 2 2 2 # number of buffer cells in error est +amr.n_error_buf = 2 2 # number of buffer cells in error est amr.refine_grid_layout = 0 # CHECKPOINT FILES amr.check_file = chk # root name of checkpoint file -amr.check_int = 200 # number of timesteps between checkpoints +amr.check_int = 150 # number of timesteps between checkpoints # PLOTFILES amr.plot_file = plt # root name of plotfile -amr.plot_int = 5000 # number of timesteps between plotfiles +amr.plot_int = 5000 # number of timesteps between plotfiles amr.derive_plot_vars = ALL # DATA LOG @@ -112,14 +113,14 @@ integrator.abort_on_failure = 0 amr.refinement_indicators = dens temp edot -amr.refine.dens.max_level = 5 +amr.refine.dens.max_level = 2 amr.refine.dens.value_greater = 1.0e2 amr.refine.dens.field_name = density -amr.refine.temp.max_level = 5 +amr.refine.temp.max_level = 2 amr.refine.temp.value_greater = 1.0e7 amr.refine.temp.field_name = Temp -amr.refine.edot.max_level = 5 +amr.refine.edot.max_level = 2 amr.refine.edot.value_greater = 1.0e11 amr.refine.edot.field_name = enuc diff --git a/Exec/science/planet/_prob_params b/Exec/science/planet/_prob_params index 4c9787b400..f93376492c 100644 --- a/Exec/science/planet/_prob_params +++ b/Exec/science/planet/_prob_params @@ -1,6 +1,6 @@ cutoff_density real 50.0_rt y -model_name character "" y +model_name string "" y apply_vel_field integer 0 y diff --git a/Exec/science/subchandra/_prob_params b/Exec/science/subchandra/_prob_params index e546592e9f..e8433d26ae 100644 --- a/Exec/science/subchandra/_prob_params +++ b/Exec/science/subchandra/_prob_params @@ -1,5 +1,5 @@ # the name of the initial model -model_name character "model.hse" y +model_name string "model.hse" y # the distance from the base of the He layer star to put the perturbation R_pert real 1.e7_rt y diff --git a/Exec/science/wdmerger/tests/inputs_pakmor b/Exec/science/wdmerger/tests/inputs_pakmor index 6432b3bf57..2ff2712602 100644 --- a/Exec/science/wdmerger/tests/inputs_pakmor +++ b/Exec/science/wdmerger/tests/inputs_pakmor @@ -1,5 +1,5 @@ ## Latest inputs file being used to reproduce initial conditions from Pakmor et al. 2022 -## with 50 km resolution +## with 25 km resolution ############################## CASTRO INPUTS ############################################### @@ -70,10 +70,10 @@ castro.cfl = 0.5 castro.fixed_dt = -1.0 # Scale back initial timestep by this factor -castro.init_shrink = 0.0001 +castro.init_shrink = 0.01 # Factor by which dt is allowed to change each timestep -castro.change_max = 1.05 +castro.change_max = 1.10 # If we regrid on Level 0, compute a new timestep afterward amr.compute_new_dt_on_regrid = 1 @@ -112,7 +112,7 @@ castro.max_subcycles = 16 amr.max_level = 2 # Refinement ratio -amr.ref_ratio = 4 2 +amr.ref_ratio = 4 4 # How many coarse timesteps between regridding amr.regrid_int = 2 @@ -149,7 +149,7 @@ amr.refine.density.max_level = 1 # Density2 refinement criterion amr.refine.density2.value_greater = 1.0e5 amr.refine.density2.field_name = density -amr.refine.density2.max_level = 15 +amr.refine.density2.max_level = 20 # Temperature refinement criterion amr.refine.temperature.value_greater = 5.0e8 @@ -404,9 +404,6 @@ castro.output_at_completion = 1 amr.plotfile_on_restart = 1 amr.checkpoint_on_restart = 1 -# Restart from last run -#amr.restart = - # Control verbosity in Amr.cpp amr.v = 1 diff --git a/Exec/science/xrb_layered/_prob_params b/Exec/science/xrb_layered/_prob_params index 116b508555..99a716b817 100644 --- a/Exec/science/xrb_layered/_prob_params +++ b/Exec/science/xrb_layered/_prob_params @@ -2,7 +2,7 @@ H_min real 1.e-4_rt y cutoff_density real 50.0_rt y -model_name character "" y +model_name string "" y apply_perturbation integer 1 y diff --git a/Exec/science/xrb_mixed/_prob_params b/Exec/science/xrb_mixed/_prob_params index 30b9d81ca9..0c3e96eec8 100644 --- a/Exec/science/xrb_mixed/_prob_params +++ b/Exec/science/xrb_mixed/_prob_params @@ -2,7 +2,7 @@ H_min real 1.e-4_rt y cutoff_density real 50.0_rt y -model_name character "" y +model_name string "" y apply_vel_field integer 0 y diff --git a/Exec/unit_tests/model_burner/_prob_params b/Exec/unit_tests/model_burner/_prob_params index 2f85da5c35..0c979e422c 100644 --- a/Exec/unit_tests/model_burner/_prob_params +++ b/Exec/unit_tests/model_burner/_prob_params @@ -1,4 +1,4 @@ -model_name character "" y +model_name string "" y burn_dt real 0.1_rt y diff --git a/Source/hydro/Castro_hydro.H b/Source/hydro/Castro_hydro.H index 776aee48cc..960d83acaf 100644 --- a/Source/hydro/Castro_hydro.H +++ b/Source/hydro/Castro_hydro.H @@ -89,7 +89,7 @@ amrex::Array4 const& srcQ); /// -/// the actual work routine that does the conversion of conserved to primtiive +/// the actual work routine that does the conversion of conserved to primitive /// variables. /// /// @param bx the box to operate over @@ -350,7 +350,7 @@ /// @param idir coordinate direction (0 = x, 1 = y, 2 = z) /// @param q_arr the primitive variable state /// @param flatn_arr flattening coefficient -/// @param dq slope of the primtiive variables +/// @param dq slope of the primitive variables /// @param qm left interface state, e.g., q_{i-1/2,j,k,L} /// @param qp right interface state, e.g., q_{i-1/2,j,k,R} /// @@ -603,7 +603,7 @@ amrex::Real cdtdx_t1, amrex::Real cdtdx_t2); /// -/// Reconstruct the primtive state as parabola, integrate under them, +/// Reconstruct the primitive state as parabola, integrate under them, /// and perform the characteristic tracing to get the interface states. /// This is for the CTU hydrodynamics scheme. /// @@ -634,7 +634,7 @@ const amrex::Real dt); /// -/// Reconstruct the primtive state as pieceeise linear, integrate under them, +/// Reconstruct the primitive state as pieceeise linear, integrate under them, /// and perform the characteristic tracing to get the interface states. /// This is for the CTU hydrodynamics scheme. /// @@ -665,7 +665,7 @@ const amrex::Real dt); /// -/// Reconstruct the primtive state as parabola, integrate under them, +/// Reconstruct the primitive state as parabola, integrate under them, /// and perform the characteristic tracing to get the interface states. /// This is for the CTU radiation hydrodynamics scheme. ///