* In the MPAS-A Kain-Fritsch CPS sourcecode:

  -> Renamed config_cu_rad_feedback to config_cu_radt_feedback in Registry.xml
     and in ./physics.

  -> In mpas_atmphys_driver.F, removed extra comments related to the KF CPS
     since the sourcecode itself is not modified.

  -> All other changes are minor.

Author: ldfowler58

src/core_atmosphere/Registry.xml

@@ -2188,7 +2188,7 @@
                      description="KF (1) original or (2) moisture-advection based convection trigger"
                      possible_values="1 or 2"/>
 
-                <nml_option name="config_cu_rad_feedback" type="logical" default_value="false" in_defaults="false"
+                <nml_option name="config_cu_radt_feedback" type="logical" default_value="false" in_defaults="false"
                      units="-"
                      description="whether to enable KF subgrid-scale cloud feedbacks to the SW and LW radiation schemes"
                      possible_values=".true. or .false."/>
@@ -2510,11 +2510,11 @@
                      packages="cu_kain_fritsch_in"/>
 
                 <var name="cldfracwcu" type="real" dimensions="nVertLevels nCells Time" units="unitless"
-                     description="horizontal cloud fraction including Cu"
+                     description="horizontal cloud fraction including convective cloud fraction"
                      packages="cu_kain_fritsch_in"/>
 
                 <var name="cldfracwcut" type="real" dimensions="nCells Time" units="unitless"
-                     description="total cloud fraction including Cu"
+                     description="total cloud fraction including convective cloud fraction"
                      packages="cu_kain_fritsch_in"/>
 
 

src/core_atmosphere/physics/mpas_atmphys_driver.F

@@ -87,20 +87,18 @@ module mpas_atmphys_driver
 !   Laura D. Fowler (laura@ucar.edu) / 2014-05-15.
 ! * renamed config_conv_deep_scheme to config_convection_scheme.
 !   Laura D. Fowler (laura@ucar.edu) / 2014-09-18.
+! * in the call to driver_convection, added block%configs needed for the implementation of the
+!   Grell-Freitas convection scheme.
+!   Laura D. Fowler (laura@ucar.edu) / 2016-03-30.
 ! * modified the call to the subroutines driver_sfclayer and driver_pbl for the implementation
 !   of the MYNN surface layer scheme and PBL schemes. itimestep and block%configs are added to
 !   the argument list.
 !   Laura D. Fowler (laura@ucar.edu) / 2015-01-06.
-! * in the call to driver_convection, added block%configs needed for the implementation of the
-!   Grell-Freitas convection scheme.
-!   Laura D. Fowler (laura@ucar.edu) / 2016-03-30.
 ! * now only call subroutine update_convection_step2 when config_convection_scheme is not off.
 !   Laura D. Fowler (laura@ucar.edu) / 2016-04-13.
 ! * modified call to driver_cloudiness to accomodate the calculation of the cloud fraction with the Thompson
 !   cloud microphysics scheme.
 !   Laura D. Fowler (laura@ucar.edu) / 2016-06-04.
-! * added configs to cloudiness and convection calls to allow KF feedback and trigger options.
-!   Jerold A. Herwehe (herwehe.jerry@epa.gov) / 2016-12-07.
 ! * added call to the Noah-MP land surface scheme.
 !   Laura D. Fowler (laura@ucar.edu) / 2024-03-11.
 

src/core_atmosphere/physics/mpas_atmphys_driver_cloudiness.F

@@ -282,10 +282,9 @@ subroutine driver_cloudiness(configs,mesh,diag_physics,sfc_input,its,ite)
 !inout arguments:
  type(mpas_pool_type),intent(inout):: diag_physics
 
- logical, pointer:: cu_rad_feedback
-
 !local variables and pointers:
  character(len=StrKIND),pointer:: radt_cld_scheme
+ logical, pointer:: cu_radt_feedback
 
  integer:: i,j,k
 
@@ -298,7 +297,7 @@ subroutine driver_cloudiness(configs,mesh,diag_physics,sfc_input,its,ite)
 
  call mpas_pool_get_config(configs,'config_radt_cld_scheme'  ,radt_cld_scheme  )
  call mpas_pool_get_config(configs,'config_convection_scheme',convection_scheme)
- call mpas_pool_get_config(configs,'config_cu_rad_feedback'  ,cu_rad_feedback  )
+ call mpas_pool_get_config(configs,'config_cu_radt_feedback' ,cu_radt_feedback )
 
 !copy MPAS arrays to local arrays:
  call cloudiness_from_MPAS(configs,mesh,diag_physics,sfc_input,its,ite)
@@ -342,9 +341,9 @@ subroutine driver_cloudiness(configs,mesh,diag_physics,sfc_input,its,ite)
        enddo
        enddo
 
-       if(cu_rad_feedback) then
-      !adjust cloud fraction and condensates before radiation calls if Cu feedback is enabled by
-      !incorporating subgrid-scale convective clouds into resolved cloudiness (based on CESM):
+       if(cu_radt_feedback) then
+       !adjust cloud fraction and condensates before radiation calls if Cu feedback is enabled by
+       !incorporating subgrid-scale convective clouds into resolved cloudiness (based on CESM):
           do j = jts,jte
           do k = kts,kte
           do i = its,ite

src/core_atmosphere/physics/mpas_atmphys_driver_radiation_lw.F

@@ -317,7 +317,7 @@ subroutine radiation_lw_from_MPAS(xtime_s,configs,mesh,state,time_lev,diag_physi
  type(mpas_pool_type),intent(inout):: diag_physics
 
 !local pointers:
- logical,pointer:: config_o3climatology,cu_rad_feedback
+ logical,pointer:: config_o3climatology,cu_radt_feedback
  character(len=StrKIND),pointer:: radt_lw_scheme
  character(len=StrKIND),pointer:: microp_scheme
  character(len=StrKIND),pointer:: convection_scheme
@@ -343,7 +343,7 @@ subroutine radiation_lw_from_MPAS(xtime_s,configs,mesh,state,time_lev,diag_physi
  call mpas_pool_get_config(configs,'config_microp_scheme'    ,microp_scheme       )
  call mpas_pool_get_config(configs,'config_microp_re'        ,config_microp_re    )
  call mpas_pool_get_config(configs,'config_convection_scheme',convection_scheme   )
- call mpas_pool_get_config(configs,'config_cu_rad_feedback'  ,cu_rad_feedback     )
+ call mpas_pool_get_config(configs,'config_cu_radt_feedback' ,cu_radt_feedback    )
 
  call mpas_pool_get_array(mesh,'latCell',latCell)
  call mpas_pool_get_array(mesh,'lonCell',lonCell)
@@ -379,7 +379,7 @@ subroutine radiation_lw_from_MPAS(xtime_s,configs,mesh,state,time_lev,diag_physi
 
     case("cu_kain_fritsch")
       !assign appropriate cloud fraction:
-       if(cu_rad_feedback) then
+       if(cu_radt_feedback) then
           call mpas_pool_get_array(diag_physics,'cldfracwcu',cldfracwcu)
           do j = jts,jte
           do k = kts,kte
@@ -389,7 +389,7 @@ subroutine radiation_lw_from_MPAS(xtime_s,configs,mesh,state,time_lev,diag_physi
           enddo
           enddo
        else
-          call mpas_pool_get_array(diag_physics,'cldfrac'   ,cldfrac   )
+          call mpas_pool_get_array(diag_physics,'cldfrac',cldfrac)
           do j = jts,jte
           do k = kts,kte
           do i = its,ite
@@ -400,7 +400,7 @@ subroutine radiation_lw_from_MPAS(xtime_s,configs,mesh,state,time_lev,diag_physi
        endif
 
     case default
-       call mpas_pool_get_array(diag_physics,'cldfrac'   ,cldfrac   )
+       call mpas_pool_get_array(diag_physics,'cldfrac',cldfrac)
        do j = jts,jte
        do k = kts,kte
        do i = its,ite

src/core_atmosphere/physics/mpas_atmphys_driver_radiation_sw.F

@@ -375,7 +375,7 @@ subroutine radiation_sw_from_MPAS(configs,mesh,state,time_lev,diag_physics,atm_i
  integer:: i,j,k,n
 
 !local pointers:
- logical,pointer:: config_o3climatology,cu_rad_feedback
+ logical,pointer:: config_o3climatology,cu_radt_feedback
  character(len=StrKIND),pointer:: radt_sw_scheme
  character(len=StrKIND),pointer:: microp_scheme
  character(len=StrKIND),pointer:: convection_scheme
@@ -399,7 +399,7 @@ subroutine radiation_sw_from_MPAS(configs,mesh,state,time_lev,diag_physics,atm_i
  call mpas_pool_get_config(configs,'config_microp_scheme'    ,microp_scheme       )
  call mpas_pool_get_config(configs,'config_microp_re'        ,config_microp_re    )
  call mpas_pool_get_config(configs,'config_convection_scheme',convection_scheme   )
- call mpas_pool_get_config(configs,'config_cu_rad_feedback'  ,cu_rad_feedback     )
+ call mpas_pool_get_config(configs,'config_cu_radt_feedback' ,cu_radt_feedback    )
 
  call mpas_pool_get_array(mesh,'latCell',latCell)
  call mpas_pool_get_array(mesh,'lonCell',lonCell)
@@ -437,7 +437,7 @@ subroutine radiation_sw_from_MPAS(configs,mesh,state,time_lev,diag_physics,atm_i
 
     case("cu_kain_fritsch")
       !assign appropriate cloud fraction:
-       if(cu_rad_feedback) then
+       if(cu_radt_feedback) then
           call mpas_pool_get_array(diag_physics,'cldfracwcu',cldfracwcu)
           do j = jts,jte
           do k = kts,kte
@@ -447,7 +447,7 @@ subroutine radiation_sw_from_MPAS(configs,mesh,state,time_lev,diag_physics,atm_i
           enddo
           enddo
        else
-          call mpas_pool_get_array(diag_physics,'cldfrac'   ,cldfrac   )
+          call mpas_pool_get_array(diag_physics,'cldfrac',cldfrac)
           do j = jts,jte
           do k = kts,kte
           do i = its,ite
@@ -458,7 +458,7 @@ subroutine radiation_sw_from_MPAS(configs,mesh,state,time_lev,diag_physics,atm_i
        endif
 
     case default
-       call mpas_pool_get_array(diag_physics,'cldfrac'   ,cldfrac   )
+       call mpas_pool_get_array(diag_physics,'cldfrac',cldfrac)
        do j = jts,jte
        do k = kts,kte
        do i = its,ite

src/core_atmosphere/physics/mpas_atmphys_vars.F

@@ -761,7 +761,7 @@ module mpas_atmphys_vars
 
  real(kind=RKIND),dimension(:,:,:),allocatable:: &
     cldfrac_p,        &!cloud fraction                                                                         [-]
-    cldfracrad_p,     &!cloud fraction local to cloudiness and radiation
+    cldfracrad_p,     &!cloud fraction local to cloudiness and radiation                                       [-]
     qvrad_p,          &!water vapor mixing ratio local to cloudiness and radiation                         [kg/kg]
     qcrad_p,          &!cloud liquid water mixing ratio local to cloudiness and radiation                  [kg/kg]
     qirad_p,          &!cloud ice mixing ratio local to cloudiness and radiation                           [kg/kg]