Skip to content

Commit

Permalink
Revert "Revert "Merge branch 'wlin/atm/cleanup_v2compsets_for_tests' …
Browse files Browse the repository at this point in the history 
…into next (PR #4488)""

This reverts commit c6b6220.
  • Loading branch information
@wlin7
wlin7 committed Sep 12, 2021
1 parent fad2492 commit c994286
Show file tree
Hide file tree
Showing 10 changed files with 122 additions and 1,103 deletions.
128 changes: 4 additions & 124 deletions cime_config/allactive/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@

<!-- E3SM CMIP6 COMPSETS science compsets -->

<compset>
<alias>A_WCYCL1850S_CMIP6</alias>
<lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>WCYCL1850</alias>
<lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
Expand All @@ -64,18 +59,13 @@
<lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL20TRS_CMIP6</alias>
<lname>20TRSOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>WCYCL20TR</alias>
<lname>20TRSOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCLSSP585_CMIP6</alias>
<alias>WCYCLSSP585</alias>
<lname>SSP585SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

Expand All @@ -91,74 +81,6 @@
<lname>20TRSOI_EAM%AR5sf_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL2000</alias>
<lname>2000_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL2000S</alias>
<lname>2000SOI_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850</alias>
<lname>1850_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850S</alias>
<lname>1850SOI_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL20TR</alias>
<lname>20TR_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL20TRS</alias>
<lname>20TRSOI_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_CRYO</alias>
<lname>2000_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_MALI_SWAV</lname>
</compset>

<!-- E3SM v1 science compsets (hires) -->

<compset>
<alias>A_WCYCL2000_H01A</alias>
<lname>2000_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL2000_H01AS</alias>
<lname>2000SOI_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850_H01A</alias>
<lname>1850_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850_H01AS</alias>
<lname>1850SOI_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>


<compset>
<alias>A_WCYCL20TR_H01A</alias>
<lname>20TR_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL20TR_H01AS</alias>
<lname>20TRSOI_EAM%AV1C-H01A_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<!-- E3SM V1 BGC experiment compsets -->

<compset>
Expand Down Expand Up @@ -354,26 +276,6 @@
<lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850-DIB</alias>
<lname>1850_EAM%AV1C-L_ELM%SPBC_MPASSI%DIB_MPASO%IB_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850-DIB-ISMF</alias>
<lname>1850_EAM%AV1C-L_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850-DIB_CMIP6</alias>
<lname>1850_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IB_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850-DIB-ISMF_CMIP6</alias>
<lname>1850_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BGCEXP_BDRD_CNPECACNT_SSP585_CMIP6</alias>
<lname>SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
Expand All @@ -389,38 +291,16 @@
<lname>SSP585SOI_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI_MPASO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<!-- E3SM backup compsets -->
<compset>
<alias>A_WCYCL1850_v0atm</alias>
<lname>1850_EAM_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL2000_v0atm</alias>
<lname>2000_EAM_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAVi</lname>
</compset>

<compset>
<alias>A_WCYCL1850S_v0atm</alias>
<lname>1850SOI_EAM_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL2000S_v0atm</alias>
<lname>2000SOI_EAM_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAVi</lname>
</compset>


<!-- E3SM BG compsets -->

<compset>
<alias>A_BG1850CN</alias>
<alias>BG1850CN</alias>
<lname>1850_EAM_ELM%CN_MPASSI_MPASO_MOSART_MALI%SIA_SWAV</lname>
</compset>

<compset>
<alias>A_BGWCYCL1850</alias>
<lname>1850_EAM%AV1C-L_ELM%SPBC_MPASSI_MPASO_MOSART_MALI%STATIC_SWAV</lname>
<alias>BGWCYCL1850</alias>
<lname>1850_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_MALI%STATIC_SWAV</lname>
</compset>

<!-- OCN + CICE + GLC Only Compsets -->
Expand Down
Loading

0 comments on commit c994286

Please sign in to comment.