fix retry timelevels when amr.subcycle_mode = None (#2821)

when we are not doing AMR subcycling and trigger a retry, we will advance all levels again at the new timestep. However, we were not properly resetting the timelevels in the StateData to reflect the new subcycled timestep.
AMReX-Astro · Apr 11, 2024 · 3d76cd5 · 3d76cd5
1 parent 88d4976
commit 3d76cd5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 25 deletions.
diff --git a/Exec/science/wdmerger/ci-benchmarks/wdmerger_collision_2D.out b/Exec/science/wdmerger/ci-benchmarks/wdmerger_collision_2D.out
@@ -1,29 +1,29 @@
  plotfile = plt00095
  time = 1.25
               variables          minimum value          maximum value
- density                      8.7136170328e-05           13347626.831
- xmom                        -4.4623942798e+14       1.4982725823e+15
- ymom                        -1.8879302767e+15        1.980304858e+15
+ density                      8.7135211913e-05           13353524.435
+ xmom                        -4.4634547423e+14       1.4982445308e+15
+ ymom                        -1.8881098335e+15       1.9802028197e+15
  zmom                                        0                      0
- rho_E                        7.7948360809e+11         5.64675518e+24
- rho_e                        7.4322366401e+11       5.6244082614e+24
- Temp                                   100000           3969215375.1
- rho_He4                      8.7136170328e-17           1473.6068478
- rho_C12                      3.4854468131e-05           5028784.2519
- rho_O16                      5.2281702196e-05           7774667.7686
- rho_Ne20                     8.7136170328e-17           448739.14288
- rho_Mg24                     8.7136170328e-17           1131012.4412
- rho_Si28                     8.7136170328e-17           4244213.8084
- rho_S32                      8.7136170328e-17           2178795.6667
- rho_Ar36                     8.7136170328e-17           496791.83986
- rho_Ca40                     8.7136170328e-17           381536.89513
- rho_Ti44                     8.7136170328e-17           1576.1652647
- rho_Cr48                     8.7136170328e-17           1467.4931808
- rho_Fe52                     8.7136170328e-17           14841.830382
- rho_Ni56                     8.7136170328e-17           182905.91385
- phiGrav                     -4.6146743474e+17      -2.2055817929e+16
- grav_x                          -461199998.92           -48603.52543
- grav_y                          -444710966.19           392312565.37
+ rho_E                        7.6866508899e+11       5.6480764484e+24
+ rho_e                        7.3273369729e+11       5.6257109543e+24
+ Temp                                   100000           3970499251.5
+ rho_He4                      8.7135211913e-17            1472.557835
+ rho_C12                      3.4854084765e-05           5034202.6702
+ rho_O16                      5.2281127147e-05           7781357.4533
+ rho_Ne20                     8.7135211913e-17           643712.05721
+ rho_Mg24                     8.7135211913e-17           1137247.8977
+ rho_Si28                     8.7135211913e-17           4245283.1554
+ rho_S32                      8.7135211913e-17           2178470.1687
+ rho_Ar36                     8.7135211913e-17           497477.29422
+ rho_Ca40                     8.7135211913e-17           382010.10154
+ rho_Ti44                     8.7135211913e-17           1577.2314864
+ rho_Cr48                     8.7135211913e-17           1468.2939271
+ rho_Fe52                     8.7135211913e-17           14839.719434
+ rho_Ni56                     8.7135211913e-17           182888.36194
+ phiGrav                      -4.614866944e+17      -2.2055818115e+16
+ grav_x                          -461232534.93          -48603.543258
+ grav_y                          -444759175.11           392332867.05
  grav_z                                      0                      0
- rho_enuc                    -7.4954583352e+21       6.7150736332e+26
+ rho_enuc                     -7.502262752e+21       6.4140001008e+26
 
diff --git a/Source/driver/Castro_advance_ctu.cpp b/Source/driver/Castro_advance_ctu.cpp
@@ -346,8 +346,10 @@ Castro::subcycle_advance_ctu(const Real time, const Real dt, int amr_iteration,
 
         // Set the relevant time levels.
 
-        for (int k = 0; k < num_state_type; k++) {
-          state[k].setTimeLevel(subcycle_time + dt_subcycle, dt_subcycle, 0.0);
+        for (int lev = level; lev <= max_level_to_advance; ++lev) {
+            for (int k = 0; k < num_state_type; k++) {
+                getLevel(lev).state[k].setTimeLevel(subcycle_time + dt_subcycle, dt_subcycle, 0.0);
+            }
         }
 
         // Do the advance and construct the relevant source terms. For CTU this