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.

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

Remove CISM1 compset and test #179

Merged
merged 1 commit into from
May 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 1 addition & 9 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
ICE = [CICE, DICE, SICE]
OCN = [DOCN, ,AQUAP, SOCN]
ROF = [RTM, MOSART, SROF]
GLC = [CISM1, CISM2, SGLC]
GLC = [CISM2, SGLC]
WAV = [WW3, DWAV, XWAV, SWAV]
ESP = [SESP]
BGC = optional BGC scenario
Expand Down Expand Up @@ -64,14 +64,6 @@
<lname>1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%EVOLVE_WW3_BGC%BDRD</lname>
</compset>

<!-- Include one CISM1 compset, mainly for testing purposes, to make sure that
CISM1 can operate in a fully-coupled configuration. Main point is to
check the PE layout. -->
<compset>
<alias>B1850G1</alias>
<lname>1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM1%EVOLVE_WW3_BGC%BDRD</lname>
</compset>

<!-- Prognostic wave -->


Expand Down
8 changes: 0 additions & 8 deletions cime_config/config_pes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1684,14 +1684,6 @@
<nthrds_cpl>1</nthrds_cpl>
</nthrds>
</pes>
<pes pesize="any" compset="CISM1">
<ntasks>
<ntasks_glc>1</ntasks_glc>
</ntasks>
<nthrds>
<nthrds_glc>1</nthrds_glc>
</nthrds>
</pes>
</mach>
</grid>
</overrides>
Expand Down
10 changes: 0 additions & 10 deletions cime_config/testlist_allactive.xml
Original file line number Diff line number Diff line change
Expand Up @@ -251,16 +251,6 @@
<option name="wallclock"> 00:30:00 </option>
</options>
</test>
<test name="SMS_Ld5" grid="f19_g17" compset="B1850G1" testmods="allactive/cism/test_coupling">
<machines>
<machine name="cheyenne" compiler="gnu" category="prebeta">
<options>
<option name="wallclock">0:30:00</option>
<option name="comment">Include a fully-coupled test with CISM1, mainly to make sure the PE layout works</option>
</options>
</machine>
</machines>
</test>
<test name="SMS_Ld1" grid="f19_g17" compset="B1850G" testmods="allactive/cism/test_coupling">
<machines>
<machine name="hobart" compiler="nag" category="prebeta"/>
Expand Down