Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cime to support full X configuration #1586

Merged
merged 3 commits into from
May 23, 2017
Merged

Update cime to support full X configuration #1586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc034f0
update X configuration so all components are active, tested with ERS.…
apcraig May 20, 2017
b13ba8d
Merge branch 'master' of https://github.com/esmci/cime into xcase
apcraig May 22, 2017
b74786f
reorder default grid definitions for consistency
apcraig May 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion config/cesm/config_grids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -1154,7 +1157,7 @@
</domain>

<domain name="gland4">
<nx>376</nx> <ny>701</ny>
<nx>416</nx> <ny>704</ny>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't think that this PR should have changed this field?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tony was right to change that. It turns out these values had been wrong for a long time but apparently this didn't cause any trouble outside of an X compset.

<desc>4-km Greenland grid, for use with the glissade dycore</desc>
</domain>

Expand Down
12 changes: 10 additions & 2 deletions src/components/xcpl_comps/xshare/dead_mct_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down