Skip to content

Commit

Permalink
Merge tag 'cime4.0.3' into geotrace_cime
Browse files Browse the repository at this point in the history 
Conflicts:
	cime_config/cesm/allactive/config_pes.xml
	driver_cpl/driver/prep_rof_mod.F90
	driver_cpl/driver/seq_diag_mct.F90
         -- used diffmerge to resolve conflicts

Tested in CAM tag geotrace3_cac_n20_cam5_4_18
  • Loading branch information
@cacraigucar
cacraigucar committed Mar 7, 2016
2 parents 502959b + 7355faf commit cd5c2c9
Show file tree
Hide file tree
Showing 149 changed files with 28,298 additions and 2,134 deletions.
70 changes: 67 additions & 3 deletions cime_config/cesm/allactive/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
LND = [CLM40, CLM45, CLM50, SLND]
ICE = [CICE, DICE, SICE]
OCN = [DOCN, ,AQUAP, SOCN]
ROF = [RTM, SROF]
ROF = [RTM, MOSART, SROF]
GLC = [CISM1, CISM2, SGLC]
WAV = [SWAV]
WAV = [WW3, DWAV, XWAV, SWAV]
BGC = optional BGC scenario

The OPTIONAL %phys attributes specify submodes of the given system
Expand All @@ -36,6 +36,30 @@
- grid (optional regular expression match for grid to work with the compset)
</help>

<!-- 1850 compsets Default, Mosart, Wave for CESM2 -->

<compset>
<alias>B1850</alias>
<lname>1850_CAM5_CLM50%BGC_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BM1850</alias>
<lname>1850_CAM5_CLM50%BGC_CICE_POP2_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BW1850</alias>
<lname>1850_CAM5_CLM50%BGC_CICE_POP2_RTM_SGLC_DWAV</lname>
</compset>

<compset>
<alias>BMW1850</alias>
<lname>1850_CAM5_CLM50%BGC_CICE_POP2_MOSART_SGLC_DWAV</lname>
</compset>

<!-- Other B compsets -->

<compset>
<alias>B</alias>
<lname>2000_CAM4_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV</lname>
Expand Down Expand Up @@ -97,7 +121,7 @@
</compset>

<compset>
<alias>B1850</alias>
<alias>B1850C4L4</alias>
<lname>1850_CAM4_CLM40%SP_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

Expand Down Expand Up @@ -410,12 +434,44 @@
<lname>1850_CAM5_CLM45%BGC_CICE_POP2_RTM_CISM2_SWAV</lname>
</compset>

<compset>
<alias>B_WAV</alias>
<lname>2000_CAM4_CLM40%SP_CICE_POP2_RTM_SGLC_WW3</lname>
</compset>

<!-- Prognostic wave -->

<compset>
<alias>BHIST4_WAV</alias>
<lname>HIST_CAM4_CLM4%SP_CICE_POP2_RTM_SGLC_WW3</lname>
</compset>

<compset>
<alias>BHIST_WAV</alias>
<lname>HIST_CAM5_CLM50%SP_CICE_POP2_RTM_SGLC_WW3</lname>
</compset>

<!-- Data wave -->

<compset>
<alias>BHIST_DWAV</alias>
<lname>HIST_CAM5_CLM50%SP_CICE_POP2_RTM_SGLC_DWAV%COPY</lname>
</compset>

<compset>
<alias>BHIST4_DWAV</alias>
<lname>HIST_CAM4_CLM40%SP_CICE_POP2_RTM_SGLC_DWAV%COPY</lname>
</compset>

<!-- Single Column POP -->

<compset>
<alias>B1D</alias>
<lname>2000_CAM4_CLM40%SP_CICE_POP2%1D_RTM_SGLC_SWAV</lname>
</compset>

<!-- SOM compsets -->

<compset>
<alias>ETEST</alias>
<lname>2000_CAM4_CLM40%SP_CICE_DOCN%SOM_RTM_SGLC_SWAV_TEST</lname>
Expand Down Expand Up @@ -492,6 +548,8 @@
<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>
</entry>

Expand Down Expand Up @@ -537,6 +595,8 @@
<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>
</entry>

Expand Down Expand Up @@ -583,6 +643,8 @@
<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>
</entry>

Expand Down Expand Up @@ -628,6 +690,8 @@
<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>
</entry>

Expand Down
Loading

0 comments on commit cd5c2c9

Please sign in to comment.