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 and clean-up compsets for use in test suites #4488

Merged
merged 13 commits into from
Sep 13, 2021
Merged

Update and clean-up compsets for use in test suites #4488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0099945
Update and clean-up compsets for use in test suites
wlin7 Aug 24, 2021
864ad0c
Make MPASSI the default prescribed data ice model for F cases
wlin7 Aug 30, 2021
97c5292
Remove compsets A_WCYCL1850-DIB_CMIP6 and A_WCYCL1850-DIB-ISMF_CMIP6
wlin7 Sep 2, 2021
475fe28
Renamed A_BG1850CN as BG1850CN
wlin7 Sep 2, 2021
3dc3f32
Restored compset BGWCYCL1850 and replaced AV1C-L phys
wlin7 Sep 3, 2021
d0d2eb4
Replaced ne4_ne4 with ne4_oQU240 and ne4pg2_ne4pg2 with ne4pg2_OQU480
wlin7 Sep 9, 2021
a120bae
Fixed F2010 ERS tests on ne4 and ne4pg2 with _Ln# replaced with _Ld3
wlin7 Sep 9, 2021
e0d6219
Removed gust_export testmod dir
wlin7 Sep 9, 2021
0f5c969
Update MMF use case files for 2010 forcings
brhillman Sep 10, 2021
6dba9f4
Update MMF F-cases to F2010
brhillman Sep 10, 2021
66318c3
Remove some unused use cases
brhillman Sep 10, 2021
c06d4ce
Remove cam4 use cases files
brhillman Sep 10, 2021
7d6fa20
Replaced F2010 ERP_Ln# tests with ERP_Ld3
wlin7 Sep 12, 2021
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
132 changes: 9 additions & 123 deletions cime_config/allactive/config_compsets.xml
View file
Open in desktop
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 @@ -59,14 +54,15 @@
<lname>1850SOI_EAM%CMIP6-4xCO2_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<!-- WCYCL1850NS uses no spun-up ICs for mpaso and mpassi. It is only being used for nigthly tests on small grids such as ne11_oQU480-->
<compset>
<alias>WCYCL1950</alias>
<lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
<alias>WCYCL1850NS</alias>
<lname>1850_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>
<alias>WCYCL1950</alias>
<lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
Expand All @@ -75,7 +71,7 @@
</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 +87,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 @@ -349,26 +277,6 @@
<lname>1850SOI_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 @@ -384,38 +292,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>
Copy link
Member

Choose a reason for hiding this comment

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

Lets remove the "A_" from this one.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

</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>

Copy link
Contributor

Choose a reason for hiding this comment

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

We may want to replace this one with something else

Copy link
Contributor

Choose a reason for hiding this comment

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

How about making it BGWCYCL1850_CMIP6 and changing "EAM%AV1C" to "EAM%CMIP6"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

A_BGWCYCL1850 has been removed. BGC compsets for v2 are yet to be finalized.

<!-- OCN + CICE + GLC Only Compsets -->
Expand Down
2 changes: 1 addition & 1 deletion cime_config/config_grids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@
<mask>oQU480</mask>
</model_grid>

<model_grid alias="ne4pg2_oQU480" compset="(EAM.+ELM.+MPASO)">
<model_grid alias="ne4pg2_oQU480">
<grid name="atm">ne4np4.pg2</grid>
<grid name="lnd">ne4np4.pg2</grid>
<grid name="ocnice">oQU480</grid>
Expand Down
Loading