Merge pull request #734 from GEOS-ESM/feature/sdrabenh/v11rc1_updates_v3

Mar 31 updates for GCM v11.0.0-rc.1
GEOS-ESM · Apr 7, 2023 · 10b38b8 · 10b38b8
2 parents 4e90035 + d643a2c
commit 10b38b8
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/gfdl_cloud_microphys.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/gfdl_cloud_microphys.F90
@@ -471,7 +471,7 @@ subroutine gfdl_cloud_microphys_driver (qv, ql, qr, qi, qs, qg, qa, qn,   &
     ! -----------------------------------------------------------------------
 
     do j = js, je
-        call mpdrv (hydrostatic, uin, vin, w, delp, pt, qv, ql, qr, qi, qs, qg,&
+        call mpdrv (phys_hydrostatic, hydrostatic, uin, vin, w, delp, pt, qv, ql, qr, qi, qs, qg,&
             qa, qn, qicn, qlcn, clcn, dz, is, ie, js, je, ks, ke, ktop, kbot, j, dt_in, ntimes,  &
             rain (:, j), snow (:, j), graupel (:, j), ice (:, j), m2_rain,     &
             m2_sol, cond (:, j), area (:, j),                                  &
@@ -622,7 +622,7 @@ end subroutine gfdl_cloud_microphys_driver
 !>@param 5) qs: snow (kg / kg)
 !>@param 6) qg: graupel (kg / kg)
 ! -----------------------------------------------------------------------
-subroutine mpdrv (hydrostatic, uin, vin, w, delp, pt, qv, ql, qr, qi, qs,     &
+subroutine mpdrv (phys_hydrostatic, hydrostatic, uin, vin, w, delp, pt, qv, ql, qr, qi, qs,     &
         qg, qa, qn, qicn, qlcn, clcn, dz, is, ie, js, je, ks, ke, ktop, kbot, j, dt_in, ntimes, &
         rain, snow, graupel, ice, m2_rain, m2_sol, cond, area1, land, &
         cnv_fraction, srf_type, eis, rhcrit, anv_icefall, lsc_icefall, revap, isubl,                 &
@@ -631,7 +631,7 @@ subroutine mpdrv (hydrostatic, uin, vin, w, delp, pt, qv, ql, qr, qi, qs,     &
 
     implicit none
 
-    logical, intent (in) :: hydrostatic
+    logical, intent (in) :: phys_hydrostatic, hydrostatic
 
     integer, intent (in) :: j, is, ie, js, je, ks, ke
     integer, intent (in) :: ntimes, ktop, kbot
@@ -815,13 +815,20 @@ subroutine mpdrv (hydrostatic, uin, vin, w, delp, pt, qv, ql, qr, qi, qs,     &
             ! -----------------------------------------------------------------------
             ! dry air density
             ! -----------------------------------------------------------------------
-
-            do k = ktop, kbot
-                dz1 (k) = dz0 (k)
-                den (k) = den0 (k) ! dry air density remains the same
-                denfac (k) = sqrt ( den(kbot) / den (k))
-            enddo
-
+            if (phys_hydrostatic .or. hydrostatic) then
+                do k = ktop, kbot
+                    dz1 (k) = dz0 (k) * tz (k) / t0 (k) ! hydrostatic balance
+                    den (k) = den0 (k) * dz0 (k) / dz1 (k)
+                    denfac (k) = sqrt (sfcrho / den (k))
+                enddo
+            else
+                do k = ktop, kbot
+                    dz1 (k) = dz0 (k)
+                    den (k) = den0 (k) ! dry air density remains the same
+                    denfac (k) = sqrt ( den(kbot) / den (k))
+                enddo
+            endif
+
             ! -----------------------------------------------------------------------
             ! sedimentation of cloud ice, snow, and graupel
             ! -----------------------------------------------------------------------