further reviewer comment cleanup

ESCOMP · Jan 22, 2025 · 3cf1473 · 3cf1473
1 parent 9834767
commit 3cf1473
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 16 deletions.
diff --git a/schemes/sima_diagnostics/zm_evap_tendency_diagnostics.F90 b/schemes/sima_diagnostics/zm_evap_tendency_diagnostics.F90
@@ -26,9 +26,9 @@ subroutine zm_evap_tendency_diagnostics_init(errmsg, errflg)
 
     call history_add_field ('ZMEIHEAT', 'Heating by precipitation freezing/melting and evaporation in ZM convection', 'lev', 'avg', 'W kg-1')
 
-    call history_add_field ('EVAPTZM', 'T tendency - Evaporation/snow prod from Zhang convection', 'lev',  'avg', 'K s-1')
-    call history_add_field ('FZSNTZM', 'T tendency - Rain to snow conversion from Zhang convection', 'lev',  'avg', 'K s-1')
-    call history_add_field ('EVSNTZM', 'T tendency - Snow to rain prod from Zhang convection', 'lev',  'avg', 'K s-1')
+    call history_add_field ('EVAPTZM', 'T tendency - Evaporation/snow prod from ZM convection', 'lev',  'avg', 'K s-1')
+    call history_add_field ('FZSNTZM', 'T tendency - Rain to snow conversion from ZM convection', 'lev',  'avg', 'K s-1')
+    call history_add_field ('EVSNTZM', 'T tendency - Snow to rain prod from ZM convection', 'lev',  'avg', 'K s-1')
     call history_add_field ('EVAPQZM', 'Q tendency - Evaporation from Zhang-McFarlane moist convection', 'lev',  'avg', &
                                        'kg kg-1 s-1')
 

diff --git a/schemes/sima_diagnostics/zm_tendency_diagnostics.F90 b/schemes/sima_diagnostics/zm_tendency_diagnostics.F90
@@ -48,12 +48,9 @@ subroutine zm_tendency_diagnostics_run(ncol, pver, pverp, const_props, dqdt, err
       character(len=512), intent(out) :: errmsg
       integer,          intent(out) :: errflg
 
-      integer :: lengath  ! number of columns with deep convection
       integer :: const_idx
       character(len=256) :: standard_name
 
-      real(kind_phys) :: ftem(ncol,pver)
-
       errmsg = ''
       errflg = 0
 

diff --git a/schemes/sima_diagnostics/zm_tendency_diagnostics.meta b/schemes/sima_diagnostics/zm_tendency_diagnostics.meta
@@ -43,7 +43,7 @@
   intent = in
 [ const_props ]
   standard_name = ccpp_constituent_properties
-  units = None
+  units = none
   type = ccpp_constituent_prop_ptr_t
   dimensions = (number_of_ccpp_constituents)
   intent = in

diff --git a/schemes/zhang_mcfarlane/zm_conv_convtran.F90 b/schemes/zhang_mcfarlane/zm_conv_convtran.F90
@@ -38,6 +38,7 @@ subroutine zm_conv_convtran_init(qprops, ncnst, doconvtran, errmsg, errflg)
    errmsg = ''
    errflg = 0
 
+   ! Only convectively transport constituents that are water species 
    do q_index=1,ncnst
        call qprops(q_index)%is_water_species(doconvtran(q_index), errflg, errmsg)
        if (errflg /= 0) return
@@ -180,8 +181,8 @@ subroutine zm_conv_convtran_run(ncol, pver, &
 
       if (doconvtran(m)) then
 
-          call const_metadata(m)%is_dry(is_dry, errflg, errmsg)
-          if (is_dry) then
+         call const_metadata(m)%is_dry(is_dry, errflg, errmsg)
+         if (is_dry) then
             do k = 1,pver
                do i =il1g,il2g
                   dptmp(i,k) = dpdry(i,k)
@@ -200,7 +201,6 @@ subroutine zm_conv_convtran_run(ncol, pver, &
                end do
             end do
          endif
-!        dptmp = dp
 
 ! Gather up the constituent and set tend to zero
          do k = 1,pver

diff --git a/schemes/zhang_mcfarlane/zm_conv_evap.F90 b/schemes/zhang_mcfarlane/zm_conv_evap.F90
@@ -236,8 +236,9 @@ subroutine zm_conv_evap_run(ncol, pver, pverp, &
     end do
 
 ! set output precipitation rates (m/s)
-    prec_gen(:ncol) = flxprec(:ncol,pver+1) / 1000._kind_phys
-    snow(:ncol) = flxsnow(:ncol,pver+1) / 1000._kind_phys
+! convert from precip to kg/m2/s
+    prec_gen(:ncol) = flxprec(:ncol,pverp) / 1000._kind_phys
+    snow(:ncol) = flxsnow(:ncol,pverp) / 1000._kind_phys
 
   end subroutine zm_conv_evap_run
 

diff --git a/to_be_ccppized/wv_saturation.F90 b/to_be_ccppized/wv_saturation.F90
@@ -146,7 +146,7 @@ subroutine wv_sat_readnl(nlfile)
 
   use spmd_utils,      only: masterproc
   use namelist_utils,  only: find_group_name
-  use units,           only: getunit, freeunit
+
 !CACNOTE - Bring this back in along with the mpibcast call below
 !  use mpishorthand
   use cam_abortutils,  only: endrun
@@ -164,8 +164,7 @@ subroutine wv_sat_readnl(nlfile)
   !-----------------------------------------------------------------------------
 
   if (masterproc) then
-     unitn = getunit()
-     open( unitn, file=trim(nlfile), status='old' )
+     open( newunit=unitn, file=trim(nlfile), status='old' )
      call find_group_name(unitn, 'wv_sat_nl', status=ierr)
      if (ierr == 0) then
         read(unitn, wv_sat_nl, iostat=ierr)
@@ -175,7 +174,6 @@ subroutine wv_sat_readnl(nlfile)
         end if
      end if
      close(unitn)
-     call freeunit(unitn)
 
   end if