Skip to content

Commit

Permalink
Merge pull request E3SM-Project#5 from sandialabs/brhillman/upstream-…
Browse files Browse the repository at this point in the history 
…merge-20220125

Upstream merge 2022-01-25
  • Loading branch information
@brhillman
brhillman authored Jan 26, 2022
2 parents d8ca1a9 + 6fac659 commit 0e63bc3
Show file tree
Hide file tree
Showing 678 changed files with 7,037 additions and 4,927 deletions.
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 540 files
58 changes: 34 additions & 24 deletions cime_config/allactive/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@

<compset>
<alias>BGCEXP_CNTL_CNPRDCTC_1850</alias>
<lname>1850_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>1850_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
Expand All @@ -101,12 +101,12 @@

<compset>
<alias>BGCEXP_BCRC_CNPRDCTC_20TR</alias>
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPRDCTC_SSP585_CMIP6</alias>
<lname>SSP585_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>SSP585_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
Expand All @@ -121,12 +121,12 @@

<compset>
<alias>BGCEXP_BCRD_CNPRDCTC_20TR</alias>
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD</lname>
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BCRD</lname>
</compset>

<compset>
<alias>BGCEXP_BCRD_CNPRDCTC_SSP585_CMIP6</alias>
<lname>SSP585_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD</lname>
<lname>SSP585_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BCRD</lname>
</compset>

<compset>
Expand All @@ -141,12 +141,12 @@

<compset>
<alias>BGCEXP_BDRC_CNPRDCTC_20TR</alias>
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC</lname>
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BDRC</lname>
</compset>

<compset>
<alias>BGCEXP_BDRC_CNPRDCTC_SSP585_CMIP6</alias>
<lname>SSP585_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC</lname>
<lname>SSP585_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BDRC</lname>
</compset>

<compset>
Expand All @@ -161,12 +161,12 @@

<compset>
<alias>BGCEXP_BDRD_CNPRDCTC_20TR</alias>
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>BGCEXP_BDRD_CNPRDCTC_SSP585_CMIP6</alias>
<lname>SSP585_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
<lname>SSP585_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
Expand All @@ -181,22 +181,27 @@

<compset>
<alias>BGCEXP_CNTL_CNPECACNT_1850</alias>
<lname>1850_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>1850_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_CNTL_CNPECACNT_1850S</alias>
<lname>1850SOI_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI_MPASO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_LNDATM_CNORDCTC_1850</alias>
<lname>1850_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%PRES_DOCN%DOM_SROF_SGLC_SWAV_BGC%LNDATM</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPECACNT_20TR</alias>
<lname>20TR_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>20TR_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPECACNT_SSP585_CMIP6</alias>
<lname>SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
Expand All @@ -211,12 +216,12 @@

<compset>
<alias>BGCEXP_BCRD_CNPECACNT_20TR</alias>
<lname>20TR_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD</lname>
<lname>20TR_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BCRD</lname>
</compset>

<compset>
<alias>BGCEXP_BCRD_CNPECACNT_SSP585_CMIP6</alias>
<lname>SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD</lname>
<lname>SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BCRD</lname>
</compset>

<compset>
Expand All @@ -231,12 +236,12 @@

<compset>
<alias>BGCEXP_BDRC_CNPECACNT_20TR</alias>
<lname>20TR_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC</lname>
<lname>20TR_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BDRC</lname>
</compset>

<compset>
<alias>BGCEXP_BDRC_CNPECACNT_SSP585_CMIP6</alias>
<lname>SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC</lname>
<lname>SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BDRC</lname>
</compset>

<compset>
Expand All @@ -251,12 +256,12 @@

<compset>
<alias>BGCEXP_BDRD_CNPECACNT_20TR</alias>
<lname>20TR_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
<lname>20TR_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BDRD</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>
<lname>SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
Expand All @@ -269,6 +274,16 @@
<lname>SSP585SOI_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI_MPASO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>BGCEXP_LNDATM_CNORDCTC_20TR</alias>
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%PRES_DOCN%DOM_SROF_SGLC_SWAV_BGC%LNDATM</lname>
</compset>

<compset>
<alias>BGCEXP_LNDATM_CNORDCTC_20TR</alias>
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%PRES_DOCN%DOM_SROF_SGLC_SWAV_BGC%LNDATM</lname>
</compset>


<!-- E3SM cryosphere compsets -->

Expand All @@ -289,19 +304,14 @@

<compset>
<alias>BGCEXP_BDRD_CNPECACNT_SSP585_CMIP6</alias>
<lname>SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
<lname>SSP585_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI%BGC_MPASO%OIECO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>BGCEXP_BDRD_CNPECACNT_20TRS</alias>
<lname>20TRSOI_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI_MPASO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>BGCEXP_BDRD_CNPECACNT_SSP585_CMIP6S</alias>
<lname>SSP585SOI_EAM%CMIP6_ELM%CNPECACNTBC_MPASSI_MPASO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<!-- E3SM BG compsets -->

<compset>
Expand Down
Loading

0 comments on commit 0e63bc3

Please sign in to comment.