Merge branch 'conv_dx' into combo_265_291

Author: grantfirl

physics/CONV/SAMF/samfdeepcnv.f

@@ -2537,10 +2537,10 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
 c
 c------- final changed variable per unit mass flux
 c
-!> - If grid size is less than a threshold value (dxcrtas: currently 8km if progsigma is not used and 30km if progsigma is used), the quasi-equilibrium assumption of Arakawa-Schubert is not used any longer.
+!> - If grid size is less than a threshold value (dxcrtas: currently 8km if progsigma is not used), or progsigma = true, the quasi-equilibrium assumption of Arakawa-Schubert is not used any longer.
 !
       if(progsigma)then
-         dxcrtas=30.e3
+         dxcrtas=500.e3
          dxcrtuf=10.e3
       else
          dxcrtas=8.e3

physics/CONV/SAMF/samfdeepcnv.meta

@@ -472,7 +472,7 @@
 [omegain]
   standard_name = prognostic_updraft_velocity_in_convection
   long_name = convective updraft velocity
-  units = frac
+  units = Pa s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
@@ -481,7 +481,7 @@
 [omegaout]
   standard_name = updraft_velocity_updated_by_physics
   long_name = convective updraft velocity updated by physics
-  units = frac
+  units = Pa s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys

physics/CONV/SAMF/samfshalcnv.f

@@ -204,7 +204,7 @@ subroutine samfshalcnv_run(im,km,itc,ntc,cliq,cp,cvap,            &
       parameter(betaw=.03,dxcrtc0=9.e3)
       parameter(h1=0.33333333)
 !  progsigma
-      parameter(dxcrtas=30.e3,sigmind=0.01,sigmins=0.03,sigminm=0.01)
+      parameter(dxcrtas=500.e3,sigmind=0.01,sigmins=0.03,sigminm=0.01)
 c  local variables and arrays
       real(kind=kind_phys) pfld(im,km),    to(im,km),     qo(im,km),
      &                     uo(im,km),      vo(im,km),     qeso(im,km),

physics/CONV/SAMF/samfshalcnv.meta

@@ -504,7 +504,7 @@
 [omegain]
   standard_name = prognostic_updraft_velocity_in_convection
   long_name = convective updraft velocity
-  units = frac
+  units = Pa s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
@@ -513,7 +513,7 @@
 [omegaout]
   standard_name = updraft_velocity_updated_by_physics
   long_name = convective updraft velocity updated by physics
-  units = frac
+  units = Pa s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys

physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta

@@ -273,7 +273,7 @@
 [omegain]
   standard_name = prognostic_updraft_velocity_in_convection
   long_name = convective updraft velocity
-  units = frac
+  units = Pa s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
@@ -282,7 +282,7 @@
 [omegaout]
   standard_name = updraft_velocity_updated_by_physics
   long_name = convective updraft velocity updated by physics
-  units = frac
+  units = Pa s-1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys