diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml index 88b06574923..4eaf9d136f4 100644 --- a/config/cesm/config_grids.xml +++ b/config/cesm/config_grids.xml @@ -41,6 +41,9 @@ null ww3a ww3a + r05 + gland4 + ww3a @@ -1154,7 +1157,7 @@ - 376 701 + 416 704 4-km Greenland grid, for use with the glissade dycore diff --git a/src/components/xcpl_comps/xshare/dead_mct_mod.F90 b/src/components/xcpl_comps/xshare/dead_mct_mod.F90 index 654454c682f..c4335257f60 100644 --- a/src/components/xcpl_comps/xshare/dead_mct_mod.F90 +++ b/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,7 +449,7 @@ 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 @@ -456,7 +457,7 @@ subroutine dead_run_mct( model, EClock, cdata, x2d, d2x) ! 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)