Skip to content

Commit

Permalink
switch a lot of int runtime parameters to bool (#2838)
Browse files Browse the repository at this point in the history
this will help make the runtime parameters structs take up less space

note: there are some cases where boolean-like ints were defaulting to
-1, which should be interpreted as true
  • Loading branch information
zingale authored May 6, 2024
1 parent e8805bf commit 12d128a
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 90 deletions.
12 changes: 6 additions & 6 deletions Exec/science/flame_wave/ci-benchmarks/job_info_params.txt
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
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

0 comments on commit 12d128a

Please sign in to comment.