Phase 2 of rk_stratiform CCPPization: diagnostic schemes

schemes/cloud_fraction/compute_cloud_fraction.meta

@@ -225,13 +225,13 @@
   dimensions = (horizontal_loop_extent)
   intent = in
 [ shallowcu ]
-  standard_name = shallow_convective_cloud_area_fraction_tbd
+  standard_name = shallow_convective_cloud_area_fraction
   units = fraction
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   intent = in
 [ deepcu ]
-  standard_name = deep_convective_cloud_area_fraction_tbd
+  standard_name = deep_convective_cloud_area_fraction
   units = fraction
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -273,7 +273,7 @@
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   intent = out
 [ rhcloud ]
-  standard_name = cloud_area_fraction_from_relative_humidity_method_tbd
+  standard_name = cloud_area_fraction_from_relative_humidity_method
   units = fraction
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -285,7 +285,7 @@
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   intent = out
 [ rhu00 ]
-  standard_name = relative_humidity_threshold_for_prognostic_cloud_water_tbd
+  standard_name = relative_humidity_threshold_for_cloud_formation
   units = fraction
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -303,7 +303,7 @@
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   intent = out
 [ relhum ]
-  standard_name = relative_humidity_for_prognostic_cloud_water_tbd
+  standard_name = relative_humidity
   units = fraction
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)

schemes/cloud_fraction/convective_cloud_cover.meta

@@ -82,7 +82,7 @@
   dimensions = ()
   intent = in
 [ shfrc ]
-  standard_name = shallow_convective_cloud_area_fraction
+  standard_name = shallow_convective_cloud_area_fraction_from_shallow_convection
   units = fraction
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -100,13 +100,13 @@
   dimensions = (horizontal_loop_extent, vertical_interface_dimension)
   intent = in
 [ shallowcu ]
-  standard_name = shallow_convective_cloud_area_fraction_tbd
+  standard_name = shallow_convective_cloud_area_fraction
   units = fraction
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   intent = out
 [ deepcu ]
-  standard_name = deep_convective_cloud_area_fraction_tbd
+  standard_name = deep_convective_cloud_area_fraction
   units = fraction
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)

schemes/hack_shallow/hack_convect_shallow.meta

@@ -79,7 +79,7 @@
   dimensions = ()
   intent = out
 [ shfrc ]
-  standard_name = shallow_convective_cloud_area_fraction
+  standard_name = shallow_convective_cloud_area_fraction_from_shallow_convection
   units = fraction
   type = real | kind = kind_phys
   dimensions = (horizontal_dimension, vertical_layer_dimension)

schemes/rasch_kristjansson/cloud_particle_sedimentation.F90

@@ -146,7 +146,7 @@ subroutine cloud_particle_sedimentation_run( &
     real(kind_phys),    intent(out)   :: wvtend(:,:)    ! water vapor tendency [kg kg-1 s-1] -- to apply wv tendency
     real(kind_phys),    intent(out)   :: htend(:,:)     ! heating rate [J kg-1 s-1] -- to apply s tendency
     real(kind_phys),    intent(out)   :: sfliq(:)       ! surface flux of liquid (rain) [kg m-2 s-1]
-    real(kind_phys),    intent(out)   :: sfice(:)       ! lwe_cloud_ice_sedimentation_rate_at_surface_due_to_microphysics [m s-1]
+    real(kind_phys),    intent(out)   :: sfice(:)       ! stratiform_lwe_cloud_ice_surface_flux_due_to_sedimentation [m s-1]
     character(len=512), intent(out)   :: errmsg         ! error message
     integer,            intent(out)   :: errflg         ! error flag
 
@@ -361,7 +361,7 @@ subroutine cloud_particle_sedimentation_run( &
     sfliq(:ncol) = fxliq(:ncol, pverp)/(dtime*gravit)
     sfice(:ncol) = fxice(:ncol, pverp)/(dtime*gravit)
 
-    ! Convert lwe_cloud_ice_sedimentation_rate_at_surface_due_to_microphysics from kg m-2 s-1 to precip units m s-1
+    ! Convert stratiform_lwe_cloud_ice_surface_flux_due_to_sedimentation from kg m-2 s-1 to precip units m s-1
     sfice(:ncol) = sfice(:ncol)/1000._kind_phys
 
   end subroutine cloud_particle_sedimentation_run
@@ -390,7 +390,6 @@ subroutine getflx(ncol, pver, pverp, &
     integer         :: i, k
     real(kind_phys) :: psi(ncol, pverp)
     real(kind_phys) :: fdot(ncol, pverp)
-    real(kind_phys) :: xx(ncol)
     real(kind_phys) :: fxdot(ncol)
     real(kind_phys) :: fxdd(ncol)
     real(kind_phys) :: psistar(ncol)
@@ -457,7 +456,6 @@ subroutine cfint2(ncol, pverp, &
     real(kind_phys) :: c2
     real(kind_phys) :: c3
     real(kind_phys) :: xx
-    real(kind_phys) :: xinf
     real(kind_phys) :: psi1, psi2, psi3, psim
     real(kind_phys) :: cfint
     real(kind_phys) :: cfnew
@@ -551,7 +549,6 @@ subroutine cfdotmc(ncol, pver, pverp, x, f, fdot)
     real(kind_phys), intent(out) :: fdot(ncol, pverp)       ! derivative at nodes
 
     integer :: i, k
-    real(kind_phys) :: a, b, c                 ! work var
     real(kind_phys) :: s(ncol, pverp)         ! first divided differences at nodes
     real(kind_phys) :: sh(ncol, pverp)        ! first divided differences between nodes
     real(kind_phys) :: d(ncol, pverp)         ! second divided differences at nodes

schemes/rasch_kristjansson/cloud_particle_sedimentation.meta

@@ -193,13 +193,13 @@
   dimensions = (horizontal_loop_extent)
   intent = in
 [ pvliq ]
-  standard_name = vertical_velocity_of_cloud_liquid_water_due_to_sedimentation_tbd
+  standard_name = magnitude_of_vertical_pressure_velocity_of_cloud_liquid_water_due_to_sedimentation
   units = Pa s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_interface_dimension)
   intent = out
 [ pvice ]
-  standard_name = vertical_velocity_of_cloud_ice_due_to_sedimentation_tbd
+  standard_name = magnitude_of_vertical_pressure_velocity_of_cloud_ice_due_to_sedimentation
   units = Pa s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent, vertical_interface_dimension)
@@ -238,7 +238,7 @@
   dimensions = (horizontal_loop_extent)
   intent = out
 [ sfice ]
-  standard_name = lwe_cloud_ice_sedimentation_rate_at_surface_due_to_microphysics
+  standard_name = stratiform_lwe_cloud_ice_surface_flux_due_to_sedimentation
   units = m s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent)

schemes/rasch_kristjansson/prognostic_cloud_water.F90

@@ -26,7 +26,6 @@ module prognostic_cloud_water
   real(kind_phys) :: rhonot         ! air density at surface [g cm-3]
   real(kind_phys) :: rhos           ! assumed snow density [g cm-3]
   real(kind_phys) :: rhow           ! water density [g cm-3]
-  real(kind_phys) :: rhoi           ! ice density [g cm-3]
   real(kind_phys) :: esi            ! Collection efficiency for ice by snow [1]
   real(kind_phys) :: esw            ! Collection efficiency for water by snow [1]
   real(kind_phys) :: t0             ! Approx. freezing temperature [K]
@@ -120,10 +119,9 @@ subroutine prognostic_cloud_water_init( &
 
     rhonot = rhodair/1000.0_kind_phys     ! convert from kg m-3 to g cm-3
 
-    ! assumed densities of snow, water, ice [g cm-3]
+    ! assumed densities of snow, water [g cm-3]
     rhos   = 0.1_kind_phys
     rhow   = 1._kind_phys
-    rhoi   = 1._kind_phys
 
     esi    = 1._kind_phys
     esw    = 0.1_kind_phys
@@ -292,7 +290,7 @@ subroutine prognostic_cloud_water_run( &
     real(kind_phys),    intent(out)   :: qme(:,:)       ! Rate of condensation-evaporation of condensate (net_condensation_rate_due_to_microphysics) [kg kg-1 s-1]
     real(kind_phys),    intent(out)   :: prodprec(:,:)  ! Conversion rate of condensate to precip (precipitation_production_due_to_microphysics) [kg kg-1 s-1]
     real(kind_phys),    intent(out)   :: prodsnow(:,:)  ! Snow production rate (ignored in RK?) [kg kg-1 s-1]
-    real(kind_phys),    intent(out)   :: evapprec(:,:)  ! Falling precipitation evaporation rate (precipitation_evaporation_due_to_microphysics) [kg kg-1 s-1] -- & combined to apply q(wv) tendency
+    real(kind_phys),    intent(out)   :: evapprec(:,:)  ! Falling precipitation evaporation rate (rate_of_evaporation_of_precipitation_due_to_microphysics) [kg kg-1 s-1] -- & combined to apply q(wv) tendency
     real(kind_phys),    intent(out)   :: evapsnow(:,:)  ! Falling snow evaporation rate [kg kg-1 s-1]
     real(kind_phys),    intent(out)   :: evapheat(:,:)  ! heating rate due to evaporation of precipitation [J kg-1 s-1]
     real(kind_phys),    intent(out)   :: prfzheat(:,:)  ! heating rate due to freezing of precipitation [J kg-1 s-1]
@@ -320,6 +318,7 @@ subroutine prognostic_cloud_water_run( &
     integer,            intent(out)   :: errflg         ! error flag
 
     ! Local variables
+    real(kind_phys),    parameter     :: rhofw = 1000._kind_phys  ! density of fresh water [kg m-3]
     integer :: i, k, l                                  ! Iteration index [1]
     integer :: iter                                     ! # of iterations for precipitation calculation [1]
     logical :: error_found                              ! Flag for error detection [flag]
@@ -378,11 +377,9 @@ subroutine prognostic_cloud_water_run( &
     real(kind_phys) :: mincld                           ! Minimum cloud fraction [1]
     real(kind_phys) :: cpohl                            ! Ratio of specific heat to latent heat [K-1]
     real(kind_phys) :: hlocp                            ! Ratio of latent heat to specific heat [K]
-    real(kind_phys) :: clrh2o                           ! Ratio of latent heat to water vapor gas constant [K]
     real(kind_phys) :: dto2                             ! Half timestep [s]
 
     ! Work variables
-    real(kind_phys) :: denom                            ! Denominator work variable [1]
     real(kind_phys) :: dqsdt                            ! Change in saturation specific humidity with temperature [kg kg-1 K-1]
     real(kind_phys) :: gamma(ncol)                     ! Temperature derivative of saturation specific humidity [kg kg-1 K-1]
     real(kind_phys) :: qtl(ncol)                       ! Saturation tendency [kg kg-1 s-1]
@@ -400,7 +397,6 @@ subroutine prognostic_cloud_water_run( &
     errflg = 0
     error_found = .false.
 
-    clrh2o = latvap/rh2o
     cpohl  = cpair/latvap
     hlocp  = latvap/cpair
     dto2   = 0.5_kind_phys * deltat
@@ -845,8 +841,8 @@ subroutine prognostic_cloud_water_run( &
     !
     ! If this conversion is removed in the future, the metadata needs to
     ! be updated.
-    precip(:ncol) = precip(:ncol)/1000._kind_phys
-    snowab(:ncol) = snowab(:ncol)/1000._kind_phys
+    precip(:ncol) = precip(:ncol)/rhofw
+    snowab(:ncol) = snowab(:ncol)/rhofw
   end subroutine prognostic_cloud_water_run
 
   ! Calculate the conversion of condensate to precipitate
@@ -898,7 +894,6 @@ subroutine findmcnew( &
     integer :: ncols                                ! Number of active columns for microphysics (different from ncol!!) [count]
     integer :: ind(ncol)                            ! Active column indices [index]
     real(kind_phys) :: capn                         ! Local cloud particle number concentration [cm-3]
-    real(kind_phys) :: capnoice                     ! Cloud particle concentration excluding sea ice [cm-3]
     real(kind_phys) :: cldloc(ncol)                ! Non-zero cloud fraction [1]
     real(kind_phys) :: cldpr(ncol)                 ! Cloud fraction for precipitation [1]
     real(kind_phys) :: totmr(ncol)                 ! In-cloud total water mixing ratio [kg kg-1]
@@ -920,11 +915,7 @@ subroutine findmcnew( &
     real(kind_phys) :: rhocgs                       ! Air density in CGS units [g cm-3]
     real(kind_phys) :: r3l                          ! Cloud droplet volume radius [m]
     real(kind_phys) :: icrit                        ! Ice autoconversion threshold [kg kg-1]
-    real(kind_phys) :: wsi                          ! Sea ice weight factor [1]
     real(kind_phys) :: wt                           ! Ice fraction weight [1]
-    real(kind_phys) :: wland                        ! Land fraction weight [1]
-    real(kind_phys) :: wp                           ! Pressure dependence weight [1]
-    real(kind_phys) :: ftot                         ! Total fraction for conversion processes [1]
     real(kind_phys) :: con1                         ! Work constant for radius calculation [m]
     real(kind_phys) :: con2                         ! Work constant for density ratios [1]
     real(kind_phys) :: csacx                        ! Constant used for snow accreting liquid or ice [??]
@@ -1119,8 +1110,6 @@ subroutine findmcnew( &
          fsacw(i) = 0._kind_phys
          fsaci(i) = 0._kind_phys
       endif
-
-      ftot = fwaut(i)+fsaut(i)+fracw(i)+fsacw(i)+fsaci(i)
     end do
 
   end subroutine findmcnew