Skip to content

Commit

Permalink
Merge pull request #3079 from ESMCI/jgfouca/branch-for-acme-split-201…
Browse files Browse the repository at this point in the history 
…9-04-15

Jgfouca/branch for acme split 2019 04 15
Changes:

Improve robustness of wget and err msgs
Restore Aquaplanet Capability
Making sure that we print out PIO logs only from rank 0 of each component.
modified log message in shr_strdata_mod
Test suite: scripts-regression-tests
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]

Fixes [CIME Github issue #]

User interface changes?:

Update gh-pages html (Y/N)?:

Code review: @jedwards4b
  • Loading branch information
@jedwards4b
jedwards4b authored Apr 15, 2019
2 parents 74730fe + 9945456 commit 14babd5
Show file tree
Hide file tree
Showing 12 changed files with 174 additions and 197 deletions.
88 changes: 44 additions & 44 deletions config/e3sm/allactive/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
TIME = Time period (e.g. 2000, HIST, RCP8...)
ATM = [CAM4, CAM5, SATM]
LND = [CLM45, SLND]
ICE = [MPASCICE, CICE, DICE, SICE]
ICE = [MPASSI, CICE, DICE, SICE]
OCN = [MPASO, DOCN, SOCN]
ROF = [MOSART, SROF]
GLC = [MALI, SGLC]
Expand All @@ -41,231 +41,231 @@

<compset>
<alias>A_WCYCL1850S_CMIP6</alias>
<lname>1850_CAM5%CMIP6_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>1850_CAM5%CMIP6_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL20TRS_CMIP6</alias>
<lname>20TR_CAM5%CMIP6_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>20TR_CAM5%CMIP6_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1950S_CMIP6_LR</alias>
<lname>1950_CAM5%CMIP6-LR_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>1950_CAM5%CMIP6-LR_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1950S_CMIP6_HR</alias>
<lname>1950_CAM5%CMIP6-HR_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>1950_CAM5%CMIP6-HR_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1950S_CMIP6_LRtunedHR</alias>
<lname>1950_CAM5%CMIP6-LRtunedHR_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>1950_CAM5%CMIP6-LRtunedHR_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<!-- E3SM v1 science compsets -->

<compset>
<alias>A_WCYCL2000</alias>
<lname>2000_CAM5%AV1C-L_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
<lname>2000_CAM5%AV1C-L_CLM45%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL2000S</alias>
<lname>2000_CAM5%AV1C-L_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>2000_CAM5%AV1C-L_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850</alias>
<lname>1850_CAM5%AV1C-L_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
<lname>1850_CAM5%AV1C-L_CLM45%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850S</alias>
<lname>1850_CAM5%AV1C-L_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>1850_CAM5%AV1C-L_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL20TR</alias>
<lname>20TR_CAM5%AV1C-L_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
<lname>20TR_CAM5%AV1C-L_CLM45%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL20TRS</alias>
<lname>20TR_CAM5%AV1C-L_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>20TR_CAM5%AV1C-L_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_CRYO</alias>
<lname>2000_CAM5%AV1C-L_CLM45%SPBC_MPASCICE_MPASO_MOSART_MALI_SWAV</lname>
<lname>2000_CAM5%AV1C-L_CLM45%SPBC_MPASSI_MPASO_MOSART_MALI_SWAV</lname>
</compset>

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

<compset>
<alias>A_WCYCL2000_H01A</alias>
<lname>2000_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
<lname>2000_CAM5%AV1C-H01A_CLM45%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL2000_H01AS</alias>
<lname>2000_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>2000_CAM5%AV1C-H01A_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850_H01A</alias>
<lname>1850_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
<lname>1850_CAM5%AV1C-H01A_CLM45%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850_H01AS</alias>
<lname>1850_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>1850_CAM5%AV1C-H01A_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>


<compset>
<alias>A_WCYCL20TR_H01A</alias>
<lname>20TR_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE_MPASO_MOSART_SGLC_SWAV</lname>
<lname>20TR_CAM5%AV1C-H01A_CLM45%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL20TR_H01AS</alias>
<lname>20TR_CAM5%AV1C-H01A_CLM45%SPBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>20TR_CAM5%AV1C-H01A_CLM45%SPBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

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

<compset>
<alias>BGCEXP_BCRC_CNPRDCTC_1850</alias>
<lname>1850_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>1850_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPRDCTC_1850S</alias>
<lname>1850_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>1850_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPRDCTC_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPRDCTC_20TRS</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRD_CNPRDCTC_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD</lname>
</compset>

<compset>
<alias>BGCEXP_BCRD_CNPRDCTC_20TRS</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRD</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRD</lname>
</compset>

<compset>
<alias>BGCEXP_BDRC_CNPRDCTC_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC</lname>
</compset>

<compset>
<alias>BGCEXP_BDRC_CNPRDCTC_20TRS</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BDRC</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BDRC</lname>
</compset>

<compset>
<alias>BGCEXP_BDRD_CNPRDCTC_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>BGCEXP_BDRD_CNPRDCTC_20TRS</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BDRD</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPECACNT_1850</alias>
<lname>1850_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>1850_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPECACNT_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRD_CNPECACNT_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD</lname>
</compset>

<compset>
<alias>BGCEXP_BDRC_CNPECACNT_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC</lname>
</compset>

<compset>
<alias>BGCEXP_BDRD_CNPECACNT_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASSI%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<!-- E3SM v1 cryosphere compsets -->

<compset>
<alias>A_WCYCL1850-DIB</alias>
<lname>1850_CAM5%AV1C-L_CLM45%SPBC_MPASCICE%DIB_MPASO%IB_MOSART_SGLC_SWAV</lname>
<lname>1850_CAM5%AV1C-L_CLM45%SPBC_MPASSI%DIB_MPASO%IB_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850-DIB-ISMF</alias>
<lname>1850_CAM5%AV1C-L_CLM45%SPBC_MPASCICE%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
<lname>1850_CAM5%AV1C-L_CLM45%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850-DIB_CMIP6</alias>
<lname>1850_CAM5%CMIP6_CLM45%SPBC_MPASCICE%DIB_MPASO%IB_MOSART_SGLC_SWAV</lname>
<lname>1850_CAM5%CMIP6_CLM45%SPBC_MPASSI%DIB_MPASO%IB_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL1850-DIB-ISMF_CMIP6</alias>
<lname>1850_CAM5%CMIP6_CLM45%SPBC_MPASCICE%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
<lname>1850_CAM5%CMIP6_CLM45%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
</compset>

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

<compset>
<alias>A_WCYCL2000_v0atm</alias>
<lname>2000_CAM5_CLM45%SP_MPASCICE_MPASO_MOSART_SGLC_SWAVi</lname>
<lname>2000_CAM5_CLM45%SP_MPASSI_MPASO_MOSART_SGLC_SWAVi</lname>
</compset>

<compset>
<alias>A_WCYCL1850S_v0atm</alias>
<lname>1850_CAM5_CLM45%SP_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
<lname>1850_CAM5_CLM45%SP_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>A_WCYCL2000S_v0atm</alias>
<lname>2000_CAM5_CLM45%SP_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAVi</lname>
<lname>2000_CAM5_CLM45%SP_MPASSI%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAVi</lname>
</compset>


<!-- E3SM BGC compsets -->

<compset>
<alias>A_BG1850CN</alias>
<lname>1850_CAM5_CLM45%CN_MPASCICE_MPASO_MOSART_MALI%SIA_SWAV</lname>
<lname>1850_CAM5_CLM45%CN_MPASSI_MPASO_MOSART_MALI%SIA_SWAV</lname>
</compset>

<!-- OCN + CICE + GLC Only Compsets -->
<compset>
<alias>MPAS_LISIO_TEST</alias>
<lname>2000_DATM%NYF_SLND_MPASCICE_MPASO_DROF%NYF_MALI%SIA_SWAV</lname>
<lname>2000_DATM%NYF_SLND_MPASSI_MPASO_DROF%NYF_MALI%SIA_SWAV</lname>
</compset>

<!-- Slab ocean cases -->
Expand Down
Loading

0 comments on commit 14babd5

Please sign in to comment.