diff --git a/Exec/gravity_tests/hse_convergence/_prob_params b/Exec/gravity_tests/hse_convergence/_prob_params index 07cd760aaf..6c0517ed22 100644 --- a/Exec/gravity_tests/hse_convergence/_prob_params +++ b/Exec/gravity_tests/hse_convergence/_prob_params @@ -5,4 +5,4 @@ temp_base real 1.0_rt y pert_width real 1.0_rt y -do_pert logical .true. y +do_pert int 1 y diff --git a/Exec/science/wdmerger/_prob_params b/Exec/science/wdmerger/_prob_params index f4c0317d85..ccf06d4cdc 100644 --- a/Exec/science/wdmerger/_prob_params +++ b/Exec/science/wdmerger/_prob_params @@ -98,7 +98,7 @@ onemg_wd_mg_frac real 0.05e0_rt y # Parameters for interpolation from 1D model to 3D model # Default to interpolation that preserves temperature; otherwise, use pressure -interp_temp logical .true. y +interp_temp integer 1 y # Number of sub-grid-scale zones to use nsub integer 1 y diff --git a/Util/scripts/write_probdata.py b/Util/scripts/write_probdata.py index 68cb716aac..e16985b463 100755 --- a/Util/scripts/write_probdata.py +++ b/Util/scripts/write_probdata.py @@ -7,9 +7,8 @@ max_step integer 1 small_dt real 1.d-10 xlo_boundary_type character "" -octant logical .false. -This specifies the parameter name, datatype, and default +This specifies the runtime parameter name, datatype, and default value. The optional 4th column indicates whether the parameter appears @@ -153,7 +152,7 @@ def write_probin(prob_param_files, cxx_prefix): params = [] print(" ") - print(f"write_probdata.py: creating prob_param C++ files") + print("write_probdata.py: creating prob_param C++ files") # read the parameters defined in the parameter files @@ -231,15 +230,15 @@ def write_probin(prob_param_files, cxx_prefix): # we need access to _rt fout.write(" using namespace amrex;\n") - fout.write(f" amrex::ParmParse pp(\"problem\");\n\n") + fout.write(" amrex::ParmParse pp(\"problem\");\n\n") for p in params: if p.is_array(): size = p.size - if (size == "nspec"): + if size == "nspec": size = "NumSpec" fout.write(f" for (int n = 0; n < {size}; n++) {{\n") fout.write(f" problem::{p.name}[n] = {p.default_format(lang='C++')};\n") - fout.write(f" }}\n") + fout.write(" }}\n") else: fout.write(f" {p.get_default_string()}")