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

switch a lot of int runtime parameters to bool #2838

Merged
merged 3 commits into from
May 6, 2024
Merged

switch a lot of int runtime parameters to bool #2838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d1a1c1
switch a lot of int runtime parameters to bool
zingale May 1, 2024
fd812ee
fix some clang-tidy issues
zingale May 2, 2024
28bbb2d
update parameters
zingale May 2, 2024
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
12 changes: 6 additions & 6 deletions Exec/science/flame_wave/ci-benchmarks/job_info_params.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
[*] castro.small_temp = 1e+06
[*] castro.small_pres = 2.98096e+09
[*] castro.small_ener = 8.25345e+14
[*] castro.do_hydro = 1
castro.do_hydro = 1
castro.time_integration_method = 0
castro.limit_fourth_order = 1
castro.initialization_is_cell_average = 0
Expand Down Expand Up @@ -121,7 +121,7 @@
castro.dtnuc_e = 1e+200
castro.dtnuc_X = 1e+200
castro.dtnuc_X_threshold = 0.001
[*] castro.do_react = 1
castro.do_react = 1
[*] castro.react_T_min = 6e+07
castro.react_T_max = 1e+200
[*] castro.react_rho_min = 100
Expand All @@ -133,13 +133,13 @@
castro.drive_initial_convection = 0
castro.drive_initial_convection_tmax = 1e+200
castro.drive_initial_convection_reinit_period = 1e+200
[*] castro.do_grav = 1
castro.do_grav = 1
castro.moving_center = 0
[*] castro.grav_source_type = 2
[*] castro.do_rotation = 1
castro.do_rotation = 1
castro.bndry_func_thread_safe = 1
castro.grown_factor = 1
castro.star_at_center = -1
castro.star_at_center = 1
castro.do_scf_initial_model = 0
castro.scf_maximum_density = -1e+06
castro.scf_equatorial_radius = -1e+09
Expand All @@ -161,7 +161,7 @@
castro.store_omegadot = 0
castro.store_burn_weights = 0
castro.abort_on_invalid_params = 0
castro.do_radiation = -1
castro.do_radiation = 1
[*] gravity.gravity_type = ConstantGrav
[*] gravity.const_grav = -1.5e+14
gravity.direct_sum_bcs = 0
Expand Down
8 changes: 4 additions & 4 deletions Source/driver/Castro.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,21 +401,21 @@ Castro::read_params ()
}
#endif

if (hybrid_riemann == 1 && AMREX_SPACEDIM == 1)
if (hybrid_riemann && AMREX_SPACEDIM == 1)
{
std::cerr << "hybrid_riemann only implemented in 2- and 3-d\n";
amrex::Error();
}

if (hybrid_riemann == 1 && (dgeom.IsSPHERICAL() || dgeom.IsRZ() ))
if (hybrid_riemann && (dgeom.IsSPHERICAL() || dgeom.IsRZ() ))
{
std::cerr << "hybrid_riemann should only be used for Cartesian coordinates\n";
amrex::Error();
}

// Make sure not to call refluxing if we're not actually doing any hydro.
if (do_hydro == 0) {
do_reflux = 0;
if (!do_hydro) {
do_reflux = false;
}

if (max_dt < fixed_dt)
Expand Down
Loading