Merge branch 'development' into 2d_spherical_ptheta

CHANGES.md

@@ -1,3 +1,24 @@
+# 24.10
+
+  * update initial model for `subchandra` when doing ASE NSE (#2970)
+
+  * `massive_star` plot tweaks (#2968)
+
+  * start of work on 2D spherical geometry (#2953, #2954, #2955,
+    #2957, #2958, #2959, #2961, #2962, #2964, #2965)
+
+  * the gresho problem now takes Mach number instead of p0 as input
+    (#2951m #2963)
+
+  * the PPM geometric source terms in the normal predictor are now
+    traced to the interfaces (#2473)
+
+  * `subch_planar` now works in 1D (#2952)
+
+  * remove old `get_const_grav()` function (#2956)
+
+  * clang-tidy fixes to radiation (#2950)
+
 # 24.09
 
   * Code clean-ups / clang-tidy (#2942, #2949)
@@ -9,7 +30,7 @@
 
   * new Frontier scaling numbers (#2948)
 
-  * more GPU error printing (@3944)
+  * more GPU error printing (#2944)
 
   * science problem updates: `flame_wave` (#2943)
 

Exec/science/massive_star/analysis/initial_model.py

@@ -45,8 +45,8 @@ def find_r_for_rho(r, rho, rho_want):
 fig = plt.figure()
 ax = fig.add_subplot(211)
 
-l1 = ax.plot(data[:,0], data[:,idens], label="density")
-l2 = ax.plot(data[:,0], data[:,itemp], label="temperature")
+l1 = ax.plot(data[:,0], data[:,idens], label=r"$\rho$")
+l2 = ax.plot(data[:,0], data[:,itemp], label="$T$")
 
 # show where the refinement kicks in
 rho_refine = 2.e4
@@ -72,12 +72,12 @@ def find_r_for_rho(r, rho, rho_want):
 
 ax2.set_ylabel(r"$Y_e$")
 
-l3 = ax2.plot(data[:,0], data[:,iye], color="C2", label="Ye")
+l3 = ax2.plot(data[:,0], data[:,iye], color="C2", label="$Y_e$")
 
 lns = l1 + l2 + l3
 labs = [l.get_label() for l in lns]
 
-ax.legend(lns, labs, frameon=False, loc=6)
+ax.legend(lns, labs, frameon=False, loc=6, fontsize="small")
 
 # species plot
 
@@ -119,11 +119,10 @@ def find_r_for_rho(r, rho, rho_want):
 
 ax.grid(color="b", alpha=0.5, ls=":")
 
-ax.legend(frameon=True, edgecolor="w", ncol=1, framealpha=0.5)
+ax.legend(frameon=True, edgecolor="w", ncol=1, framealpha=0.5, fontsize="small")
 
-fig.set_size_inches((8, 12))
+fig.set_size_inches((6, 9))
 
 fig.tight_layout()
 
 fig.savefig("initial_model.pdf")
-

Exec/science/subchandra/GNUmakefile.nse_net

@@ -7,22 +7,23 @@ DEBUG      = FALSE
 
 DIM        = 2
 
-COMP	   = gnu
+COMP       = gnu
 
 USE_MPI    = TRUE
 
 USE_GRAV   = TRUE
 USE_REACT  = TRUE
 
 USE_NSE_NET = TRUE
+USE_SIMPLIFIED_SDC = TRUE
 
 USE_MODEL_PARSER = TRUE
 
 # This sets the EOS directory in $(MICROPHYSICS_HOME)/eos
 EOS_DIR     := helmholtz
 
 # This sets the network directory in $(MICROPHYSICS_HOME)/networks
-NETWORK_DIR := ase
+NETWORK_DIR := subch_base
 SCREEN_METHOD = chabrier1998
 
 INTEGRATOR_DIR := VODE

Source/driver/Castro.cpp

@@ -306,7 +306,15 @@ Castro::read_params ()
 #elif (AMREX_SPACEDIM == 2)
     if ( dgeom.IsSPHERICAL() )
       {
-        amrex::Abort("We don't support spherical coordinate systems in 2D");
+        if ( (dgeom.ProbLo(1) < 0.0_rt) && (dgeom.ProbHi(1) > M_PI) )
+        {
+          amrex::Abort("Theta must be within [0, Pi] for spherical coordinate system in 2D");
+        }
+
+        if ( dgeom.ProbLo(0) < static_cast<Real>(NUM_GROW) * dgeom.CellSize(0) )
+        {
+          amrex::Abort("R-min must be large enough so ghost cells doesn't extend to negative R");
+        }
       }
 #elif (AMREX_SPACEDIM == 3)
     if ( dgeom.IsRZ() )

Source/gravity/Gravity.cpp

@@ -121,13 +121,6 @@ Gravity::read_params ()
                 amrex::Abort("Options are ConstantGrav, PoissonGrav, or MonopoleGrav");
              }
 
-        if (  gravity::gravity_type == "ConstantGrav")
-        {
-          if ( dgeom.IsSPHERICAL() ) {
-              amrex::Abort("Can't use constant direction gravity with non-Cartesian coordinates");
-          }
-        }
-
 #if (AMREX_SPACEDIM == 1)
         if (gravity::gravity_type == "PoissonGrav")
         {