New single column functionality for NUOPC/CMEPS

cime_config/testdefs/ExpectedTestFails.xml

@@ -30,7 +30,7 @@
 
   <!-- aux_clm test suite failures -->
 
-  <test name="ERS_Ln9.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.IHistClm50SpGs.cheyenne_intel.clm-clm50cam6LndTuningMode_1979Start">
+  <test name="ERS_Ln12.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.IHistClm50SpGs.cheyenne_intel.clm-clm50cam6LndTuningMode_1979Start">
     <phase name="COMPARE_base_rest">
       <status>FAIL</status>
       <issue>#1117</issue>

cime_config/testdefs/testlist_clm.xml

@@ -55,7 +55,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="C96_t061" compset="I2000Clm50SpRs" testmods="clm/default">
+  <test name="SMS_Ln12" grid="C96_t061" compset="I2000Clm50SpRs" testmods="clm/default">
     <machines>
       <machine name="cheyenne" compiler="intel" category="ctsm_sci"/>
     </machines>
@@ -172,7 +172,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_Ln9_P144x3" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/waccmx_offline2005Start">
+  <test name="SMS_Ln12_P144x3" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/waccmx_offline2005Start">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>
@@ -181,7 +181,7 @@
       <option name="comment">Do a test similar to FXHIST starting at a 2005 start date, will interpoalte from the 2003 IC file</option>
     </options>
   </test>
-  <test name="SMS_D_Ln9_P480x3" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/waccmx_offline">
+  <test name="SMS_D_Ln12_P480x3" grid="f19_g17" compset="IHistClm50Sp" testmods="clm/waccmx_offline">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>
@@ -302,7 +302,7 @@
       <option name="wallclock">00:60:00</option>
     </options>
   </test>
-  <test name="SMS_Ln9_P360x2" grid="C96_C96_mg17" compset="IHistClm50BgcCrop" testmods="clm/default">
+  <test name="SMS_Ln12_P360x2" grid="C96_C96_mg17" compset="IHistClm50BgcCrop" testmods="clm/default">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>
@@ -1005,7 +1005,7 @@
       <option name="comment"  >Test transient PFTs (via HIST) in conjunction with changing glacier area. This test also covers the reset_dynbal_baselines option. CISM is not answer preserving across processor changes, but short test length should be OK.</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="C96_C96_mg17" compset="IHistClm50Sp" testmods="clm/decStart">
+  <test name="SMS_Ln12" grid="C96_C96_mg17" compset="IHistClm50Sp" testmods="clm/decStart">
     <machines>
       <machine name="cheyenne" compiler="intel" category="ctsm_sci"/>
     </machines>
@@ -1348,7 +1348,7 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="ERS_Ln9" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam6LndTuningMode_1979Start">
+  <test name="ERS_Ln12" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam6LndTuningMode_1979Start">
     <machines>
       <machine name="cheyenne" compiler="intel" category="ctsm_sci"/>
     </machines>
@@ -1358,7 +1358,7 @@
 for ERS test as otherwise it won't work for a sub-day test (no need to run this high core count test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam6LndTuningMode_1979Start">
+  <test name="SMS_Ln12" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam6LndTuningMode_1979Start">
     <machines>
       <machine name="cheyenne" compiler="intel" category="ctsm_sci"/>
     </machines>
@@ -1367,7 +1367,7 @@ for ERS test as otherwise it won't work for a sub-day test (no need to run this
       <option name="comment"  >Run ARCTICGRIS for transient case starting in 1979 as for AMIP CAM cases (no need to run this high core count test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" compset="ISSP585Clm50BgcCrop" testmods="clm/clm50cam6LndTuningMode">
+  <test name="SMS_Ln12" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" compset="ISSP585Clm50BgcCrop" testmods="clm/clm50cam6LndTuningMode">
     <machines>
       <machine name="cheyenne" compiler="intel" category="ctsm_sci"/>
     </machines>
@@ -1376,7 +1376,7 @@ for ERS test as otherwise it won't work for a sub-day test (no need to run this
       <option name="comment"  >Run ARCTICGRIS for future transient case (do not run this expensive test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam6LndTuningMode_2013Start">
+  <test name="SMS_Ln12" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam6LndTuningMode_2013Start">
     <machines>
       <machine name="cheyenne" compiler="intel" category="ctsm_sci"/>
     </machines>
@@ -1405,7 +1405,7 @@ for ERS test as otherwise it won't work for a sub-day test (no need to run this
       <option name="comment"  >Science support for IHistClm50Sp at f19</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="ne30pg2_ne30pg2_mg17" compset="I1850Clm50Sp" testmods="clm/clm50cam6LndTuningMode">
+  <test name="SMS_Ln12" grid="ne30pg2_ne30pg2_mg17" compset="I1850Clm50Sp" testmods="clm/clm50cam6LndTuningMode">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>
@@ -1414,7 +1414,7 @@ for ERS test as otherwise it won't work for a sub-day test (no need to run this
       <option name="comment"  >Run ne30np4.pg2 to make sure will work for CAM"</option>
     </options>
   </test>
-  <test name="SMS_Ln9" grid="ne30pg2_ne30pg2_mg17" compset="I2000Clm50BgcCrop" testmods="clm/clm50cam6LndTuningMode">
+  <test name="SMS_Ln12" grid="ne30pg2_ne30pg2_mg17" compset="I2000Clm50BgcCrop" testmods="clm/clm50cam6LndTuningMode">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
     </machines>
@@ -1477,7 +1477,7 @@ for ERS test as otherwise it won't work for a sub-day test (no need to run this
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_D_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50Sp" testmods="clm/ptsRLA">
+  <test name="SMS_D_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50SpRs" testmods="clm/ptsRLA">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
       <machine name="cheyenne" compiler="gnu" category="aux_clm"/>
@@ -1653,7 +1653,7 @@ for ERS test as otherwise it won't work for a sub-day test (no need to run this
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50Sp" testmods="clm/ptsRLA">
+  <test name="SMS_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50SpRs" testmods="clm/ptsRLA">
     <machines>
       <machine name="cheyenne" compiler="intel" category="aux_clm"/>
       <machine name="cheyenne" compiler="gnu" category="aux_clm"/>
@@ -1662,15 +1662,15 @@ for ERS test as otherwise it won't work for a sub-day test (no need to run this
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50Sp" testmods="clm/ptsRLB">
+  <test name="SMS_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50SpRs" testmods="clm/ptsRLB">
     <machines>
       <machine name="cheyenne" compiler="gnu" category="aux_clm"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test name="SMS_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50Sp" testmods="clm/ptsROA">
+  <test name="SMS_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50SpRs" testmods="clm/ptsROA">
     <machines>
       <machine name="cheyenne" compiler="gnu" category="aux_clm"/>
     </machines>

cime_config/testdefs/testmods_dirs/clm/pts/shell_commands

@@ -22,3 +22,5 @@
 ./xmlchange NTASKS_ROF=1
 ./xmlchange NTASKS_WAV=1
 ./xmlchange NTASKS_ESP=1
+./xmlchange MOSART_MODE=NULL
+./xmlchange RTM_MODE=NULL

src/biogeochem/SatellitePhenologyMod.F90

@@ -17,7 +17,6 @@ module SatellitePhenologyMod
   use shr_log_mod     , only : errMsg => shr_log_errMsg
   use decompMod       , only : bounds_type
   use abortutils      , only : endrun
-  use clm_varctl      , only : scmlat,scmlon,single_column
   use clm_varctl      , only : iulog, use_lai_streams, inst_name
   use clm_varcon      , only : grlnd
   use controlMod      , only : NLFilename
@@ -501,7 +500,6 @@ subroutine readAnnualVegetation (bounds, canopystate_inst)
     use domainMod   , only : ldomain
     use fileutils   , only : getfil
     use clm_varctl  , only : fsurdat
-    use shr_scam_mod, only : shr_scam_getCloseLatLon
     !
     ! !ARGUMENTS:
     type(bounds_type), intent(in) :: bounds
@@ -511,7 +509,6 @@ subroutine readAnnualVegetation (bounds, canopystate_inst)
     type(file_desc_t) :: ncid             ! netcdf id
     real(r8), pointer :: annlai(:,:)      ! 12 months of monthly lai from input data set
     real(r8), pointer :: mlai(:,:)        ! lai read from input files
-    real(r8):: closelat,closelon          ! single column vars
     integer :: ier                        ! error code
     integer :: g,k,l,m,n,p                ! indices
     integer :: ni,nj,ns                   ! indices
@@ -520,7 +517,6 @@ subroutine readAnnualVegetation (bounds, canopystate_inst)
     integer :: nlon_i                     ! number of input data longitudes
     integer :: nlat_i                     ! number of input data latitudes
     integer :: npft_i                     ! number of input data patch types
-    integer :: closelatidx,closelonidx    ! single column vars
     logical :: isgrid2d                   ! true => file is 2d
     character(len=256) :: locfn           ! local file name
     character(len=32) :: subname = 'readAnnualVegetation'
@@ -553,11 +549,6 @@ subroutine readAnnualVegetation (bounds, canopystate_inst)
     end if
     call check_dim_size(ncid, 'lsmpft', maxsoil_patches)
 
-    if (single_column) then
-       call shr_scam_getCloseLatLon(locfn, scmlat, scmlon, &
-            closelat, closelon, closelatidx, closelonidx)
-    endif
-
     do k=1,12   !! loop over months and read vegetated data
 
        call ncd_io(ncid=ncid, varname='MONTHLY_LAI', flag='read', data=mlai, &
@@ -600,7 +591,6 @@ subroutine readMonthlyVegetation (bounds, &
     use pftconMod        , only : noveg
     use fileutils        , only : getfil
     use spmdMod          , only : masterproc, mpicom, MPI_REAL8, MPI_INTEGER
-    use shr_scam_mod     , only : shr_scam_getCloseLatLon
     use clm_time_manager , only : get_nstep
     use netcdf
     !
@@ -620,8 +610,6 @@ subroutine readMonthlyVegetation (bounds, &
     integer :: nlat_i                     ! number of input data latitudes
     integer :: npft_i                     ! number of input data patch types
     integer :: ier                        ! error code
-    integer :: closelatidx,closelonidx
-    real(r8):: closelat,closelon
     logical :: readvar
     real(r8), pointer :: mlai(:,:)        ! lai read from input files
     real(r8), pointer :: msai(:,:)        ! sai read from input files
@@ -651,11 +639,6 @@ subroutine readMonthlyVegetation (bounds, &
     call getfil(fveg, locfn, 0)
     call ncd_pio_openfile (ncid, trim(locfn), 0)
 
-    if (single_column) then
-       call shr_scam_getCloseLatLon (ncid, scmlat, scmlon, closelat, closelon,&
-            closelatidx, closelonidx)
-    endif
-
     do k=1,2   !loop over months and read vegetated data
 
        call ncd_io(ncid=ncid, varname='MONTHLY_LAI', flag='read', data=mlai, dim1name=grlnd, &

src/biogeophys/SoilMoistureStreamMod.F90

@@ -23,8 +23,7 @@ module SoilMoistureStreamMod
   use shr_log_mod     , only : errMsg => shr_log_errMsg
   use decompMod       , only : bounds_type
   use abortutils      , only : endrun
-  use clm_varctl      , only : scmlat,scmlon,single_column, inst_name
-  use clm_varctl      , only : iulog, use_soil_moisture_streams
+  use clm_varctl      , only : iulog, use_soil_moisture_streams, inst_name
   use clm_varcon      , only : grlnd
   use controlMod      , only : NLFilename
   use decompMod       , only : gsMap_lnd2Dsoi_gdc2glo

src/cpl/lilac/lnd_import_export.F90

@@ -275,7 +275,7 @@ subroutine check_atm_landfrac(importState, bounds, rc)
     !---------------------------------------------------------------------------
 
     ! Implementation notes: The CTSM decomposition is set up so that ocean points appear
-    ! at the end of the vectors received from the coupler. Thus, in order to check if
+    ! at the end of the vectors received from the atm. Thus, in order to check if
     ! there are any points that the atmosphere considers land but CTSM considers ocean,
     ! it is sufficient to check the points following the typical ending bounds in the
     ! vectors received from the coupler.
@@ -291,7 +291,6 @@ subroutine check_atm_landfrac(importState, bounds, rc)
        if (atm_landfrac(n) > 0._r8) then
           write(iulog,*) 'At point ', n, ' atm landfrac = ', atm_landfrac(n)
           write(iulog,*) 'but CTSM thinks this is ocean.'
-          write(iulog,*) "Make sure the mask on CTSM's fatmlndfrc file agrees with the atmosphere's land mask"
           call shr_sys_abort( subname//&
                ' ERROR: atm landfrac > 0 for a point that CTSM thinks is ocean')
        end if

src/cpl/mct/lnd_comp_mct.F90

@@ -9,6 +9,7 @@ module lnd_comp_mct
   ! !uses:
   use shr_kind_mod     , only : r8 => shr_kind_r8
   use shr_sys_mod      , only : shr_sys_flush
+  use shr_log_mod      , only : errMsg => shr_log_errMsg
   use mct_mod          , only : mct_avect, mct_gsmap, mct_gGrid
   use decompmod        , only : bounds_type, ldecomp
   use lnd_import_export, only : lnd_import, lnd_export
@@ -28,6 +29,9 @@ module lnd_comp_mct
   private :: lnd_domain_mct    ! set the land model domain information
   private :: lnd_handle_resume ! handle pause/resume signals from the coupler
 
+  character(len=*), parameter, private :: sourcefile = &
+       __FILE__
+
 !====================================================================================
 contains
 !====================================================================================
@@ -44,7 +48,7 @@ subroutine lnd_init_mct( EClock, cdata_l, x2l_l, l2x_l, NLFilename )
     use clm_time_manager , only : get_nstep, set_timemgr_init, set_nextsw_cday
     use clm_initializeMod, only : initialize1, initialize2
     use clm_instMod      , only : water_inst, lnd2atm_inst, lnd2glc_inst
-    use clm_varctl       , only : finidat,single_column, clm_varctl_set, iulog
+    use clm_varctl       , only : finidat, single_column, clm_varctl_set, iulog
     use clm_varctl       , only : inst_index, inst_suffix, inst_name
     use clm_varorb       , only : eccen, obliqr, lambm0, mvelpp
     use controlMod       , only : control_setNL
@@ -105,6 +109,7 @@ subroutine lnd_init_mct( EClock, cdata_l, x2l_l, l2x_l, NLFilename )
     type(bounds_type) :: bounds                      ! bounds
     logical :: noland
     integer :: ni,nj
+    real(r8)         , parameter :: rundef = -9999999._r8
     character(len=32), parameter :: sub = 'lnd_init_mct'
     character(len=*),  parameter :: format = "('("//trim(sub)//") :',A)"
     !-----------------------------------------------------------------------
@@ -173,6 +178,12 @@ subroutine lnd_init_mct( EClock, cdata_l, x2l_l, l2x_l, NLFilename )
                               start_type=starttype, model_version=version,      &
                               hostname=hostname, username=username )
 
+    ! Single Column
+    if ( single_column .and. (scmlat == rundef  .or. scmlon == rundef ) ) then
+       call endrun(msg=' ERROR:: single column mode on -- but scmlat and scmlon are NOT set'//&
+            errMsg(sourcefile, __LINE__))
+    end if
+
     ! Note that we assume that CTSM's internal dtime matches the coupling time step.
     ! i.e., we currently do NOT allow sub-cycling within a coupling time step.
     call set_timemgr_init( calendar_in=calendar, start_ymd_in=start_ymd, start_tod_in=start_tod, &

src/cpl/mct/lnd_set_decomp_and_domain.F90

@@ -188,8 +188,6 @@ subroutine surfrd_get_grid(begg, endg, ldomain, filename, glcfilename)
     use shr_log_mod  , only : errMsg => shr_log_errMsg
     use ncdio_pio    , only : file_desc_t, var_desc_t, ncd_pio_openfile, ncd_pio_closefile
     use ncdio_pio    , only : ncd_io, check_var, ncd_inqfdims, check_dim_size, ncd_inqdid, ncd_inqdlen
-    use clm_varctl   , only : single_column, scmlat, scmlon
-    use shr_scam_mod , only : shr_scam_getCloseLatLon
     use pio
 
     ! input/output variables
@@ -213,10 +211,6 @@ subroutine surfrd_get_grid(begg, endg, ldomain, filename, glcfilename)
     character(len=16)     :: vname              ! temporary
     character(len=256)    :: locfn              ! local file name
     integer               :: n                  ! indices
-    integer               :: closelatidx
-    integer               :: closelonidx
-    real(r8)              :: closelat
-    real(r8)              :: closelon
     character(len=32) :: subname = 'surfrd_get_grid'     ! subroutine name
 !-----------------------------------------------------------------------
 
@@ -293,11 +287,6 @@ subroutine surfrd_get_grid(begg, endg, ldomain, filename, glcfilename)
        call endrun( msg=' ERROR: LANDFRAC NOT on fracdata file'//errMsg(sourcefile, __LINE__))
     end if
 
-    if (single_column) then
-       call shr_scam_getCloseLatLon(locfn, scmlat, scmlon, &
-            closelat, closelon, closelatidx, closelonidx)
-    end if
-
     call ncd_pio_closefile(ncid)
 
   end subroutine surfrd_get_grid