Fix moist bubble input file and enable in 3d

E3SM-Project · Nov 28, 2023 · 268236f · 268236f
1 parent 0e540b4
commit 268236f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/dynamics/spam/src/models/extrudedmodel.h b/dynamics/spam/src/models/extrudedmodel.h
@@ -5196,7 +5196,12 @@ struct MoistRisingBubble : public RisingBubble<false> {
 
   static real YAKL_INLINE rhov_f(real x, real y, real z,
                                  const ThermoPotential &thermo) {
-    real r = sqrt((x - xc) * (x - xc) + (z - bzc) * (z - bzc));
+    real r = (x - xc) * (x - xc) + (z - bzc) * (z - bzc);
+    if (ndims > 1) {
+      r += (y - yc) * (y - yc);
+    }
+    r = std::sqrt(r);
+
     real rh = (r < rc) ? rh0 * 0.5_fp * (1._fp + cos(pi * r / rc)) : 0._fp;
     real Th = isentropic_T(z, theta0, g, thermo);
     real svp = saturation_vapor_pressure(Th);

diff --git a/standalone/mmf_simplified/inputs/pamc_idealized/pamc_input_extruded_moistrisingbubble.yaml b/standalone/mmf_simplified/inputs/pamc_idealized/pamc_input_extruded_moistrisingbubble.yaml
@@ -1,7 +1,8 @@
 idealized : true
 verbose : true
+couple_wind : false
 
-sim_steps : 500
+sim_time : 500
 
 # Number of cells to use
 crm_nx : 100
@@ -27,7 +28,7 @@ dycore_out_prefix : test_dycore
 out_freq : 50
 stat_freq : 5
 
-tstype: si
+tstype: ssprk3
 
 # Number of ensembles
 nens : 1