PR updates: comments,typo, and replace hard coded length with shr_kin…

…d_cl
ESCOMP · Aug 6, 2024 · dcc636d · dcc636d
1 parent a972f69
commit dcc636d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
@@ -3006,7 +3006,7 @@
 <scm_relax_tau_top_sec           scam="1"                  > 172800.D0  </scm_relax_tau_top_sec>
 
 
-<!-- iop spefic defaults for SCAM mode -->
+<!-- IOP SCAM defaults (The Single Column Atmosphere Model Version 6 (SCAM6), J. Adv. Model. Earth Sy., 11, 1381–1401, https://doi.org/10.1029/2018MS001578-->
 
 <!-- IOP ARM95/ARM Southern Great Plains/lat:36/lon:263/Jul 1995/18d/M. Zhang et al. (2016)/Land convection -->
 <ncdata             hgrid="ne3np4"    nlev="32"       scam_iop="arm95"     >atm/cam/inic/se/CESM2.F2000climo.ne3np4.cam.i.0003-06-01-00000.nc</ncdata>

diff --git a/src/control/scamMod.F90 b/src/control/scamMod.F90
@@ -19,7 +19,7 @@ module scamMod
   !   scam_readnl
   !-----------------------------------------------------------------------
 
-use shr_kind_mod,   only: r8 => shr_kind_r8
+use shr_kind_mod,   only: r8 => shr_kind_r8, cl => shr_kind_cl
 use spmd_utils,     only: masterproc,npes
 use pmgrid,         only: plon, plat, plev, plevp
 use constituents,   only: cnst_get_ind, pcnst, cnst_name
@@ -1396,7 +1396,7 @@ subroutine get_start_count (ncid    ,varid  ,scmlat, scmlon, timeidx, start    ,
 !---------------------------Local workspace-----------------------------
   integer            :: dims_set,nlev,var_ndims
   logical            :: usable_var
-  character(len=256) :: dim_name
+  character(len=cl)  :: dim_name
   integer            :: var_dimIDs( NF90_MAX_VAR_DIMS )
   real(r8)           :: closelat,closelon
   integer            :: latidx,lonidx,status,i

diff --git a/src/dynamics/se/advect_tend.F90 b/src/dynamics/se/advect_tend.F90
@@ -146,7 +146,7 @@ subroutine compute_write_iop_fields(elem,fvm,nets,nete,qn0,n0)
       if (ierr/=0) call endrun( sub//': not able to allocate derivedfq' )
       derivedfq = 0._r8
       allocate( iop_qtendxyz_init(nx,nx,nlev,pcnst,nets:nete),stat=ierr )
-      if (ierr/=0) call endrun( sub//': not able to allocate ipo_qtendxyz' )
+      if (ierr/=0) call endrun( sub//': not able to allocate iop_qtendxyz' )
       iop_qtendxyz_init = 0._r8
       allocate( iop_ttendxyz(nx,nx,nlev,nets:nete),stat=ierr )
       if (ierr/=0) call endrun( sub//': not able to allocate iop_ttendxyz' )