From 8ed72a957a36be3073d59b552559e6812d6d35f5 Mon Sep 17 00:00:00 2001 From: Doreen Fan Date: Thu, 3 Sep 2020 13:59:59 -0700 Subject: [PATCH] Update AMReX and Microphysics to release 20.09 --- Exec/science/flame/inputs_2d_smallscale_sdc | 6 +++--- Exec/science/fully_convective_star/inputs_3d | 4 ++-- Exec/test_problems/mach_jet/inputs_2d | 1 + external/Microphysics | 2 +- external/amrex | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Exec/science/flame/inputs_2d_smallscale_sdc b/Exec/science/flame/inputs_2d_smallscale_sdc index fe9f56705..9de7d7bba 100644 --- a/Exec/science/flame/inputs_2d_smallscale_sdc +++ b/Exec/science/flame/inputs_2d_smallscale_sdc @@ -7,7 +7,7 @@ maestro.drdxfac = 5 # PROBLEM SIZE geometry.prob_lo = 0.0 0.0 -geometry.prob_hi = 0.625e0 5.e0 +geometry.prob_hi = 0.3125e0 2.5e0 # BOUNDARY CONDITIONS # 0 = Interior 3 = Symmetry @@ -24,7 +24,7 @@ maestro.v = 1 # verbosity amrex.fpe_trap_invalid = 1 # floating point exception # GRIDDING AND REFINEMENT -amr.n_cell = 128 1024 +amr.n_cell = 64 512 amr.max_grid_size = 64 amr.max_level = 0 # maximum level number allowed maestro.regrid_int = 2 # how often to regrid @@ -70,7 +70,7 @@ 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_int = 1 # number of timesteps between plot files maestro.plot_deltat = 1.e-5 # CHECKPOINT diff --git a/Exec/science/fully_convective_star/inputs_3d b/Exec/science/fully_convective_star/inputs_3d index 1c50c60d5..d8f806c06 100644 --- a/Exec/science/fully_convective_star/inputs_3d +++ b/Exec/science/fully_convective_star/inputs_3d @@ -36,7 +36,7 @@ amr.refine_grid_layout = 0 # chop grids up into smaller grids if nprocs > maestro.octant = false # TIME STEPPING -maestro.max_step = 0 +maestro.max_step = 10 maestro.stop_time = 3000000. maestro.cfl = 0.7 # cfl number for hyperbolic system # In this test problem, the velocity is @@ -71,7 +71,7 @@ maestro.do_heating = true # PLOTFILES maestro.plot_base_name = plt # root name of plot file -maestro.plot_int = 100 # number of timesteps between plot files +maestro.plot_int = 5 # number of timesteps between plot files maestro.plot_deltat = -1. amr.small_plot_vars = rho Pi p0 tpert circ_velocity radial_velocity maestro.plot_Hext = true diff --git a/Exec/test_problems/mach_jet/inputs_2d b/Exec/test_problems/mach_jet/inputs_2d index 0ae37c435..49c4a6a17 100644 --- a/Exec/test_problems/mach_jet/inputs_2d +++ b/Exec/test_problems/mach_jet/inputs_2d @@ -19,6 +19,7 @@ geometry.is_periodic = 1 0 # VERBOSITY maestro.v = 1 # verbosity +maestro.mg_verbose = 2 # DEBUG FOR NAN amrex.fpe_trap_invalid = 1 # floating point exception diff --git a/external/Microphysics b/external/Microphysics index 5fd40ccef..0fbd83936 160000 --- a/external/Microphysics +++ b/external/Microphysics @@ -1 +1 @@ -Subproject commit 5fd40ccef9ded0ec806dd41c6718ef07d8b28cc5 +Subproject commit 0fbd83936e00301f7eb90636a68926a50c18475b diff --git a/external/amrex b/external/amrex index ca12febf1..e34912f3b 160000 --- a/external/amrex +++ b/external/amrex @@ -1 +1 @@ -Subproject commit ca12febf19571d51a4cb7f164f25ed2a17f194ca +Subproject commit e34912f3bc26d532fa9c3ee608ec5e50c4ce26f9