Merge pull request #1586 from apcraig/xcase

Update cime to support full X configuration

Tested with ERS.f19_g16.X.yellowstone_intel only

Test suite:
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]

Fixes [CIME Github issue #] 1587

User interface changes?:

Code review:

config/cesm/config_grids.xml

@@ -35,12 +35,15 @@
       <grid name="rof"    compset="MOSART">r05</grid>
       <grid name="rof"    compset="DROF"  >rx1</grid>
       <grid name="rof"    compset="DROF%CPLHIST">r05</grid>
+      <grid name="rof"    compset="XROF"  >r05</grid>
       <grid name="glc"	  compset="SGLC"  >null</grid>
       <grid name="glc"	  compset="CISM1" >gland5UM</grid>
       <grid name="glc"	  compset="CISM2" >gland4</grid>
+      <grid name="glc"    compset="XGLC"  >gland4</grid>
       <grid name="wav"	  compset="SWAV"  >null</grid>
       <grid name="wav"	  compset="DWAV"  >ww3a</grid>
       <grid name="wav"	  compset="WW3"	  >ww3a</grid>
+      <grid name="wav"    compset="XWAV"  >ww3a</grid>
     </model_grid_defaults>
 
     <model_grid alias="g16_g16" compset="DATM.+DROF">
@@ -1154,7 +1157,7 @@
     </domain>
 
     <domain name="gland4">
-      <nx>376</nx> <ny>701</ny>
+      <nx>416</nx> <ny>704</ny>
       <desc>4-km Greenland grid, for use with the glissade dycore</desc>
     </domain>
 

src/components/xcpl_comps/xshare/dead_mct_mod.F90

@@ -18,6 +18,7 @@ module dead_mct_mod
   use shr_const_mod		, only : shr_const_pi
   use seq_timemgr_mod		, only : seq_timemgr_EClockGetData
   use shr_mpi_mod		, only : shr_mpi_bcast
+
   implicit none
   private
   save
@@ -448,15 +449,15 @@ subroutine dead_run_mct( model, EClock, cdata, x2d, d2x)
     nflds_d2x = mct_avect_nRattr(d2x)
     nflds_x2d = mct_avect_nRattr(x2d)
 
-    ! PACK
+    ! UNPACK
 
 !    do nf=1,nflds_x2d
 !       do n=1,lsize
 !          ?? = x2d%rAttr(nf,n)
 !       enddo
 !    enddo
 
-    ! UNPACK
+    ! PACK
     selectcase(model)
     case('atm')
        gbuf => gbuf_atm
@@ -516,6 +517,13 @@ subroutine dead_run_mct( model, EClock, cdata, x2d, d2x)
     case('ice')
        ki = mct_aVect_indexRA(d2x,"Si_ifrac",perrWith=subname)
        d2x%rAttr(ki,:) = min(1.0_R8,max(0.0_R8,d2x%rAttr(ki,:)))
+    case('glc')
+       ki = mct_aVect_indexRA(d2x,"Sg_icemask",perrWith=subname)
+       d2x%rAttr(ki,:) = 1.0_R8
+       ki = mct_aVect_indexRA(d2x,"Sg_icemask_coupled_fluxes",perrWith=subname)
+       d2x%rAttr(ki,:) = 1.0_R8
+       ki = mct_aVect_indexRA(d2x,"Sg_ice_covered",perrWith=subname)
+       d2x%rAttr(ki,:) = 1.0_R8
     case('atm')
        ! Set time of next radiadtion computation
        call seq_timemgr_EClockGetData (EClock, next_cday=nextsw_cday)