Skip to content

Commit

Permalink
Merge tag 'cime4.5.6' into geotrace_cime
Browse files Browse the repository at this point in the history 
Esp compset description fix

Conflicts:
	cime_config/cesm/allactive/testlist_allactive.xml

Tested in CAM's tag: geotrace3_cac_n56_cam5_4_57
  • Loading branch information
@cacraigucar
cacraigucar committed Jun 29, 2016
2 parents a9a5ac9 + ede0eda commit 1c8ef5b
Show file tree
Hide file tree
Showing 57 changed files with 2,634 additions and 890 deletions.
14 changes: 14 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[ Description of the changes in this Pull Request. It should be enough
information for someone not following this development to understand.
Lines should be wrapped at about 72 characters. ]

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

Fixes: [CIME Github issue #]

User interface changes?:

Code review:
94 changes: 58 additions & 36 deletions cime_config/cesm/allactive/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
atm, lnd, ice, ocn, river, glc wave cesm-options

The notation for the compset longname is
TIME_ATM[%phys]_LND[%phys]_ICE[%phys]_OCN[%phys]_ROF[%phys]_GLC[%phys]_WAV[%phys][_BGC%phys]
TIME_ATM[%phys]_LND[%phys]_ICE[%phys]_OCN[%phys]_ROF[%phys]_GLC[%phys]_WAV[%phys][_ESP%phys][_BGC%phys]
Where for the CAM specific compsets below the following is supported
TIME = Time period (e.g. 2000, HIST, RCP8...)
ATM = [CAM4, CAM5]
Expand All @@ -20,6 +20,7 @@
ROF = [RTM, MOSART, SROF]
GLC = [CISM1, CISM2, SGLC]
WAV = [WW3, DWAV, XWAV, SWAV]
ESP = [SESP]
BGC = optional BGC scenario

The OPTIONAL %phys attributes specify submodes of the given system
Expand All @@ -44,29 +45,24 @@
<lname>2000_CAM4_CLM40%SP_CICE_POP2%1D_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>B1850G</alias>
<lname>1850_CAM55_CLM50%BGC-CROP_CICE_POP2_MOSART_CISM1%NOEVOLVE_SWAV</lname>
</compset>

<compset>
<alias>B1850RG</alias>
<lname>1850_CAM55_CLM50%BGC-CROP_CICE_POP2_RTM_CISM1%NOEVOLVE_SWAV</lname>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_RTM_CISM1%NOEVOLVE_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>B1850RW</alias>
<lname>1850_CAM55_CLM50%BGC-CROP_CICE_POP2_RTM_SGLC_DWAV</lname>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_RTM_SGLC_DWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>B1850GW</alias>
<lname>1850_CAM55_CLM50%BGC-CROP_CICE_POP2_MOSART_CISM1%NOEVOLVE_DWAV</lname>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_MOSART_CISM1%NOEVOLVE_DWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>B1850W</alias>
<lname>1850_CAM55_CLM50%BGC-CROP_CICE_POP2_MOSART_SGLC_DWAV</lname>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_MOSART_SGLC_DWAV_BGC%BDRD</lname>
</compset>

<compset>
Expand All @@ -76,10 +72,13 @@

<compset>
<alias>B1850R</alias>
<lname>1850_CAM55_CLM50%BGC-CROP_CICE_POP2_RTM_SGLC_SWAV</lname>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_RTM_SGLC_SWAV_BGC%BDRD</lname>
</compset>


<compset>
<alias>B1850Cw</alias>
<lname>1850_CAM55%WTSM_CLM50%BGC_CICE_POP2%ECO_MOSART_SGLC_SWAV</lname>
</compset>



Expand All @@ -105,6 +104,11 @@
<lname>2000_CAM5_CLM45%BGC_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BC5L45BGC</alias>
<lname>2000_CAM5_CLM45%BGC_CICE_POP2_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BC4FCHML40CNR</alias>
<lname>2000_CAM4%FCHM_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV</lname>
Expand Down Expand Up @@ -144,6 +148,11 @@
<lname>1850_CAM5_CLM45%BGC_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>B1850C5L45BGC</alias>
<lname>1850_CAM5_CLM45%BGC_CICE_POP2_MOZART_SGLC_SWAV</lname>
</compset>


<compset>
<alias>B1850C4RCO2L40CNR</alias>
Expand All @@ -156,21 +165,11 @@
<lname>1850_CAM5%WCCM_CLM45%CN_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>


<compset>
<alias>BC4WCMAL40SPR</alias>
<lname>C2R8_CAM4%WCMA_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV</lname>
<alias>B1850C5WCCML45CN</alias>
<lname>1850_CAM5%WCCM_CLM45%CN_CICE_POP2_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BC4WTSML40SPR</alias>
<lname>C2R6_CAM4%WTSM_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BC4SSOAL40SPR</alias>
<lname>C2R4_CAM4%SSOA_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BC4WCBCL40CNR</alias>
Expand All @@ -196,6 +195,11 @@
<lname>HIST_CAM5_CLM45%BGC_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BHISTC5L45BGC</alias>
<lname>HIST_CAM5_CLM45%BGC_CICE_POP2_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BHISTC4FCHML40CNR</alias>
<lname>HIST_CAM4%FCHM_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV</lname>
Expand All @@ -221,12 +225,22 @@
<lname>RCP8_CAM5_CLM45%BGC_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BRCP85C5L45BGC</alias>
<lname>RCP8_CAM5_CLM45%BGC_CICE_POP2_MOSART_SGLC_SWAV</lname>
</compset>

<!-- Climate Simulation Lab compsets for Keith Lindsay -->
<compset>
<alias>B1850C4L45BGCRBPRP</alias>
<lname>1850_CAM4_CLM45%BGC_CICE_POP2%ECO_RTM_SGLC_SWAV_BGC%BPRP</lname>
</compset>

<compset>
<alias>B1850C4L45BGCBPRP</alias>
<lname>1850_CAM4_CLM45%BGC_CICE_POP2%ECO_MOSART_SGLC_SWAV_BGC%BPRP</lname>
</compset>

<compset>
<alias>B1850C5L45BGCRBPRP</alias>
<lname>1850_CAM5_CLM45%BGC_CICE_POP2%ECO_RTM_SGLC_SWAV_BGC%BPRP</lname>
Expand All @@ -245,11 +259,21 @@
<lname>2000_CAM5_CLM45%BGC_CICE_POP2_RTM_CISM1_SWAV</lname>
</compset>

<compset>
<alias>BC5L45BGCG</alias>
<lname>2000_CAM5_CLM45%BGC_CICE_POP2_MOSART_CISM1_SWAV</lname>
</compset>

<compset>
<alias>B1850C5L45BGCRG2</alias>
<lname>1850_CAM5_CLM45%BGC_CICE_POP2_RTM_CISM2_SWAV</lname>
</compset>

<compset>
<alias>B1850C5L45BGCG2</alias>
<lname>1850_CAM5_CLM45%BGC_CICE_POP2_MOSART_CISM2_SWAV</lname>
</compset>


<!-- Prognostic wave -->

Expand All @@ -267,7 +291,7 @@

<compset>
<alias>ETEST</alias>
<lname>2000_CAM55_CLM50%CROP_CICE_DOCN%SOM_MOSART_SGLC_SWAV_TEST</lname>
<lname>2000_CAM55_CLM50_CICE_DOCN%SOM_MOSART_SGLC_SWAV_TEST</lname>
</compset>

<compset>
Expand All @@ -278,7 +302,7 @@

<compset>
<alias>E1850C5L45TEST</alias>
<lname>1850_CAM5_CLM45%SP_CICE_DOCN%SOM_RTM_SGLC_SWAV_TEST</lname>
<lname>1850_CAM5_CLM45%SP_CICE_DOCN%SOM_MOSART_SGLC_SWAV_TEST</lname>
</compset>

<compset>
Expand All @@ -287,6 +311,14 @@
<lname>1850_CAM4_CLM40%CN_CICE_DOCN%SOM_RTM_SGLC_SWAV</lname>
</compset>

<!-- All active except data atmosphere
Used for spinup and testing of CISM couplings -->

<compset>
<alias>J1850G2</alias>
<lname>1850_DATM%CRU_CLM50%BGC_CICE_POP2_MOSART_CISM2_SWAV</lname>
</compset>

<entries>

<entry id="RUN_TYPE">
Expand Down Expand Up @@ -344,8 +376,6 @@
<value grid="a%T31_l%T31_oi%gx3v7_r%r05_m%gx3v7" compset="1850_CAM4_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >hybrid</value>
<value grid="a%ne30np4_l%ne30np4_oi%gx1v6_r%r05_m%gx1v6" compset="1850_CAM5_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >hybrid</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="2013_CAM4%WCBC_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >hybrid</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="C2R[68].*_CAM4.*_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV">hybrid</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="C2R4_CAM4%SSOA_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV" >hybrid</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05_w%ww3a" compset="HIST_CAM5_CLM40%SP_CICE_POP2_RTM_SGLC_WW3" >hybrid</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05_w%ww3a" compset="HIST_CAM5_CLM40%SP_CICE_POP2_RTM_SGLC_DWAV" >hybrid</value>
</values>
Expand Down Expand Up @@ -391,8 +421,6 @@
<value grid="a%T31_l%T31_oi%gx3v7_r%r05_m%gx3v7" compset="1850_CAM4_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >b40.t31x3.037c</value>
<value grid="a%ne30np4_l%ne30np4_oi%gx1v6_r%r05_m%gx1v6" compset="1850_CAM5_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >b.e11.B1850C5CN.ne30_g16.tuning.004</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="2013_CAM4%WCBC_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >b40.rcp4_5.2deg.wcm.carma.bc0tg.002</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="C2R[68].*_CAM4.*_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV">b40.20th.track1.2deg.wcm.007</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="C2R4_CAM4%SSOA_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV" >b_1950_2100_refc2_CCSM4_chem_no_sp.001</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05_w%ww3a" compset="HIST_CAM5_CLM40%SP_CICE_POP2_RTM_SGLC_WW3" >b40_1850_c02c_76jpf</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05_w%ww3a" compset="HIST_CAM5_CLM40%SP_CICE_POP2_RTM_SGLC_DWAV" >b40_1850_c02c_76jpf</value>
</values>
Expand Down Expand Up @@ -439,8 +467,6 @@
<value grid="a%T31_l%T31_oi%gx3v7_r%r05_m%gx3v7" compset="1850_CAM4_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >0507-01-01</value>
<value grid="a%ne30np4_l%ne30np4_oi%gx1v6_r%r05_m%gx1v6" compset="1850_CAM5_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >0026-01-01</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="2013_CAM4%WCBC_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >2013-01-01</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="C2R[68].*_CAM4.*_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV">1950-01-01</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="C2R4_CAM4%SSOA_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV" >2004-01-01</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05_w%ww3a" compset="HIST_CAM5_CLM40%SP_CICE_POP2_RTM_SGLC_WW3" >0221-01-01</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05_w%ww3a" compset="HIST_CAM5_CLM40%SP_CICE_POP2_RTM_SGLC_DWAV" >0221-01-01</value>
</values>
Expand Down Expand Up @@ -486,8 +512,6 @@
<value grid="a%T31_l%T31_oi%gx3v7_r%r05_m%gx3v7" compset="1850_CAM4_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >ccsm4_init</value>
<value grid="a%ne30np4_l%ne30np4_oi%gx1v6_r%r05_m%gx1v6" compset="1850_CAM5_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >ccsm4_init</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="2013_CAM4%WCBC_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV" >ccsm4_init</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="C2R[68].*_CAM4.*_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV">ccsm4_init</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05" compset="C2R4_CAM4%SSOA_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV" >ccsm4_init</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05_w%ww3a" compset="HIST_CAM5_CLM40%SP_CICE_POP2_RTM_SGLC_WW3" >ccsm4_init</value>
<value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05_w%ww3a" compset="HIST_CAM5_CLM40%SP_CICE_POP2_RTM_SGLC_DWAV" >ccsm4_init</value>
</values>
Expand All @@ -498,8 +522,6 @@
<value compset="1850_" >0001-01-01</value>
<value compset="2000_" >0001-01-01</value>
<value compset="HIST_" >1850-01-01</value>
<value compset="C2R[68]_" >1950-01-01</value>
<value compset="C2R4_" >2004-01-01</value>
<value compset="5505_" >1955-01-01</value>
<value compset="RCP[2468]_">2005-01-01</value>
<value compset="2013_" >2013-01-01</value>
Expand Down
56 changes: 55 additions & 1 deletion cime_config/cesm/allactive/config_pes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1483,7 +1483,7 @@
</grid>
<grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
<mach name="yellowstone">
<pes pesize="any" compset="BGC">
<pes pesize="any" compset="CAM.+CLM.+CICE.+POP.+BGC">
<comment>none</comment>
<ntasks>
<ntasks_atm>300</ntasks_atm>
Expand Down Expand Up @@ -1704,4 +1704,58 @@
</mach>
</grid>

<!-- J compset (all active except data atmosphere)
Laid out as follows:
|LND|ICE|ATM|OCN|
|ROF|
|..CPL..|
|......GLC......|
-->
<!-- Ideally, we wouldn't specify the atmosphere resolution here, because it
is irrelevant. However, ConfigPES doesn't seem to match the grid properly
unless the atmosphere resolution is specified. -->
<grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1">
<!-- Ideally, we wouldn't match against yellowstone here. However, if we
set mach name="any", it seems that the ConfigPES logic just tries
looking in other blocks (which have a specific grid and specific
machine), and doesn't check this block. (See
https://github.com/CESM-Development/cime/issues/403) -->
<mach name="yellowstone">
<pes pesize="any" compset="DATM.+CLM.+CICE.+POP">
<comment>Load balanced for 1850_DATM%CRU_CLM50%BGC_CICE_POP2_MOSART_CISM2_SWAV on yellowstone</comment>
<ntasks>
<ntasks_atm>-1</ntasks_atm>
<ntasks_lnd>-21</ntasks_lnd>
<ntasks_rof>-21</ntasks_rof>
<ntasks_ice>-10</ntasks_ice>
<ntasks_ocn>-16</ntasks_ocn>
<ntasks_glc>-48</ntasks_glc>
<ntasks_wav>1</ntasks_wav>
<ntasks_cpl>-31</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>1</nthrds_atm>
<nthrds_lnd>1</nthrds_lnd>
<nthrds_rof>1</nthrds_rof>
<nthrds_ice>1</nthrds_ice>
<nthrds_ocn>1</nthrds_ocn>
<nthrds_glc>1</nthrds_glc>
<nthrds_wav>1</nthrds_wav>
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>-31</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>-21</rootpe_ice>
<rootpe_ocn>-32</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>


</config_pes>
Loading

0 comments on commit 1c8ef5b

Please sign in to comment.