From 8f6854772e9d128238808cca78455fa59ec5ffa8 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 09:33:09 -0400 Subject: [PATCH 01/13] fix some parameters remove some old SDC stuff --- Exec/science/flame/inputs_2d_smallscale | 1 - .../flame/inputs_2d_smallscale.2levels | 1 - .../flame/inputs_2d_smallscale.testsuite | 1 - Exec/science/flame/inputs_2d_smallscale_sdc | 109 --------------- Exec/science/flame/inputs_3d_smallscale | 1 - .../flame/inputs_3d_smallscale.testsuite | 1 - Exec/science/flame/inputs_3d_smallscale_sdc | 114 ---------------- .../inputs_files/inputs_3d | 3 - .../inputs_files/inputs_3d.192.exactbase | 3 - .../inputs_files/inputs_3d.512 | 3 - .../inputs_files/inputs_3d.768 | 3 - .../inputs_files/inputs_3d_M0.30_highfreq.384 | 3 - .../inputs_files/inputs_3d_M0.30_lowfreq.384 | 3 - .../inputs_files/inputs_3d_M0.30_medfreq.384 | 3 - .../inputs_files/inputs_3d_amr | 3 - Exec/science/plane_parallel_star/inputs_2d | 2 - .../rotating_star/inputs_files/inputs_3d | 3 - .../rotating_star/inputs_files/inputs_3d_MESA | 3 - .../inputs_files/inputs_3d_burnrange | 3 - .../inputs_files/inputs_3d_burntocore | 3 - .../inputs_files/inputs_3d_cutoff | 3 - .../inputs_files/inputs_3d_drdxfac | 3 - .../inputs_files/inputs_3d_fullstar_heating | 3 - .../inputs_files/inputs_3d_heating | 3 - .../inputs_files/inputs_3d_heatinner | 3 - .../inputs_files/inputs_3d_noburn | 3 - .../inputs_files/inputs_3d_perturb | 3 - Exec/science/sub_chandra/inputs_3d | 1 - Exec/science/toy_convect/inputs_2d | 3 +- .../inputs_files/inputs_3d_C.128.sdc | 128 ------------------ Exec/science/xrb_layered/inputs | 1 - Exec/science/xrb_mixed/inputs_2d.rprox | 4 +- .../imposed_external_heating/inputs_2d_C | 1 - .../test_planar_diag/inputs_2d_C | 1 - 34 files changed, 3 insertions(+), 423 deletions(-) delete mode 100644 Exec/science/flame/inputs_2d_smallscale_sdc delete mode 100644 Exec/science/flame/inputs_3d_smallscale_sdc delete mode 100644 Exec/science/wdconvect/inputs_files/inputs_3d_C.128.sdc diff --git a/Exec/science/flame/inputs_2d_smallscale b/Exec/science/flame/inputs_2d_smallscale index e1eb882c3..96b8c8b96 100644 --- a/Exec/science/flame/inputs_2d_smallscale +++ b/Exec/science/flame/inputs_2d_smallscale @@ -31,7 +31,6 @@ amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids # TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 # TIME STEPPING maestro.max_step = 300000 diff --git a/Exec/science/flame/inputs_2d_smallscale.2levels b/Exec/science/flame/inputs_2d_smallscale.2levels index 4273bed25..85d4a5270 100644 --- a/Exec/science/flame/inputs_2d_smallscale.2levels +++ b/Exec/science/flame/inputs_2d_smallscale.2levels @@ -31,7 +31,6 @@ amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids # TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 # TIME STEPPING maestro.max_step = 30000000 diff --git a/Exec/science/flame/inputs_2d_smallscale.testsuite b/Exec/science/flame/inputs_2d_smallscale.testsuite index df8a8b2fd..bca34818b 100644 --- a/Exec/science/flame/inputs_2d_smallscale.testsuite +++ b/Exec/science/flame/inputs_2d_smallscale.testsuite @@ -31,7 +31,6 @@ amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids # TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 # TIME STEPPING maestro.max_step = 20 diff --git a/Exec/science/flame/inputs_2d_smallscale_sdc b/Exec/science/flame/inputs_2d_smallscale_sdc deleted file mode 100644 index 9adebc759..000000000 --- a/Exec/science/flame/inputs_2d_smallscale_sdc +++ /dev/null @@ -1,109 +0,0 @@ - -# INITIAL MODEL -maestro.perturb_model = false -maestro.drdxfac = 5 - -# PROBLEM SIZE -geometry.prob_lo = 0.0 0.0 -geometry.prob_hi = 0.625e0 5.e0 - -# BOUNDARY CONDITIONS -# 0 = Interior 3 = Symmetry -# 1 = Inflow 4 = Slipwall -# 2 = Outflow 5 = NoSlipWall -maestro.lo_bc = 0 1 2 -maestro.hi_bc = 0 2 2 -geometry.is_periodic = 1 0 0 - -# VERBOSITY -maestro.v = 1 # verbosity - -# DEBUG FOR NAN -amrex.fpe_trap_invalid = 1 # floating point exception - -# GRIDDING AND REFINEMENT -amr.n_cell = 128 1024 -amr.max_grid_size = 64 -amr.max_level = 0 # maximum level number allowed -maestro.regrid_int = 2 # how often to regrid -amr.ref_ratio = 2 2 2 2 2 2 # refinement ratio -amr.blocking_factor = 8 # block factor in grid generation -amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids - -# TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 - -# TIME STEPPING -maestro.max_step = 300000 -maestro.stop_time = 1.e0 -maestro.cfl = 0.5 # cfl number for hyperbolic system - # In this test problem, the velocity is - # time-dependent. We could use 0.9 in - # the 3D test, but need to use 0.7 in 2D - # to satisfy CFL condition. - -# ALGORITHMIC OPTIONS -maestro.spherical = 0 -maestro.evolve_base_state = false -maestro.do_initial_projection = true -maestro.init_divu_iter = 3 -maestro.init_iter = 1 -maestro.do_smallscale = true -maestro.beta0_type = 3 - -maestro.anelastic_cutoff_density = 3.e6 -maestro.base_cutoff_density = 3.e6 - -maestro.grav_const = 0.e0 -maestro.use_thermal_diffusion = true - -maestro.init_shrink = 0.1e0 -maestro.max_dt_growth = 1.2e0 - -maestro.use_tfromp = false -maestro.dpdt_factor = 1. - -maestro.sdc_iters = 1 -maestro.sdc_couple_mac_velocity = 1 - -# PLOTFILES -maestro.plot_base_name = sdc_flame_ # root name of plot file -maestro.plot_int = 10 # number of timesteps between plot files -maestro.plot_deltat = 1.e-5 - -# CHECKPOINT -maestro.check_base_name = sdc_chk -maestro.chk_int = -1 - -# tolerances for the initial projection -maestro.eps_init_proj_cart = 1.e-11 -maestro.eps_init_proj_sph = 1.e-10 -# tolerances for the divu iterations -maestro.eps_divu_cart = 1.e-11 -maestro.eps_divu_sph = 1.e-10 -maestro.divu_iter_factor = 100. -maestro.divu_level_factor = 10. -# tolerances for the MAC projection -maestro.eps_mac = 1.e-10 -maestro.eps_mac_max = 1.e-8 -maestro.mac_level_factor = 10. -maestro.eps_mac_bottom = 1.e-3 -# tolerances for the nodal projection -maestro.eps_hg = 1.e-10 -maestro.eps_hg_max = 1.e-10 -maestro.hg_level_factor = 10. -maestro.eps_hg_bottom = 1.e-4 - -maestro.do_burning = true - -# override the default values of the probin namelist values here - -problem.dens_fuel = 5.e7 -problem.temp_fuel = 1.e8 -problem.xc12_fuel = 0.5e0 -problem.vel_fuel = 1.e5 -problem.temp_ash = 3.e9 -problem.interface_pos_frac = 0.125e0 -problem.smooth_len_frac = 0.025e0 - -eos.use_eos_coulomb = 1 diff --git a/Exec/science/flame/inputs_3d_smallscale b/Exec/science/flame/inputs_3d_smallscale index 0d3ed1d30..c182d0940 100644 --- a/Exec/science/flame/inputs_3d_smallscale +++ b/Exec/science/flame/inputs_3d_smallscale @@ -31,7 +31,6 @@ amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids # TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 # TIME STEPPING maestro.max_step = 200 diff --git a/Exec/science/flame/inputs_3d_smallscale.testsuite b/Exec/science/flame/inputs_3d_smallscale.testsuite index a1f104640..827651e92 100644 --- a/Exec/science/flame/inputs_3d_smallscale.testsuite +++ b/Exec/science/flame/inputs_3d_smallscale.testsuite @@ -31,7 +31,6 @@ amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids # TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 # TIME STEPPING maestro.max_step = 20 diff --git a/Exec/science/flame/inputs_3d_smallscale_sdc b/Exec/science/flame/inputs_3d_smallscale_sdc deleted file mode 100644 index ea5b2095a..000000000 --- a/Exec/science/flame/inputs_3d_smallscale_sdc +++ /dev/null @@ -1,114 +0,0 @@ - -# INITIAL MODEL -maestro.probin_file = "probin" -maestro.perturb_model = false -maestro.drdxfac = 5 - -# PROBLEM SIZE -geometry.prob_lo = 0.0 0.0 0.0 -geometry.prob_hi = 0.625e0 0.625e0 5.e0 - -# BOUNDARY CONDITIONS -# 0 = Interior 3 = Symmetry -# 1 = Inflow 4 = Slipwall -# 2 = Outflow 5 = NoSlipWall -maestro.lo_bc = 0 0 1 -maestro.hi_bc = 0 0 2 -geometry.is_periodic = 1 1 0 - -# VERBOSITY -maestro.v = 1 # verbosity - -# DEBUG FOR NAN -amrex.fpe_trap_invalid = 1 # floating point exception - -# GRIDDING AND REFINEMENT -amr.n_cell = 32 32 256 -amr.max_grid_size = 64 -amr.max_level = 0 # maximum level number allowed -maestro.regrid_int = 2 # how often to regrid -amr.ref_ratio = 2 2 2 2 2 2 # refinement ratio -amr.blocking_factor = 8 # block factor in grid generation -amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids - -# TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 - -# TIME STEPPING -maestro.max_step = 200 -maestro.stop_time = 1.e0 -maestro.cfl = 0.5 # cfl number for hyperbolic system - # In this test problem, the velocity is - # time-dependent. We could use 0.9 in - # the 3D test, but need to use 0.7 in 2D - # to satisfy CFL condition. - -# ALGORITHMIC OPTIONS -maestro.spherical = 0 -maestro.evolve_base_state = false -maestro.do_initial_projection = true -maestro.init_divu_iter = 3 -maestro.init_iter = 1 -maestro.do_smallscale = true -maestro.beta0_type = 3 - -maestro.anelastic_cutoff_density = 3.e6 -maestro.base_cutoff_density = 3.e6 - -maestro.grav_const = 0.e0 -maestro.use_thermal_diffusion = true - -maestro.init_shrink = 0.1e0 -maestro.max_dt_growth = 1.2e0 - -maestro.use_tfromp = true -maestro.dpdt_factor = 0.e0 - -maestro.use_delta_gamma1_term = false - -maestro.sdc_iters = 1 -maestro.sdc_couple_mac_velocity = true - -# PLOTFILES -maestro.plot_base_name = sdc_flame_ # root name of plot file -maestro.plot_int = 50 # number of timesteps between plot files -maestro.plot_deltat = 1.e-5 - -# CHECKPOINT -maestro.check_base_name = sdc_chk -maestro.chk_int = 50 -maestro.chk_deltat = 1.e-5 - -# tolerances for the initial projection -maestro.eps_init_proj_cart = 1.e-11 -maestro.eps_init_proj_sph = 1.e-10 -# tolerances for the divu iterations -maestro.eps_divu_cart = 1.e-11 -maestro.eps_divu_sph = 1.e-10 -maestro.divu_iter_factor = 100. -maestro.divu_level_factor = 10. -# tolerances for the MAC projection -maestro.eps_mac = 1.e-10 -maestro.eps_mac_max = 1.e-8 -maestro.mac_level_factor = 10. -maestro.eps_mac_bottom = 1.e-3 -# tolerances for the nodal projection -maestro.eps_hg = 1.e-10 -maestro.eps_hg_max = 1.e-10 -maestro.hg_level_factor = 10. -maestro.eps_hg_bottom = 1.e-4 - -maestro.do_burning = true - -# override the default values of the probin namelist values here -problem.dens_fuel = 5.e7 -problem.temp_fuel = 1.e8 -problem.xc12_fuel = 0.5e0 -problem.vel_fuel = 1.e5 -problem.temp_ash = 3.e9 -problem.interface_pos_frac = 0.125e0 -problem.smooth_len_frac = 0.025e0 - -eos.use_eos_coulomb = 1 - -#eos.eos_gamma = 1.6666666e0 diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d b/Exec/science/fully_convective_star/inputs_files/inputs_3d index 0cc5a941e..5ee3730c7 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d @@ -104,9 +104,6 @@ maestro.do_burning = false maestro.small_dens = 1.e-5 maestro.small_temp = 1.e2 -#SDC -maestro.sdc_couple_velocity = false - # ROTATION maestro.rotational_frequency = 0.0 #4.e-6 maestro.rotation_radius = 0.0 diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d.192.exactbase b/Exec/science/fully_convective_star/inputs_files/inputs_3d.192.exactbase index 6af1085ff..15bd4c19f 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d.192.exactbase +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d.192.exactbase @@ -104,9 +104,6 @@ maestro.do_burning = false maestro.small_dens = 1.e-5 maestro.small_temp = 1.e2 -#SDC -maestro.sdc_couple_velocity = false - # ROTATION maestro.rotational_frequency = 0.0 #4.e-6 maestro.rotation_radius = 0.0 diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d.512 b/Exec/science/fully_convective_star/inputs_files/inputs_3d.512 index 4c9d29c9b..ee003dfb8 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d.512 +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d.512 @@ -103,9 +103,6 @@ maestro.do_burning = false maestro.small_dens = 1.e-5 maestro.small_temp = 1.e2 -#SDC -maestro.sdc_couple_velocity = false - # ROTATION maestro.rotational_frequency = 4.e-5 maestro.rotation_radius = 0.0 diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d.768 b/Exec/science/fully_convective_star/inputs_files/inputs_3d.768 index 8cf91f4cf..91288f06f 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d.768 +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d.768 @@ -103,9 +103,6 @@ maestro.do_burning = false maestro.small_dens = 1.e-5 maestro.small_temp = 1.e2 -#SDC -maestro.sdc_couple_velocity = false - # ROTATION maestro.rotational_frequency = 4.e-5 maestro.rotation_radius = 0.0 diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_highfreq.384 b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_highfreq.384 index 3bccf26a5..2a87d465d 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_highfreq.384 +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_highfreq.384 @@ -103,9 +103,6 @@ maestro.do_burning = false maestro.small_dens = 1.e-5 maestro.small_temp = 1.e2 -#SDC -maestro.sdc_couple_velocity = false - # ROTATION maestro.rotational_frequency = 4.e-5 maestro.rotation_radius = 0.0 diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_lowfreq.384 b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_lowfreq.384 index ff9183ab7..723b08c8e 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_lowfreq.384 +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_lowfreq.384 @@ -103,9 +103,6 @@ maestro.do_burning = false maestro.small_dens = 1.e-5 maestro.small_temp = 1.e2 -#SDC -maestro.sdc_couple_velocity = false - # ROTATION maestro.rotational_frequency = 4.e-11 maestro.rotation_radius = 0.0 diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_medfreq.384 b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_medfreq.384 index 12535a624..2b76de9f3 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_medfreq.384 +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_medfreq.384 @@ -103,9 +103,6 @@ maestro.do_burning = false maestro.small_dens = 1.e-5 maestro.small_temp = 1.e2 -#SDC -maestro.sdc_couple_velocity = false - # ROTATION maestro.rotational_frequency = 4.e-8 maestro.rotation_radius = 0.0 diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d_amr b/Exec/science/fully_convective_star/inputs_files/inputs_3d_amr index e52cf49b6..c346c920a 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d_amr +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d_amr @@ -104,9 +104,6 @@ maestro.do_burning = false maestro.small_dens = 1.e-5 maestro.small_temp = 1.e2 -#SDC -maestro.sdc_couple_velocity = false - # ROTATION maestro.rotational_frequency = 4.e-5 maestro.rotation_radius = 0.0 diff --git a/Exec/science/plane_parallel_star/inputs_2d b/Exec/science/plane_parallel_star/inputs_2d index 09119393f..cc4238061 100644 --- a/Exec/science/plane_parallel_star/inputs_2d +++ b/Exec/science/plane_parallel_star/inputs_2d @@ -98,8 +98,6 @@ maestro.eps_hg_bottom = 1.e-4 # BURNING maestro.do_burning = true -maestro.burning_cutoff_density = 2.5e7 -maestro.burning_invert_cutoff_density = true maestro.grav_const = -3.2e-1 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d b/Exec/science/rotating_star/inputs_files/inputs_3d index 9e1febaf6..86c5681e8 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d +++ b/Exec/science/rotating_star/inputs_files/inputs_3d @@ -104,9 +104,6 @@ maestro.small_dens = 1.e0 maestro.small_temp = 1.e5 maestro.burning_cutoff_density_hi = 5.e6 -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_MESA b/Exec/science/rotating_star/inputs_files/inputs_3d_MESA index 941f6bb48..a22310fc4 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_MESA +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_MESA @@ -104,9 +104,6 @@ maestro.small_dens = 1.e0 maestro.small_temp = 1.e5 maestro.burning_cutoff_density_hi = 5.e6 -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_burnrange b/Exec/science/rotating_star/inputs_files/inputs_3d_burnrange index 62dfa1133..2715f2377 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_burnrange +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_burnrange @@ -105,9 +105,6 @@ maestro.small_temp = 1.e5 maestro.burning_cutoff_density_lo = 5.e5 maestro.burning_cutoff_density_hi = 5.e6 -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_burntocore b/Exec/science/rotating_star/inputs_files/inputs_3d_burntocore index 657375f1b..06bb36501 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_burntocore +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_burntocore @@ -104,9 +104,6 @@ maestro.small_temp = 1.e5 maestro.burning_cutoff_density_lo = 5.e5 #maestro.burning_cutoff_density_hi = 5.e6 -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_cutoff b/Exec/science/rotating_star/inputs_files/inputs_3d_cutoff index 357d9a578..08d707f3e 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_cutoff +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_cutoff @@ -104,9 +104,6 @@ maestro.small_dens = 1.e0 maestro.small_temp = 1.e5 maestro.burning_cutoff_density_hi = 5.e6 -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_drdxfac b/Exec/science/rotating_star/inputs_files/inputs_3d_drdxfac index 9cdbc26f3..5166e926d 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_drdxfac +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_drdxfac @@ -108,9 +108,6 @@ maestro.do_heating = true maestro.plot_Hext = true maestro.heating_cutoff_density_lo = 5.e6 -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_fullstar_heating b/Exec/science/rotating_star/inputs_files/inputs_3d_fullstar_heating index f1aa7ac21..b5c9f1a7d 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_fullstar_heating +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_fullstar_heating @@ -102,9 +102,6 @@ maestro.small_dens = 1.e0 maestro.small_temp = 1.e5 maestro.burning_cutoff_density_hi = 5.e6 -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_heating b/Exec/science/rotating_star/inputs_files/inputs_3d_heating index 2d96df2c2..75f59f541 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_heating +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_heating @@ -105,9 +105,6 @@ maestro.small_dens = 1.e0 maestro.small_temp = 1.e5 maestro.burning_cutoff_density_hi = 5.e6 -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_heatinner b/Exec/science/rotating_star/inputs_files/inputs_3d_heatinner index 6f9337993..67c08e72d 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_heatinner +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_heatinner @@ -106,9 +106,6 @@ maestro.small_temp = 1.e5 maestro.burning_cutoff_density_hi = 5.e6 maestro.heating_cutoff_density_lo = 5.e5 # apply heating in the inner part of the star only -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_noburn b/Exec/science/rotating_star/inputs_files/inputs_3d_noburn index a8b49ecf4..840a45d50 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_noburn +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_noburn @@ -104,9 +104,6 @@ maestro.small_dens = 1.e0 maestro.small_temp = 1.e5 maestro.burning_cutoff_density_hi = 5.e6 -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_perturb b/Exec/science/rotating_star/inputs_files/inputs_3d_perturb index 432c2b86b..9de384718 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_perturb +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_perturb @@ -104,9 +104,6 @@ maestro.small_dens = 1.e0 maestro.small_temp = 1.e5 maestro.burning_cutoff_density_hi = 5.e6 -#SDC -maestro.sdc_couple_velocity = true - # ROTATION # For the 18M star, I think the Keplerian rot freq is about 1e-5 (if assume its radius is about that of the Sun?) maestro.rotational_frequency = 1.e-3 diff --git a/Exec/science/sub_chandra/inputs_3d b/Exec/science/sub_chandra/inputs_3d index f0466d75c..433164d90 100644 --- a/Exec/science/sub_chandra/inputs_3d +++ b/Exec/science/sub_chandra/inputs_3d @@ -33,7 +33,6 @@ amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > maestro.octant = true # TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 # TIME STEPPING maestro.max_step = 100 diff --git a/Exec/science/toy_convect/inputs_2d b/Exec/science/toy_convect/inputs_2d index a64cd8375..3b95dc293 100644 --- a/Exec/science/toy_convect/inputs_2d +++ b/Exec/science/toy_convect/inputs_2d @@ -15,7 +15,7 @@ maestro.hi_bc = 0 2 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception @@ -30,7 +30,6 @@ amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids # TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 # TIME STEPPING maestro.max_step = 30000000 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.sdc b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.sdc deleted file mode 100644 index fe0f453d4..000000000 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.sdc +++ /dev/null @@ -1,128 +0,0 @@ -# INITIAL MODEL -maestro.model_file = "kepler_new_6.25e8.hybrid.hse.640" -maestro.drdxfac = 5 - -# GRIDDING AND REFINEMENT -amr.max_level = 0 # maximum level number allowed -amr.n_cell = 128 128 128 -amr.max_grid_size = 64 -amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids - -maestro.anelastic_cutoff_density = 1.e6 -maestro.base_cutoff_density = 1.e5 - -maestro.do_sponge = 1 -maestro.sponge_center_density = 3.e6 -maestro.sponge_start_factor = 3.333e0 -maestro.sponge_kappa = 10.e0 - -maestro.spherical = 1 - -# PROBLEM SIZE -geometry.prob_lo = 0.0 0.0 0.0 -geometry.prob_hi = 5.e8 5.e8 5.e8 - -# TIME STEPPING -maestro.max_step = 30000 -maestro.init_iter = 1 - -maestro.stop_time = 30000. - -# PLOTFILES -maestro.plot_base_name = sdc_plt # root name of plot file -maestro.plot_int = 200 # number of timesteps between plot files - -# CHECKPOINT -maestro.check_base_name = sdc_chk -maestro.chk_int = 200 - -# how often (number of coarse timesteps) to compute integral sums (for runtime diagnostics) -maestro.sum_interval = 1 - -maestro.cfl = 0.7 # cfl number for hyperbolic system - # In this test problem, the velocity is - # time-dependent. We could use 0.9 in - # the 3D test, but need to use 0.7 in 2D - # to satisfy CFL condition. - -maestro.init_shrink = 0.1e0 -maestro.max_dt_growth = 1.1e0 -maestro.use_soundspeed_firstdt = true -maestro.use_divu_firstdt = true - -# BOUNDARY CONDITIONS -# 0 = Interior 3 = Symmetry -# 1 = Inflow 4 = Slipwall -# 2 = Outflow 5 = NoSlipWall -maestro.lo_bc = 2 2 2 -maestro.hi_bc = 2 2 2 -geometry.is_periodic = 0 0 0 - -# VERBOSITY -maestro.v = 1 # verbosity -maestro.mg_verbose = 1 -maestro.cg_verbose = 0 - -# ALGORITHMIC OPTIONS -maestro.do_initial_projection = true -maestro.init_divu_iter = 2 - -maestro.do_burning = true - -maestro.evolve_base_state = true - -maestro.dpdt_factor = 0.0e0 - -maestro.use_tfromp = true - -# DEBUG FOR NAN -amrex.fpe_trap_invalid = 1 # floating point exception - -#SDC -maestro.sdc_couple_mac_velocity = false - -# OMP settings -amrex.regtest_reduction = 1 - -# GPU parameters -maestro.deterministic_nodal_solve = true - -# tolerances for the initial projection -maestro.eps_init_proj_cart = 1.e-12 -maestro.eps_init_proj_sph = 1.e-10 -# tolerances for the divu iterations -maestro.eps_divu_cart = 1.e-12 -maestro.eps_divu_sph = 1.e-10 -maestro.divu_iter_factor = 100. -maestro.divu_level_factor = 10. -# tolerances for the MAC projection -maestro.eps_mac = 1.e-10 -maestro.eps_mac_max = 1.e-8 -maestro.mac_level_factor = 10. -maestro.eps_mac_bottom = 1.e-3 -# tolerances for the nodal projection -maestro.eps_hg = 1.e-11 -maestro.eps_hg_max = 1.e-10 -maestro.hg_level_factor = 10. -maestro.eps_hg_bottom = 1.e-4 - -# override the default values of the probin namelist values here -problem.velpert_amplitude = 1.e5 -problem.velpert_radius = 2.e7 -problem.velpert_scale = 1.e7 -problem.velpert_steep = 1.e5 -problem.tag_density_1 = 5.e7 -problem.tag_density_2 = 1.e8 -problem.tag_density_3 = 1.e8 -problem.particle_temp_cutoff = 6.e8 -problem.particle_tpert_threshold = 2.e7 - -# Note that some of the parameters in this -# namelist are specific to the default EOS, -# network, and/or integrator used in the -# makefile. If you try a different set of -# microphysics routines be sure to check that -# the parameters in here are consistent. - -eos.use_eos_coulomb = 1 -integrator.jacobian = 2 diff --git a/Exec/science/xrb_layered/inputs b/Exec/science/xrb_layered/inputs index 1dece7cf0..9909b2a3f 100644 --- a/Exec/science/xrb_layered/inputs +++ b/Exec/science/xrb_layered/inputs @@ -35,7 +35,6 @@ amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > amr.v = 1 # AMR verbosity # TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 # TIME STEPPING maestro.max_step = 30000000 diff --git a/Exec/science/xrb_mixed/inputs_2d.rprox b/Exec/science/xrb_mixed/inputs_2d.rprox index 71f78667c..5082db620 100644 --- a/Exec/science/xrb_mixed/inputs_2d.rprox +++ b/Exec/science/xrb_mixed/inputs_2d.rprox @@ -17,7 +17,7 @@ maestro.hi_bc = 0 2 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception @@ -32,7 +32,7 @@ amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids # TAGGING -maestro.temperr = 6.5e8 6.5e8 6.5e8 + # TIME STEPPING maestro.max_step = 30000000 diff --git a/Exec/test_problems/imposed_external_heating/inputs_2d_C b/Exec/test_problems/imposed_external_heating/inputs_2d_C index 236043a91..18b1a617f 100644 --- a/Exec/test_problems/imposed_external_heating/inputs_2d_C +++ b/Exec/test_problems/imposed_external_heating/inputs_2d_C @@ -65,7 +65,6 @@ maestro.evolve_base_state = true maestro.do_initial_projection = false maestro.init_divu_iter = 0 maestro.init_iter = 1 -maestro.do_reflux = 0 maestro.use_etarho = true maestro.do_sponge = 0 diff --git a/Exec/test_problems/test_planar_diag/inputs_2d_C b/Exec/test_problems/test_planar_diag/inputs_2d_C index 66fa8c405..831ae64bc 100644 --- a/Exec/test_problems/test_planar_diag/inputs_2d_C +++ b/Exec/test_problems/test_planar_diag/inputs_2d_C @@ -60,7 +60,6 @@ maestro.evolve_base_state = true maestro.do_initial_projection = true maestro.init_divu_iter = 1 maestro.init_iter = 1 -maestro.do_reflux = 0 # do we do the hyperbolic reflux maestro.do_sponge = 0 maestro.sponge_center_density = 3.e6 From 651b3097761fe6e6c0ba5ff62f8357a52dfe013a Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 09:40:41 -0400 Subject: [PATCH 02/13] more fixes --- Exec/science/code_comp/inputs_3d | 2 +- Exec/science/ecsn/input_ecsn | 4 ++-- Exec/science/flame/inputs_2d_smallscale | 2 +- Exec/science/flame/inputs_2d_smallscale.2levels | 2 +- Exec/science/flame/inputs_2d_smallscale.testsuite | 2 +- Exec/science/flame/inputs_3d_smallscale | 2 +- Exec/science/flame/inputs_3d_smallscale.testsuite | 2 +- Exec/science/fully_convective_star/inputs_files/inputs_3d | 2 +- .../inputs_files/inputs_3d.192.exactbase | 2 +- Exec/science/fully_convective_star/inputs_files/inputs_3d.512 | 2 +- Exec/science/fully_convective_star/inputs_files/inputs_3d.768 | 2 +- .../inputs_files/inputs_3d_M0.30_highfreq.384 | 2 +- .../inputs_files/inputs_3d_M0.30_lowfreq.384 | 2 +- .../inputs_files/inputs_3d_M0.30_medfreq.384 | 2 +- Exec/science/fully_convective_star/inputs_files/inputs_3d_amr | 2 +- Exec/science/plane_parallel_star/inputs_2d | 2 +- Exec/science/plane_parallel_star/inputs_2d_sdc | 2 +- Exec/science/rotating_star/inputs_files/inputs_3d | 2 +- Exec/science/rotating_star/inputs_files/inputs_3d_MESA | 2 +- Exec/science/rotating_star/inputs_files/inputs_3d_burnrange | 2 +- Exec/science/rotating_star/inputs_files/inputs_3d_burntocore | 2 +- Exec/science/rotating_star/inputs_files/inputs_3d_cutoff | 2 +- Exec/science/rotating_star/inputs_files/inputs_3d_drdxfac | 2 +- .../rotating_star/inputs_files/inputs_3d_fullstar_heating | 2 +- Exec/science/rotating_star/inputs_files/inputs_3d_heating | 2 +- Exec/science/rotating_star/inputs_files/inputs_3d_heatinner | 2 +- Exec/science/rotating_star/inputs_files/inputs_3d_noburn | 2 +- Exec/science/rotating_star/inputs_files/inputs_3d_perturb | 2 +- Exec/science/sub_chandra/inputs_3d | 2 +- .../levels-1.1024/inputs_3d_1lev.5120 | 4 ++-- .../levels-2.1024/inputs_3d_2lev.5120 | 4 ++-- .../levels-1.1024/inputs_3d_1lev.5120 | 4 ++-- .../levels-2.1024/inputs_3d_2lev.5120 | 4 ++-- .../levels-2.256/inputs_3d_2lev.5120 | 4 ++-- .../levels-1.1024/inputs_3d_1lev.5120 | 4 ++-- .../levels-2.1024/inputs_3d_2lev.5120 | 4 ++-- .../levels-2.64/inputs_3d_2lev.5120.64 | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.1024 | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.128 | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.128.2levels | 4 ++-- .../wdconvect/inputs_files/inputs_3d_C.128.2levels_onegrid | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.128.avgbase | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.128.exactbase | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.1280 | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.1536 | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.256 | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.256.2levels | 2 +- Exec/science/wdconvect/inputs_files/inputs_3d_C.256.3levels | 2 +- Exec/science/wdconvect/inputs_files/inputs_3d_C.256.avgbase | 2 +- Exec/science/wdconvect/inputs_files/inputs_3d_C.256.exactbase | 2 +- Exec/science/wdconvect/inputs_files/inputs_3d_C.384 | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.512 | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.512.2levels | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.512.3levels | 2 +- .../wdconvect/inputs_files/inputs_3d_C.512.avgbase.3levels | 2 +- Exec/science/wdconvect/inputs_files/inputs_3d_C.512.exactbase | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.64 | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.64.avgbase | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.64.exactbase | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_C.768 | 4 ++-- Exec/science/wdconvect/inputs_files/inputs_3d_amr_regression | 2 +- Exec/science/wdconvect/inputs_files/inputs_3d_regression | 2 +- .../wdconvect/inputs_files/inputs_3d_regression.2levels | 2 +- Exec/science/wdconvect/inputs_files/inputs_omp_3d_regression | 2 +- Exec/science/xrb_layered/inputs | 2 +- Exec/test_problems/double_bubble/inputs_2d_C | 2 +- Exec/test_problems/double_bubble/inputs_2d_regression | 2 +- Exec/test_problems/imposed_external_heating/inputs_2d_C | 2 +- Exec/test_problems/incomp_shear_jet/inputs_2d_C | 2 +- Exec/test_problems/incomp_shear_jet/inputs_2d_regression | 2 +- Exec/test_problems/mach_jet/inputs_2d | 2 +- Exec/test_problems/mach_jet/inputs_2d_stratified | 2 +- Exec/test_problems/reacting_bubble/inputs_2d_C | 2 +- Exec/test_problems/reacting_bubble/inputs_2d_C.2levels | 2 +- Exec/test_problems/reacting_bubble/inputs_2d_C.3levels | 2 +- Exec/test_problems/reacting_bubble/inputs_2d_C.avgbase | 2 +- Exec/test_problems/reacting_bubble/inputs_2d_amr_regression | 2 +- Exec/test_problems/reacting_bubble/inputs_2d_dpdt | 2 +- Exec/test_problems/reacting_bubble/inputs_2d_regression | 2 +- .../reacting_bubble/inputs_2d_regression.2levels | 2 +- Exec/test_problems/reacting_bubble/inputs_2d_sdc | 2 +- Exec/test_problems/reacting_bubble/inputs_3d_C | 2 +- Exec/test_problems/reacting_bubble/inputs_3d_C.2levels | 2 +- Exec/test_problems/reacting_bubble/inputs_3d_C.3levels | 2 +- Exec/test_problems/reacting_bubble/inputs_3d_C.avgbase | 2 +- Exec/test_problems/reacting_bubble/inputs_3d_amr_regression | 2 +- Exec/test_problems/reacting_bubble/inputs_3d_gpu_regression | 2 +- Exec/test_problems/reacting_bubble/inputs_3d_regression | 2 +- Exec/test_problems/reacting_bubble/inputs_3d_sdc | 2 +- Exec/test_problems/reacting_bubble/inputs_omp_2d_regression | 2 +- Exec/test_problems/reacting_bubble/inputs_omp_3d_regression | 2 +- Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d | 2 +- Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x2 | 2 +- Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x3 | 2 +- Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x4 | 2 +- Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x5 | 2 +- Exec/test_problems/rt/inputs_2d_C | 2 +- Exec/test_problems/rt/inputs_2d_closed_top | 2 +- Exec/test_problems/rt/inputs_2d_regression | 2 +- Exec/test_problems/test_convect/inputs_2d_C | 2 +- Exec/test_problems/test_convect/inputs_2d_regression | 2 +- Exec/test_problems/test_planar_diag/inputs_2d_C | 2 +- Exec/test_problems/test_stability/inputs_2d_C | 2 +- Exec/test_problems/test_stability/inputs_2d_C_regression | 2 +- Exec/unit_tests/test_advect/inputs_2d | 2 +- Exec/unit_tests/test_advect/inputs_3d | 2 +- Exec/unit_tests/test_average/inputs_2d_planar | 2 +- Exec/unit_tests/test_average/inputs_3d.128.5dr.eq.dx | 2 +- .../test_basestate/planar-invsq/inputs-planar-invsq | 2 +- Exec/unit_tests/test_basestate/planar/inputs-planar | 2 +- .../unit_tests/test_basestate/spherical/inputs-spherical_heat | 2 +- Exec/unit_tests/test_basestate/sub_chandra/inputs-subchandra | 2 +- Exec/unit_tests/test_basestate/urca/inputs-urca_cold | 2 +- Exec/unit_tests/test_basestate/urca/inputs-urca_hot | 2 +- Exec/unit_tests/test_basestate/urca/inputs-uref | 2 +- .../test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e-4 | 2 +- .../test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e5 | 2 +- .../test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e6 | 2 +- Exec/unit_tests/test_diffusion/inputs_2d | 2 +- Exec/unit_tests/test_diffusion/inputs_2d-128 | 2 +- Exec/unit_tests/test_diffusion/inputs_2d-256 | 2 +- Exec/unit_tests/test_diffusion/inputs_2d-32 | 2 +- Exec/unit_tests/test_diffusion/inputs_2d-64 | 2 +- Exec/unit_tests/test_eos/inputs_eos.gammalaw | 2 +- Exec/unit_tests/test_eos/inputs_eos.helmeos | 2 +- Exec/unit_tests/test_projection/inputs_2d_per | 2 +- Exec/unit_tests/test_projection/inputs_2d_per.cross | 2 +- Exec/unit_tests/test_projection/inputs_2d_per_mac | 2 +- Exec/unit_tests/test_projection/inputs_2d_wall | 2 +- Exec/unit_tests/test_projection/inputs_2d_wall.cross | 2 +- Exec/unit_tests/test_projection/inputs_2d_wall_mac | 2 +- Exec/unit_tests/test_projection/inputs_3d_per | 2 +- Exec/unit_tests/test_projection/inputs_3d_per_mac | 2 +- Exec/unit_tests/test_projection/inputs_3d_wall | 2 +- Exec/unit_tests/test_projection/inputs_3d_wall_mac | 2 +- 135 files changed, 161 insertions(+), 161 deletions(-) diff --git a/Exec/science/code_comp/inputs_3d b/Exec/science/code_comp/inputs_3d index 302fdf121..b7c91842e 100644 --- a/Exec/science/code_comp/inputs_3d +++ b/Exec/science/code_comp/inputs_3d @@ -17,7 +17,7 @@ maestro.hi_bc = 0 0 3 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/ecsn/input_ecsn b/Exec/science/ecsn/input_ecsn index 5ff79377f..b3f6fa64b 100644 --- a/Exec/science/ecsn/input_ecsn +++ b/Exec/science/ecsn/input_ecsn @@ -36,7 +36,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000 # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files #maestro.small_plot_int = 50 @@ -69,7 +69,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/flame/inputs_2d_smallscale b/Exec/science/flame/inputs_2d_smallscale index 96b8c8b96..642f79f7b 100644 --- a/Exec/science/flame/inputs_2d_smallscale +++ b/Exec/science/flame/inputs_2d_smallscale @@ -16,7 +16,7 @@ maestro.hi_bc = 0 2 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/flame/inputs_2d_smallscale.2levels b/Exec/science/flame/inputs_2d_smallscale.2levels index 85d4a5270..2ebb44b78 100644 --- a/Exec/science/flame/inputs_2d_smallscale.2levels +++ b/Exec/science/flame/inputs_2d_smallscale.2levels @@ -16,7 +16,7 @@ maestro.hi_bc = 0 2 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/flame/inputs_2d_smallscale.testsuite b/Exec/science/flame/inputs_2d_smallscale.testsuite index bca34818b..4aef83f45 100644 --- a/Exec/science/flame/inputs_2d_smallscale.testsuite +++ b/Exec/science/flame/inputs_2d_smallscale.testsuite @@ -16,7 +16,7 @@ maestro.hi_bc = 0 2 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/flame/inputs_3d_smallscale b/Exec/science/flame/inputs_3d_smallscale index c182d0940..77dfe12a2 100644 --- a/Exec/science/flame/inputs_3d_smallscale +++ b/Exec/science/flame/inputs_3d_smallscale @@ -16,7 +16,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/flame/inputs_3d_smallscale.testsuite b/Exec/science/flame/inputs_3d_smallscale.testsuite index 827651e92..f6b3883fe 100644 --- a/Exec/science/flame/inputs_3d_smallscale.testsuite +++ b/Exec/science/flame/inputs_3d_smallscale.testsuite @@ -16,7 +16,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d b/Exec/science/fully_convective_star/inputs_files/inputs_3d index 5ee3730c7..b80007fd8 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d @@ -18,7 +18,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity #maestro.mg_verbose = 2 # DEBUG FOR NAN diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d.192.exactbase b/Exec/science/fully_convective_star/inputs_files/inputs_3d.192.exactbase index 15bd4c19f..5419aa158 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d.192.exactbase +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d.192.exactbase @@ -18,7 +18,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity #maestro.mg_verbose = 2 # DEBUG FOR NAN diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d.512 b/Exec/science/fully_convective_star/inputs_files/inputs_3d.512 index ee003dfb8..8ca4c3bb6 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d.512 +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d.512 @@ -18,7 +18,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity #maestro.mg_verbose = 2 # DEBUG FOR NAN diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d.768 b/Exec/science/fully_convective_star/inputs_files/inputs_3d.768 index 91288f06f..9c77fd4a9 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d.768 +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d.768 @@ -18,7 +18,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity #maestro.mg_verbose = 2 # DEBUG FOR NAN diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_highfreq.384 b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_highfreq.384 index 2a87d465d..7a50c2df3 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_highfreq.384 +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_highfreq.384 @@ -18,7 +18,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity #maestro.mg_verbose = 2 # DEBUG FOR NAN diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_lowfreq.384 b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_lowfreq.384 index 723b08c8e..daeec0e6b 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_lowfreq.384 +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_lowfreq.384 @@ -18,7 +18,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity #maestro.mg_verbose = 2 # DEBUG FOR NAN diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_medfreq.384 b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_medfreq.384 index 2b76de9f3..17574195c 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_medfreq.384 +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d_M0.30_medfreq.384 @@ -18,7 +18,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity #maestro.mg_verbose = 2 # DEBUG FOR NAN diff --git a/Exec/science/fully_convective_star/inputs_files/inputs_3d_amr b/Exec/science/fully_convective_star/inputs_files/inputs_3d_amr index c346c920a..2002dde61 100644 --- a/Exec/science/fully_convective_star/inputs_files/inputs_3d_amr +++ b/Exec/science/fully_convective_star/inputs_files/inputs_3d_amr @@ -18,7 +18,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity #maestro.mg_verbose = 2 # DEBUG FOR NAN diff --git a/Exec/science/plane_parallel_star/inputs_2d b/Exec/science/plane_parallel_star/inputs_2d index cc4238061..1067657f5 100644 --- a/Exec/science/plane_parallel_star/inputs_2d +++ b/Exec/science/plane_parallel_star/inputs_2d @@ -19,7 +19,7 @@ maestro.hi_bc = 0 2 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/plane_parallel_star/inputs_2d_sdc b/Exec/science/plane_parallel_star/inputs_2d_sdc index a16de78f7..d92b69e58 100644 --- a/Exec/science/plane_parallel_star/inputs_2d_sdc +++ b/Exec/science/plane_parallel_star/inputs_2d_sdc @@ -19,7 +19,7 @@ maestro.hi_bc = 0 2 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d b/Exec/science/rotating_star/inputs_files/inputs_3d index 86c5681e8..9bb3c3cfe 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d +++ b/Exec/science/rotating_star/inputs_files/inputs_3d @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_MESA b/Exec/science/rotating_star/inputs_files/inputs_3d_MESA index a22310fc4..17426649b 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_MESA +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_MESA @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_burnrange b/Exec/science/rotating_star/inputs_files/inputs_3d_burnrange index 2715f2377..900195bbf 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_burnrange +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_burnrange @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_burntocore b/Exec/science/rotating_star/inputs_files/inputs_3d_burntocore index 06bb36501..1f638fa87 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_burntocore +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_burntocore @@ -18,7 +18,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_cutoff b/Exec/science/rotating_star/inputs_files/inputs_3d_cutoff index 08d707f3e..180dc644c 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_cutoff +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_cutoff @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_drdxfac b/Exec/science/rotating_star/inputs_files/inputs_3d_drdxfac index 5166e926d..16eb0c314 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_drdxfac +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_drdxfac @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_fullstar_heating b/Exec/science/rotating_star/inputs_files/inputs_3d_fullstar_heating index b5c9f1a7d..9a744eec1 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_fullstar_heating +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_fullstar_heating @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_heating b/Exec/science/rotating_star/inputs_files/inputs_3d_heating index 75f59f541..1f5577641 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_heating +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_heating @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_heatinner b/Exec/science/rotating_star/inputs_files/inputs_3d_heatinner index 67c08e72d..6582c2ca4 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_heatinner +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_heatinner @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_noburn b/Exec/science/rotating_star/inputs_files/inputs_3d_noburn index 840a45d50..c9c73cc86 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_noburn +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_noburn @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/rotating_star/inputs_files/inputs_3d_perturb b/Exec/science/rotating_star/inputs_files/inputs_3d_perturb index 9de384718..f52b89806 100644 --- a/Exec/science/rotating_star/inputs_files/inputs_3d_perturb +++ b/Exec/science/rotating_star/inputs_files/inputs_3d_perturb @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/sub_chandra/inputs_3d b/Exec/science/sub_chandra/inputs_3d index 433164d90..affa30501 100644 --- a/Exec/science/sub_chandra/inputs_3d +++ b/Exec/science/sub_chandra/inputs_3d @@ -17,7 +17,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/urca/models/rhoc-3.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 b/Exec/science/urca/models/rhoc-3.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 index 3fe10ffec..ec628b6c2 100644 --- a/Exec/science/urca/models/rhoc-3.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 +++ b/Exec/science/urca/models/rhoc-3.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 @@ -32,7 +32,7 @@ maestro.init_iter = 1 maestro.stop_time = 36000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 1000000 # number of timesteps between plot files maestro.plot_deltat = 5.0 @@ -63,7 +63,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/urca/models/rhoc-3.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 b/Exec/science/urca/models/rhoc-3.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 index 68e9c5700..37ca4593c 100644 --- a/Exec/science/urca/models/rhoc-3.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 +++ b/Exec/science/urca/models/rhoc-3.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 @@ -32,7 +32,7 @@ maestro.init_iter = 1 maestro.stop_time = 36000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 1000000 # number of timesteps between plot files maestro.plot_deltat = 5.0 @@ -63,7 +63,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 b/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 index ab7e4b860..c427c2ee4 100644 --- a/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 +++ b/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 @@ -35,7 +35,7 @@ maestro.stop_time = 36000. maestro.sum_interval = 1 # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 1000000 # number of timesteps between plot files maestro.plot_deltat = 5.0 @@ -62,7 +62,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 b/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 index 3fd6b741e..952bd02eb 100644 --- a/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 +++ b/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 @@ -35,7 +35,7 @@ maestro.stop_time = 36000. maestro.sum_interval = 1 # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 1000000 # number of timesteps between plot files maestro.plot_deltat = 5.0 @@ -62,7 +62,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-2.256/inputs_3d_2lev.5120 b/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-2.256/inputs_3d_2lev.5120 index 18f30be26..8eea8685e 100644 --- a/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-2.256/inputs_3d_2lev.5120 +++ b/Exec/science/urca/models/rhoc-4.5e9_Tc-6.0e8_Mconv-1.0/levels-2.256/inputs_3d_2lev.5120 @@ -35,7 +35,7 @@ maestro.stop_time = 36000. maestro.sum_interval = 1 # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 1000000 # number of timesteps between plot files maestro.plot_deltat = 5.0 @@ -62,7 +62,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 b/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 index 20e3b3fec..f03410308 100644 --- a/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 +++ b/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-1.1024/inputs_3d_1lev.5120 @@ -32,7 +32,7 @@ maestro.init_iter = 1 maestro.stop_time = 36000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 1000000 # number of timesteps between plot files maestro.plot_deltat = 5.0 @@ -63,7 +63,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 b/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 index 8f834fd4c..93245e5b0 100644 --- a/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 +++ b/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-2.1024/inputs_3d_2lev.5120 @@ -32,7 +32,7 @@ maestro.init_iter = 1 maestro.stop_time = 36000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 1000000 # number of timesteps between plot files maestro.plot_deltat = 5.0 @@ -63,7 +63,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-2.64/inputs_3d_2lev.5120.64 b/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-2.64/inputs_3d_2lev.5120.64 index f6d350cc8..808ca997c 100644 --- a/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-2.64/inputs_3d_2lev.5120.64 +++ b/Exec/science/urca/models/rhoc-5.5e9_Tc-6.0e8_Mconv-1.0/levels-2.64/inputs_3d_2lev.5120.64 @@ -34,7 +34,7 @@ maestro.init_iter = 1 maestro.stop_time = 36000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 1 # number of timesteps between plot files #maestro.plot_deltat = 5.0 @@ -65,7 +65,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.1024 b/Exec/science/wdconvect/inputs_files/inputs_3d_C.1024 index 9f1894dff..7fd93e733 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.1024 +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.1024 @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128 b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128 index d69c82d77..a70485b44 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128 +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128 @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.2levels b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.2levels index ac2de9fb2..b43459441 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.2levels +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.2levels @@ -34,7 +34,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -64,7 +64,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.2levels_onegrid b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.2levels_onegrid index 5d7f3515c..8038b1da8 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.2levels_onegrid +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.2levels_onegrid @@ -34,7 +34,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -64,7 +64,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.avgbase b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.avgbase index 2a6726de4..80318db2b 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.avgbase +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.avgbase @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.exactbase b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.exactbase index 6803c1ff7..f1bc96781 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.exactbase +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.128.exactbase @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.1280 b/Exec/science/wdconvect/inputs_files/inputs_3d_C.1280 index 62055f3ce..22aee83ec 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.1280 +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.1280 @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.1536 b/Exec/science/wdconvect/inputs_files/inputs_3d_C.1536 index 8a91cebe4..51f16ec0e 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.1536 +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.1536 @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.256 b/Exec/science/wdconvect/inputs_files/inputs_3d_C.256 index 466ae9765..a98ff2e84 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.256 +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.256 @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.2levels b/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.2levels index 9d7328777..73e4123e1 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.2levels +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.2levels @@ -64,7 +64,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.3levels b/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.3levels index 87e4bc0ca..bb2e3353e 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.3levels +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.3levels @@ -64,7 +64,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.avgbase b/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.avgbase index 13c3b43aa..5fced261f 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.avgbase +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.avgbase @@ -62,7 +62,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.exactbase b/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.exactbase index 27c52cc87..cd41b45a2 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.exactbase +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.256.exactbase @@ -62,7 +62,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.384 b/Exec/science/wdconvect/inputs_files/inputs_3d_C.384 index 70d886996..a4922d024 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.384 +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.384 @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.512 b/Exec/science/wdconvect/inputs_files/inputs_3d_C.512 index 999e060db..7e3968051 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.512 +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.512 @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.2levels b/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.2levels index 6b92f0bc9..0c4a1454f 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.2levels +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.2levels @@ -34,7 +34,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 0 # number of timesteps between plot files # CHECKPOINT @@ -64,7 +64,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 10 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.3levels b/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.3levels index 4da37050f..27cff47fc 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.3levels +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.3levels @@ -64,7 +64,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.avgbase.3levels b/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.avgbase.3levels index 4c138e7a7..b7a56cbbe 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.avgbase.3levels +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.avgbase.3levels @@ -64,7 +64,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.exactbase b/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.exactbase index e788ff36a..ccae19b72 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.exactbase +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.512.exactbase @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.64 b/Exec/science/wdconvect/inputs_files/inputs_3d_C.64 index c6d6fc9b1..2666400ef 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.64 +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.64 @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.64.avgbase b/Exec/science/wdconvect/inputs_files/inputs_3d_C.64.avgbase index 2a76169b3..265958a32 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.64.avgbase +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.64.avgbase @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.64.exactbase b/Exec/science/wdconvect/inputs_files/inputs_3d_C.64.exactbase index 8000df473..cd115a8a6 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.64.exactbase +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.64.exactbase @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_C.768 b/Exec/science/wdconvect/inputs_files/inputs_3d_C.768 index f7bf76531..a011799b9 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_C.768 +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_C.768 @@ -29,7 +29,7 @@ maestro.init_iter = 1 maestro.stop_time = 30000. # PLOTFILES -maestro.plot_file = plt # root name of plot file +maestro.plot_base_name = plt # root name of plot file maestro.plot_int = 10 # number of timesteps between plot files # CHECKPOINT @@ -59,7 +59,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 1 maestro.cg_verbose = 0 diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_amr_regression b/Exec/science/wdconvect/inputs_files/inputs_3d_amr_regression index fa9b350bc..413d1c3d2 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_amr_regression +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_amr_regression @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_regression b/Exec/science/wdconvect/inputs_files/inputs_3d_regression index 5b4a2efbc..75edbb565 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_regression +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_regression @@ -20,7 +20,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/wdconvect/inputs_files/inputs_3d_regression.2levels b/Exec/science/wdconvect/inputs_files/inputs_3d_regression.2levels index f5fef7c8f..b273433fc 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_3d_regression.2levels +++ b/Exec/science/wdconvect/inputs_files/inputs_3d_regression.2levels @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/wdconvect/inputs_files/inputs_omp_3d_regression b/Exec/science/wdconvect/inputs_files/inputs_omp_3d_regression index 5b761db3e..2ca53bb1d 100644 --- a/Exec/science/wdconvect/inputs_files/inputs_omp_3d_regression +++ b/Exec/science/wdconvect/inputs_files/inputs_omp_3d_regression @@ -19,7 +19,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/science/xrb_layered/inputs b/Exec/science/xrb_layered/inputs index 9909b2a3f..1a134d32c 100644 --- a/Exec/science/xrb_layered/inputs +++ b/Exec/science/xrb_layered/inputs @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/double_bubble/inputs_2d_C b/Exec/test_problems/double_bubble/inputs_2d_C index 88755c19a..b9da4fda0 100644 --- a/Exec/test_problems/double_bubble/inputs_2d_C +++ b/Exec/test_problems/double_bubble/inputs_2d_C @@ -17,7 +17,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/double_bubble/inputs_2d_regression b/Exec/test_problems/double_bubble/inputs_2d_regression index 7ea76f9ce..ddf75d58e 100644 --- a/Exec/test_problems/double_bubble/inputs_2d_regression +++ b/Exec/test_problems/double_bubble/inputs_2d_regression @@ -17,7 +17,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/imposed_external_heating/inputs_2d_C b/Exec/test_problems/imposed_external_heating/inputs_2d_C index 18b1a617f..281e9631b 100644 --- a/Exec/test_problems/imposed_external_heating/inputs_2d_C +++ b/Exec/test_problems/imposed_external_heating/inputs_2d_C @@ -23,7 +23,7 @@ maestro.hi_bc = 0 4 0 geometry.is_periodic = 1 0 1 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/incomp_shear_jet/inputs_2d_C b/Exec/test_problems/incomp_shear_jet/inputs_2d_C index b1a696441..084aa19ac 100644 --- a/Exec/test_problems/incomp_shear_jet/inputs_2d_C +++ b/Exec/test_problems/incomp_shear_jet/inputs_2d_C @@ -15,7 +15,7 @@ maestro.hi_bc = 0 0 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/incomp_shear_jet/inputs_2d_regression b/Exec/test_problems/incomp_shear_jet/inputs_2d_regression index 9660aa4d7..fb508f27d 100644 --- a/Exec/test_problems/incomp_shear_jet/inputs_2d_regression +++ b/Exec/test_problems/incomp_shear_jet/inputs_2d_regression @@ -15,7 +15,7 @@ maestro.hi_bc = 0 0 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/mach_jet/inputs_2d b/Exec/test_problems/mach_jet/inputs_2d index ec934e5aa..2bffdf822 100644 --- a/Exec/test_problems/mach_jet/inputs_2d +++ b/Exec/test_problems/mach_jet/inputs_2d @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/mach_jet/inputs_2d_stratified b/Exec/test_problems/mach_jet/inputs_2d_stratified index 963dadd85..945a0e40c 100644 --- a/Exec/test_problems/mach_jet/inputs_2d_stratified +++ b/Exec/test_problems/mach_jet/inputs_2d_stratified @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_2d_C b/Exec/test_problems/reacting_bubble/inputs_2d_C index 6e278d6cf..8ec831014 100644 --- a/Exec/test_problems/reacting_bubble/inputs_2d_C +++ b/Exec/test_problems/reacting_bubble/inputs_2d_C @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_2d_C.2levels b/Exec/test_problems/reacting_bubble/inputs_2d_C.2levels index 294bc98b9..2dd0402ca 100644 --- a/Exec/test_problems/reacting_bubble/inputs_2d_C.2levels +++ b/Exec/test_problems/reacting_bubble/inputs_2d_C.2levels @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_2d_C.3levels b/Exec/test_problems/reacting_bubble/inputs_2d_C.3levels index 1a1930372..46a628d1c 100644 --- a/Exec/test_problems/reacting_bubble/inputs_2d_C.3levels +++ b/Exec/test_problems/reacting_bubble/inputs_2d_C.3levels @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_2d_C.avgbase b/Exec/test_problems/reacting_bubble/inputs_2d_C.avgbase index 350bb5042..9397f952f 100644 --- a/Exec/test_problems/reacting_bubble/inputs_2d_C.avgbase +++ b/Exec/test_problems/reacting_bubble/inputs_2d_C.avgbase @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_2d_amr_regression b/Exec/test_problems/reacting_bubble/inputs_2d_amr_regression index 96627e016..d2eb721d8 100644 --- a/Exec/test_problems/reacting_bubble/inputs_2d_amr_regression +++ b/Exec/test_problems/reacting_bubble/inputs_2d_amr_regression @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_2d_dpdt b/Exec/test_problems/reacting_bubble/inputs_2d_dpdt index 97094c9de..3a4e1dd20 100644 --- a/Exec/test_problems/reacting_bubble/inputs_2d_dpdt +++ b/Exec/test_problems/reacting_bubble/inputs_2d_dpdt @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_2d_regression b/Exec/test_problems/reacting_bubble/inputs_2d_regression index 123023275..8533db485 100644 --- a/Exec/test_problems/reacting_bubble/inputs_2d_regression +++ b/Exec/test_problems/reacting_bubble/inputs_2d_regression @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_2d_regression.2levels b/Exec/test_problems/reacting_bubble/inputs_2d_regression.2levels index 31f0037f4..206fa3445 100644 --- a/Exec/test_problems/reacting_bubble/inputs_2d_regression.2levels +++ b/Exec/test_problems/reacting_bubble/inputs_2d_regression.2levels @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_2d_sdc b/Exec/test_problems/reacting_bubble/inputs_2d_sdc index 979b4fb14..0ec6122ad 100644 --- a/Exec/test_problems/reacting_bubble/inputs_2d_sdc +++ b/Exec/test_problems/reacting_bubble/inputs_2d_sdc @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_3d_C b/Exec/test_problems/reacting_bubble/inputs_3d_C index 25c23ff1d..01fae72a7 100644 --- a/Exec/test_problems/reacting_bubble/inputs_3d_C +++ b/Exec/test_problems/reacting_bubble/inputs_3d_C @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_3d_C.2levels b/Exec/test_problems/reacting_bubble/inputs_3d_C.2levels index 26da89f8f..de1138804 100644 --- a/Exec/test_problems/reacting_bubble/inputs_3d_C.2levels +++ b/Exec/test_problems/reacting_bubble/inputs_3d_C.2levels @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_3d_C.3levels b/Exec/test_problems/reacting_bubble/inputs_3d_C.3levels index 13f685bb5..d991b3ed3 100644 --- a/Exec/test_problems/reacting_bubble/inputs_3d_C.3levels +++ b/Exec/test_problems/reacting_bubble/inputs_3d_C.3levels @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_3d_C.avgbase b/Exec/test_problems/reacting_bubble/inputs_3d_C.avgbase index b93a43696..3a5b8c6d4 100644 --- a/Exec/test_problems/reacting_bubble/inputs_3d_C.avgbase +++ b/Exec/test_problems/reacting_bubble/inputs_3d_C.avgbase @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_3d_amr_regression b/Exec/test_problems/reacting_bubble/inputs_3d_amr_regression index 2d3319340..c084c759c 100644 --- a/Exec/test_problems/reacting_bubble/inputs_3d_amr_regression +++ b/Exec/test_problems/reacting_bubble/inputs_3d_amr_regression @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_3d_gpu_regression b/Exec/test_problems/reacting_bubble/inputs_3d_gpu_regression index 0cda79888..160d04bf9 100644 --- a/Exec/test_problems/reacting_bubble/inputs_3d_gpu_regression +++ b/Exec/test_problems/reacting_bubble/inputs_3d_gpu_regression @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_3d_regression b/Exec/test_problems/reacting_bubble/inputs_3d_regression index 8160caa04..ea4633fc9 100644 --- a/Exec/test_problems/reacting_bubble/inputs_3d_regression +++ b/Exec/test_problems/reacting_bubble/inputs_3d_regression @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_3d_sdc b/Exec/test_problems/reacting_bubble/inputs_3d_sdc index 01ebc752e..ed479f9bf 100644 --- a/Exec/test_problems/reacting_bubble/inputs_3d_sdc +++ b/Exec/test_problems/reacting_bubble/inputs_3d_sdc @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_omp_2d_regression b/Exec/test_problems/reacting_bubble/inputs_omp_2d_regression index 907c0c90b..2626a123e 100644 --- a/Exec/test_problems/reacting_bubble/inputs_omp_2d_regression +++ b/Exec/test_problems/reacting_bubble/inputs_omp_2d_regression @@ -18,7 +18,7 @@ maestro.hi_bc = 0 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/inputs_omp_3d_regression b/Exec/test_problems/reacting_bubble/inputs_omp_3d_regression index 87bc98738..d66074c94 100644 --- a/Exec/test_problems/reacting_bubble/inputs_omp_3d_regression +++ b/Exec/test_problems/reacting_bubble/inputs_omp_3d_regression @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d b/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d index 2f5a03a77..a058d5586 100644 --- a/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d +++ b/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x2 b/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x2 index 389f0b36d..8bb3cd209 100644 --- a/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x2 +++ b/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x2 @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x3 b/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x3 index 3d5303d00..e8f0826f4 100644 --- a/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x3 +++ b/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x3 @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x4 b/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x4 index 502a0535f..2114cb5f1 100644 --- a/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x4 +++ b/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x4 @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x5 b/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x5 index 503e82030..4af7f7599 100644 --- a/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x5 +++ b/Exec/test_problems/reacting_bubble/scaling/sc20/inputs_3d_x5 @@ -18,7 +18,7 @@ maestro.hi_bc = 0 0 2 geometry.is_periodic = 1 1 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/rt/inputs_2d_C b/Exec/test_problems/rt/inputs_2d_C index 47f58ff99..25dcc47dd 100644 --- a/Exec/test_problems/rt/inputs_2d_C +++ b/Exec/test_problems/rt/inputs_2d_C @@ -20,7 +20,7 @@ maestro.hi_bc = 0 2 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/rt/inputs_2d_closed_top b/Exec/test_problems/rt/inputs_2d_closed_top index 19ec0ee5b..d3888febe 100644 --- a/Exec/test_problems/rt/inputs_2d_closed_top +++ b/Exec/test_problems/rt/inputs_2d_closed_top @@ -21,7 +21,7 @@ maestro.hi_bc = 0 4 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/rt/inputs_2d_regression b/Exec/test_problems/rt/inputs_2d_regression index 0bd3c7219..2c153970e 100644 --- a/Exec/test_problems/rt/inputs_2d_regression +++ b/Exec/test_problems/rt/inputs_2d_regression @@ -20,7 +20,7 @@ maestro.hi_bc = 0 2 2 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/test_convect/inputs_2d_C b/Exec/test_problems/test_convect/inputs_2d_C index 242220b95..8d74f41a4 100644 --- a/Exec/test_problems/test_convect/inputs_2d_C +++ b/Exec/test_problems/test_convect/inputs_2d_C @@ -56,7 +56,7 @@ geometry.is_periodic = 1 0 maestro.do_heating = true # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 diff --git a/Exec/test_problems/test_convect/inputs_2d_regression b/Exec/test_problems/test_convect/inputs_2d_regression index 6c60f2dae..d26f6d5ca 100644 --- a/Exec/test_problems/test_convect/inputs_2d_regression +++ b/Exec/test_problems/test_convect/inputs_2d_regression @@ -57,7 +57,7 @@ maestro.do_heating = true maestro.use_delta_gamma1_term = false # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 diff --git a/Exec/test_problems/test_planar_diag/inputs_2d_C b/Exec/test_problems/test_planar_diag/inputs_2d_C index 831ae64bc..9132c61a7 100644 --- a/Exec/test_problems/test_planar_diag/inputs_2d_C +++ b/Exec/test_problems/test_planar_diag/inputs_2d_C @@ -20,7 +20,7 @@ maestro.hi_bc = 0 4 4 geometry.is_periodic = 1 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/test_stability/inputs_2d_C b/Exec/test_problems/test_stability/inputs_2d_C index 70be70efe..076465b21 100644 --- a/Exec/test_problems/test_stability/inputs_2d_C +++ b/Exec/test_problems/test_stability/inputs_2d_C @@ -49,7 +49,7 @@ maestro.hi_bc = 4 4 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/test_problems/test_stability/inputs_2d_C_regression b/Exec/test_problems/test_stability/inputs_2d_C_regression index ed3dbe5db..2499cb940 100644 --- a/Exec/test_problems/test_stability/inputs_2d_C_regression +++ b/Exec/test_problems/test_stability/inputs_2d_C_regression @@ -49,7 +49,7 @@ maestro.hi_bc = 4 4 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/Exec/unit_tests/test_advect/inputs_2d b/Exec/unit_tests/test_advect/inputs_2d index c8dedb7bc..c9b3ca58f 100644 --- a/Exec/unit_tests/test_advect/inputs_2d +++ b/Exec/unit_tests/test_advect/inputs_2d @@ -41,7 +41,7 @@ maestro.hi_bc = 0 0 geometry.is_periodic = 1 1 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # HYDRODYNAMICS options maestro.base_cutoff_density = 1.e-10 diff --git a/Exec/unit_tests/test_advect/inputs_3d b/Exec/unit_tests/test_advect/inputs_3d index e3ab5b001..715103a1e 100644 --- a/Exec/unit_tests/test_advect/inputs_3d +++ b/Exec/unit_tests/test_advect/inputs_3d @@ -41,7 +41,7 @@ maestro.hi_bc = 0 0 0 geometry.is_periodic = 1 1 1 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # HYDRODYNAMICS options maestro.base_cutoff_density = 1.e-10 diff --git a/Exec/unit_tests/test_average/inputs_2d_planar b/Exec/unit_tests/test_average/inputs_2d_planar index 78af3c3e6..7cdbfe7bb 100644 --- a/Exec/unit_tests/test_average/inputs_2d_planar +++ b/Exec/unit_tests/test_average/inputs_2d_planar @@ -25,7 +25,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.anelastic_cutoff_density = 3.e6 maestro.base_cutoff_density = 3.e6 diff --git a/Exec/unit_tests/test_average/inputs_3d.128.5dr.eq.dx b/Exec/unit_tests/test_average/inputs_3d.128.5dr.eq.dx index b87ee9f13..dbb9ef09d 100644 --- a/Exec/unit_tests/test_average/inputs_3d.128.5dr.eq.dx +++ b/Exec/unit_tests/test_average/inputs_3d.128.5dr.eq.dx @@ -27,7 +27,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.anelastic_cutoff_density = 3.e6 maestro.base_cutoff_density = 3.e6 diff --git a/Exec/unit_tests/test_basestate/planar-invsq/inputs-planar-invsq b/Exec/unit_tests/test_basestate/planar-invsq/inputs-planar-invsq index b13306914..efaebf4a6 100644 --- a/Exec/unit_tests/test_basestate/planar-invsq/inputs-planar-invsq +++ b/Exec/unit_tests/test_basestate/planar-invsq/inputs-planar-invsq @@ -28,7 +28,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.plot_int = -1 maestro.chk_int = -1 diff --git a/Exec/unit_tests/test_basestate/planar/inputs-planar b/Exec/unit_tests/test_basestate/planar/inputs-planar index 7888cbaad..43bae0855 100644 --- a/Exec/unit_tests/test_basestate/planar/inputs-planar +++ b/Exec/unit_tests/test_basestate/planar/inputs-planar @@ -28,7 +28,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.plot_int = -1 maestro.chk_int = -1 diff --git a/Exec/unit_tests/test_basestate/spherical/inputs-spherical_heat b/Exec/unit_tests/test_basestate/spherical/inputs-spherical_heat index cdd31d144..a5657e7a7 100644 --- a/Exec/unit_tests/test_basestate/spherical/inputs-spherical_heat +++ b/Exec/unit_tests/test_basestate/spherical/inputs-spherical_heat @@ -28,7 +28,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # HYDRODYNAMICS maestro.anelastic_cutoff_density = 1.e6 diff --git a/Exec/unit_tests/test_basestate/sub_chandra/inputs-subchandra b/Exec/unit_tests/test_basestate/sub_chandra/inputs-subchandra index 13456774e..815e0f764 100644 --- a/Exec/unit_tests/test_basestate/sub_chandra/inputs-subchandra +++ b/Exec/unit_tests/test_basestate/sub_chandra/inputs-subchandra @@ -28,7 +28,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.plot_int = -1 maestro.chk_int = -1 diff --git a/Exec/unit_tests/test_basestate/urca/inputs-urca_cold b/Exec/unit_tests/test_basestate/urca/inputs-urca_cold index 1302680c9..942f32be4 100644 --- a/Exec/unit_tests/test_basestate/urca/inputs-urca_cold +++ b/Exec/unit_tests/test_basestate/urca/inputs-urca_cold @@ -28,7 +28,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.plot_int = -1 maestro.chk_int = -1 diff --git a/Exec/unit_tests/test_basestate/urca/inputs-urca_hot b/Exec/unit_tests/test_basestate/urca/inputs-urca_hot index 50037b01b..4f65fff5d 100644 --- a/Exec/unit_tests/test_basestate/urca/inputs-urca_hot +++ b/Exec/unit_tests/test_basestate/urca/inputs-urca_hot @@ -28,7 +28,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.plot_int = -1 maestro.chk_int = -1 diff --git a/Exec/unit_tests/test_basestate/urca/inputs-uref b/Exec/unit_tests/test_basestate/urca/inputs-uref index 9a168f2a2..7e9a4f1bc 100644 --- a/Exec/unit_tests/test_basestate/urca/inputs-uref +++ b/Exec/unit_tests/test_basestate/urca/inputs-uref @@ -28,7 +28,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.plot_int = -1 maestro.chk_int = -1 diff --git a/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e-4 b/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e-4 index e514a90b6..964d385f0 100644 --- a/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e-4 +++ b/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e-4 @@ -28,7 +28,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.plot_int = -1 maestro.chk_int = -1 diff --git a/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e5 b/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e5 index 470d5b008..0d586a225 100644 --- a/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e5 +++ b/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e5 @@ -29,7 +29,7 @@ maestro.hi_bc = 2 2 2 geometry.is_periodic = 0 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.plot_int = -1 maestro.chk_int = -1 diff --git a/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e6 b/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e6 index 6b0b66ed5..81f14debd 100644 --- a/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e6 +++ b/Exec/unit_tests/test_basestate/wdconvect_paper/inputs.rho_cutoff_1.e6 @@ -28,7 +28,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.plot_int = -1 maestro.chk_int = -1 diff --git a/Exec/unit_tests/test_diffusion/inputs_2d b/Exec/unit_tests/test_diffusion/inputs_2d index b82cd4b5f..7c456ff5d 100644 --- a/Exec/unit_tests/test_diffusion/inputs_2d +++ b/Exec/unit_tests/test_diffusion/inputs_2d @@ -39,7 +39,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 0 maestro.cg_verbose = 0 diff --git a/Exec/unit_tests/test_diffusion/inputs_2d-128 b/Exec/unit_tests/test_diffusion/inputs_2d-128 index 8659e0d95..92a48535d 100644 --- a/Exec/unit_tests/test_diffusion/inputs_2d-128 +++ b/Exec/unit_tests/test_diffusion/inputs_2d-128 @@ -40,7 +40,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 0 maestro.cg_verbose = 0 diff --git a/Exec/unit_tests/test_diffusion/inputs_2d-256 b/Exec/unit_tests/test_diffusion/inputs_2d-256 index 56e6b7287..a7537c4ee 100644 --- a/Exec/unit_tests/test_diffusion/inputs_2d-256 +++ b/Exec/unit_tests/test_diffusion/inputs_2d-256 @@ -40,7 +40,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 0 maestro.cg_verbose = 0 diff --git a/Exec/unit_tests/test_diffusion/inputs_2d-32 b/Exec/unit_tests/test_diffusion/inputs_2d-32 index a6963a3e3..3a2862eec 100644 --- a/Exec/unit_tests/test_diffusion/inputs_2d-32 +++ b/Exec/unit_tests/test_diffusion/inputs_2d-32 @@ -40,7 +40,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 0 maestro.cg_verbose = 0 diff --git a/Exec/unit_tests/test_diffusion/inputs_2d-64 b/Exec/unit_tests/test_diffusion/inputs_2d-64 index 6957a6c58..5e820b415 100644 --- a/Exec/unit_tests/test_diffusion/inputs_2d-64 +++ b/Exec/unit_tests/test_diffusion/inputs_2d-64 @@ -40,7 +40,7 @@ maestro.hi_bc = 2 2 geometry.is_periodic = 0 0 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity maestro.mg_verbose = 0 maestro.cg_verbose = 0 diff --git a/Exec/unit_tests/test_eos/inputs_eos.gammalaw b/Exec/unit_tests/test_eos/inputs_eos.gammalaw index dfc015313..5ae30a902 100644 --- a/Exec/unit_tests/test_eos/inputs_eos.gammalaw +++ b/Exec/unit_tests/test_eos/inputs_eos.gammalaw @@ -15,7 +15,7 @@ maestro.hi_bc = 0 0 0 geometry.is_periodic = 1 1 1 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # EOS parameters maestro.small_temp = 1.e5 diff --git a/Exec/unit_tests/test_eos/inputs_eos.helmeos b/Exec/unit_tests/test_eos/inputs_eos.helmeos index dfc015313..5ae30a902 100644 --- a/Exec/unit_tests/test_eos/inputs_eos.helmeos +++ b/Exec/unit_tests/test_eos/inputs_eos.helmeos @@ -15,7 +15,7 @@ maestro.hi_bc = 0 0 0 geometry.is_periodic = 1 1 1 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # EOS parameters maestro.small_temp = 1.e5 diff --git a/Exec/unit_tests/test_projection/inputs_2d_per b/Exec/unit_tests/test_projection/inputs_2d_per index 093e6dc02..4b7169b36 100644 --- a/Exec/unit_tests/test_projection/inputs_2d_per +++ b/Exec/unit_tests/test_projection/inputs_2d_per @@ -20,7 +20,7 @@ maestro.max_step = 1 maestro.plot_base_name = nodal_per # root name of plot file # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 diff --git a/Exec/unit_tests/test_projection/inputs_2d_per.cross b/Exec/unit_tests/test_projection/inputs_2d_per.cross index b525f73a2..1d8bf46b6 100644 --- a/Exec/unit_tests/test_projection/inputs_2d_per.cross +++ b/Exec/unit_tests/test_projection/inputs_2d_per.cross @@ -20,7 +20,7 @@ maestro.max_step = 1 maestro.plot_base_name = cross_per # root name of plot file # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 diff --git a/Exec/unit_tests/test_projection/inputs_2d_per_mac b/Exec/unit_tests/test_projection/inputs_2d_per_mac index 2699aa816..16b979e85 100644 --- a/Exec/unit_tests/test_projection/inputs_2d_per_mac +++ b/Exec/unit_tests/test_projection/inputs_2d_per_mac @@ -22,7 +22,7 @@ maestro.max_step = 1 maestro.plot_base_name = mac_per # root name of plot file # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 diff --git a/Exec/unit_tests/test_projection/inputs_2d_wall b/Exec/unit_tests/test_projection/inputs_2d_wall index e7060f548..8ac28b888 100644 --- a/Exec/unit_tests/test_projection/inputs_2d_wall +++ b/Exec/unit_tests/test_projection/inputs_2d_wall @@ -20,7 +20,7 @@ maestro.max_step = 1 maestro.plot_base_name = nodal_wall # root name of plot file # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-11 diff --git a/Exec/unit_tests/test_projection/inputs_2d_wall.cross b/Exec/unit_tests/test_projection/inputs_2d_wall.cross index 23aba3ee0..2c580b3ae 100644 --- a/Exec/unit_tests/test_projection/inputs_2d_wall.cross +++ b/Exec/unit_tests/test_projection/inputs_2d_wall.cross @@ -22,7 +22,7 @@ maestro.max_step = 1 maestro.plot_base_name = cross_wall # root name of plot file # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 diff --git a/Exec/unit_tests/test_projection/inputs_2d_wall_mac b/Exec/unit_tests/test_projection/inputs_2d_wall_mac index e0844cdd7..0337d9977 100644 --- a/Exec/unit_tests/test_projection/inputs_2d_wall_mac +++ b/Exec/unit_tests/test_projection/inputs_2d_wall_mac @@ -20,7 +20,7 @@ maestro.max_step = 1 maestro.plot_base_name = mac_wall # root name of plot file # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 diff --git a/Exec/unit_tests/test_projection/inputs_3d_per b/Exec/unit_tests/test_projection/inputs_3d_per index 5905666d5..65b8112b9 100644 --- a/Exec/unit_tests/test_projection/inputs_3d_per +++ b/Exec/unit_tests/test_projection/inputs_3d_per @@ -17,7 +17,7 @@ geometry.is_periodic = 1 1 1 maestro.max_step = 1 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 diff --git a/Exec/unit_tests/test_projection/inputs_3d_per_mac b/Exec/unit_tests/test_projection/inputs_3d_per_mac index 31eda1750..8b8e02686 100644 --- a/Exec/unit_tests/test_projection/inputs_3d_per_mac +++ b/Exec/unit_tests/test_projection/inputs_3d_per_mac @@ -18,7 +18,7 @@ geometry.is_periodic = 1 1 1 maestro.max_step = 1 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 diff --git a/Exec/unit_tests/test_projection/inputs_3d_wall b/Exec/unit_tests/test_projection/inputs_3d_wall index 64e00ed6c..07b1ad6c3 100644 --- a/Exec/unit_tests/test_projection/inputs_3d_wall +++ b/Exec/unit_tests/test_projection/inputs_3d_wall @@ -17,7 +17,7 @@ geometry.is_periodic = 0 0 0 maestro.max_step = 1 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 diff --git a/Exec/unit_tests/test_projection/inputs_3d_wall_mac b/Exec/unit_tests/test_projection/inputs_3d_wall_mac index 31dddbce1..ddef33637 100644 --- a/Exec/unit_tests/test_projection/inputs_3d_wall_mac +++ b/Exec/unit_tests/test_projection/inputs_3d_wall_mac @@ -17,7 +17,7 @@ geometry.is_periodic = 0 0 0 maestro.max_step = 1 # VERBOSITY -maestro.v = 1 # verbosity +maestro.maestro_verbose = 1 # verbosity # tolerances for the initial projection maestro.eps_init_proj_cart = 1.e-12 From ccc6a15cb226130afbf26cca434dd287caff0dce Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 09:42:10 -0400 Subject: [PATCH 03/13] add CI --- .github/workflows/check-params.yml | 37 +++++++++++++++ .github/workflows/check_params.py | 74 ++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 .github/workflows/check-params.yml create mode 100644 .github/workflows/check_params.py diff --git a/.github/workflows/check-params.yml b/.github/workflows/check-params.yml new file mode 100644 index 000000000..992e6b9be --- /dev/null +++ b/.github/workflows/check-params.yml @@ -0,0 +1,37 @@ +name: check runtime params + +on: + push: + branches: + - development + - main + pull_request: + branches: + - development + +jobs: + check-runtime-params: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Get submodules + run: | + git submodule update --init + cd external/Microphysics + git fetch; git checkout development + cd ../amrex + git fetch; git checkout development + cd ../.. + + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: '3.11' + + - name: Run check-params + run: | + PYTHONPATH=external/Microphysics/util/build_scripts python .github/workflows/check_params.py . diff --git a/.github/workflows/check_params.py b/.github/workflows/check_params.py new file mode 100644 index 000000000..cfcc10794 --- /dev/null +++ b/.github/workflows/check_params.py @@ -0,0 +1,74 @@ +import argparse +import importlib +import os +import re +from pathlib import Path +import sys + +# some parameters that are not defined in _cpp_parameters + +whitelist = ["maestro.lo_bc", + "maestro.hi_bc"] + +# we don't have all of the radiation parametrs in the _cpp_parameters +# yet, so we won't check these namespaces + +namespace_ignore = [] + +def doit(maestroex_dir): + + maestroex = Path(os.path.abspath(maestroex_dir)) + + # import the module that defines the MAESTROeX runtime params + sys.path.append(str(maestroex / "Source" / "param/")) + import parse_maestro_params + + # read in the parameters defined in _cpp_parameters + param_file = maestroex / "Source" / "param" / "_cpp_parameters" + params = parse_maestro_params.read_param_file(str(param_file)) + + namespaces = set(p.namespace for p in params) + runtime_parameters = [f"{p.namespace}.{p.name}" for p in params] + + pattern = re.compile(r"[A-Za-z0-9_]+\.[A-Za-z0-9_]+", re.IGNORECASE) + + # loop over all the inputs files + exec_path = maestroex / "Exec" + for f in exec_path.glob("**/inputs*"): + + if os.path.isdir(f): + continue + + # find all the params in each namespace + with open(f) as infile: + print(f"working on {f}") + for line in infile: + # remove comments + idx = line.find("#") + if idx > 0: + line = line[:idx] + + found_param = pattern.match(line) + if not found_param: + continue + + p = found_param.group(0) + nm = p.split(".")[0] + if nm in namespaces and nm not in namespace_ignore: + if not (p in runtime_parameters or p in whitelist): + sys.exit(f"Error: {p} not valid") + + +if __name__ == "__main__": + + # we need the top-level Castro directory + + p = argparse.ArgumentParser() + p.add_argument("maestroex_dir", type=str, nargs=1, + help="top level MAESTROeX directory") + + args = p.parse_args() + + doit(args.maestroex_dir[0]) + + From dca1ed9ac3bfda270b0a2b4fb9104f704252e950 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 13:57:38 -0400 Subject: [PATCH 04/13] Update .github/workflows/check_params.py Co-authored-by: Brendan Boyd <42776109+biboyd@users.noreply.github.com> --- .github/workflows/check_params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_params.py b/.github/workflows/check_params.py index cfcc10794..130c4533b 100644 --- a/.github/workflows/check_params.py +++ b/.github/workflows/check_params.py @@ -61,7 +61,7 @@ def doit(maestroex_dir): if __name__ == "__main__": - # we need the top-level Castro directory + # we need the top-level MAESTROeX directory p = argparse.ArgumentParser() p.add_argument("maestroex_dir", type=str, nargs=1, From 4a8a2cfa163fa5d95917246d619f18722fa41eca Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 13:57:45 -0400 Subject: [PATCH 05/13] Update Exec/science/flame/inputs_2d_smallscale.2levels Co-authored-by: Brendan Boyd <42776109+biboyd@users.noreply.github.com> --- Exec/science/flame/inputs_2d_smallscale.2levels | 1 - 1 file changed, 1 deletion(-) diff --git a/Exec/science/flame/inputs_2d_smallscale.2levels b/Exec/science/flame/inputs_2d_smallscale.2levels index 2ebb44b78..a004bfb10 100644 --- a/Exec/science/flame/inputs_2d_smallscale.2levels +++ b/Exec/science/flame/inputs_2d_smallscale.2levels @@ -30,7 +30,6 @@ amr.ref_ratio = 2 2 2 2 2 2 # refinement ratio amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids -# TAGGING # TIME STEPPING maestro.max_step = 30000000 From 857305f31c39e23dbb89f32a53dc45c0a65edb3e Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 13:57:51 -0400 Subject: [PATCH 06/13] Update Exec/science/flame/inputs_2d_smallscale Co-authored-by: Brendan Boyd <42776109+biboyd@users.noreply.github.com> --- Exec/science/flame/inputs_2d_smallscale | 1 - 1 file changed, 1 deletion(-) diff --git a/Exec/science/flame/inputs_2d_smallscale b/Exec/science/flame/inputs_2d_smallscale index 642f79f7b..9cf9b9f8b 100644 --- a/Exec/science/flame/inputs_2d_smallscale +++ b/Exec/science/flame/inputs_2d_smallscale @@ -30,7 +30,6 @@ amr.ref_ratio = 2 2 2 2 2 2 # refinement ratio amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids -# TAGGING # TIME STEPPING maestro.max_step = 300000 From 6345970cf9a6ea19f1b59441de2b08e7726480fd Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 13:57:56 -0400 Subject: [PATCH 07/13] Update Exec/science/flame/inputs_2d_smallscale.testsuite Co-authored-by: Brendan Boyd <42776109+biboyd@users.noreply.github.com> --- Exec/science/flame/inputs_2d_smallscale.testsuite | 1 - 1 file changed, 1 deletion(-) diff --git a/Exec/science/flame/inputs_2d_smallscale.testsuite b/Exec/science/flame/inputs_2d_smallscale.testsuite index 4aef83f45..b3d181776 100644 --- a/Exec/science/flame/inputs_2d_smallscale.testsuite +++ b/Exec/science/flame/inputs_2d_smallscale.testsuite @@ -30,7 +30,6 @@ amr.ref_ratio = 2 2 2 2 2 2 # refinement ratio amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids -# TAGGING # TIME STEPPING maestro.max_step = 20 From cdaecfebdde9cd0161493ac767d844cfa6ac9b38 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 13:58:01 -0400 Subject: [PATCH 08/13] Update Exec/science/flame/inputs_3d_smallscale Co-authored-by: Brendan Boyd <42776109+biboyd@users.noreply.github.com> --- Exec/science/flame/inputs_3d_smallscale | 1 - 1 file changed, 1 deletion(-) diff --git a/Exec/science/flame/inputs_3d_smallscale b/Exec/science/flame/inputs_3d_smallscale index 77dfe12a2..06a9e1991 100644 --- a/Exec/science/flame/inputs_3d_smallscale +++ b/Exec/science/flame/inputs_3d_smallscale @@ -30,7 +30,6 @@ amr.ref_ratio = 2 2 2 2 2 2 # refinement ratio amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids -# TAGGING # TIME STEPPING maestro.max_step = 200 From 8691c821e376070dcb9d574e259820b9a021d921 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 13:58:07 -0400 Subject: [PATCH 09/13] Update Exec/science/sub_chandra/inputs_3d Co-authored-by: Brendan Boyd <42776109+biboyd@users.noreply.github.com> --- Exec/science/sub_chandra/inputs_3d | 1 - 1 file changed, 1 deletion(-) diff --git a/Exec/science/sub_chandra/inputs_3d b/Exec/science/sub_chandra/inputs_3d index affa30501..58c1236e4 100644 --- a/Exec/science/sub_chandra/inputs_3d +++ b/Exec/science/sub_chandra/inputs_3d @@ -32,7 +32,6 @@ amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids maestro.octant = true -# TAGGING # TIME STEPPING maestro.max_step = 100 From bd830dfe943d482ed84f671fa55005c80c0bf2bb Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 13:58:13 -0400 Subject: [PATCH 10/13] Update Exec/science/flame/inputs_3d_smallscale.testsuite Co-authored-by: Brendan Boyd <42776109+biboyd@users.noreply.github.com> --- Exec/science/flame/inputs_3d_smallscale.testsuite | 1 - 1 file changed, 1 deletion(-) diff --git a/Exec/science/flame/inputs_3d_smallscale.testsuite b/Exec/science/flame/inputs_3d_smallscale.testsuite index f6b3883fe..fa245cda2 100644 --- a/Exec/science/flame/inputs_3d_smallscale.testsuite +++ b/Exec/science/flame/inputs_3d_smallscale.testsuite @@ -30,7 +30,6 @@ amr.ref_ratio = 2 2 2 2 2 2 # refinement ratio amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids -# TAGGING # TIME STEPPING maestro.max_step = 20 From 768cab25148166597ff1651c3be4cf618236f072 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 13:58:19 -0400 Subject: [PATCH 11/13] Update Exec/science/toy_convect/inputs_2d Co-authored-by: Brendan Boyd <42776109+biboyd@users.noreply.github.com> --- Exec/science/toy_convect/inputs_2d | 1 - 1 file changed, 1 deletion(-) diff --git a/Exec/science/toy_convect/inputs_2d b/Exec/science/toy_convect/inputs_2d index 3b95dc293..8d0e82b3f 100644 --- a/Exec/science/toy_convect/inputs_2d +++ b/Exec/science/toy_convect/inputs_2d @@ -29,7 +29,6 @@ amr.ref_ratio = 2 2 2 2 2 2 # refinement ratio amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids -# TAGGING # TIME STEPPING maestro.max_step = 30000000 From 80445aa84d1987fc689d4c148b2e484aa0391d20 Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 13:58:25 -0400 Subject: [PATCH 12/13] Update Exec/science/xrb_layered/inputs Co-authored-by: Brendan Boyd <42776109+biboyd@users.noreply.github.com> --- Exec/science/xrb_layered/inputs | 1 - 1 file changed, 1 deletion(-) diff --git a/Exec/science/xrb_layered/inputs b/Exec/science/xrb_layered/inputs index 1a134d32c..fbc1f4693 100644 --- a/Exec/science/xrb_layered/inputs +++ b/Exec/science/xrb_layered/inputs @@ -34,7 +34,6 @@ amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > amr.v = 1 # AMR verbosity -# TAGGING # TIME STEPPING maestro.max_step = 30000000 From eb940e196a44544809f94c46432744c5c150402b Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Thu, 16 May 2024 13:58:32 -0400 Subject: [PATCH 13/13] Update Exec/science/xrb_mixed/inputs_2d.rprox Co-authored-by: Brendan Boyd <42776109+biboyd@users.noreply.github.com> --- Exec/science/xrb_mixed/inputs_2d.rprox | 1 - 1 file changed, 1 deletion(-) diff --git a/Exec/science/xrb_mixed/inputs_2d.rprox b/Exec/science/xrb_mixed/inputs_2d.rprox index 5082db620..45df2851b 100644 --- a/Exec/science/xrb_mixed/inputs_2d.rprox +++ b/Exec/science/xrb_mixed/inputs_2d.rprox @@ -31,7 +31,6 @@ amr.ref_ratio = 2 2 2 2 2 2 # refinement ratio amr.blocking_factor = 8 # block factor in grid generation amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > ngrids -# TAGGING # TIME STEPPING