Skip to content

Commit ae51494

Browse files
committed
Merge branch 'darincomeau/scripts/update-v3-cryo-compsets' (PR #6625)
Updating CRYO compsets to v3 ELM settings Updates the ELM settings in the following compsets to the v3 settings in PR #6108: * CRYO1850 * CRYO1850-DISMF * CRYO1850-4xCO2 * CRYO1950 * CRYO1950-DISMF * CRYO20TR * CRYOSSP370 * CRYOSSP585 Adds following compsets matching the WCYCL counterparts: * CRYO1850-1pctCO2 * CRYOSSP245 [NML] only for CRYO* compsets [non-BFB] only for CRYO* compsets
2 parents 3d4085f + 57392e7 commit ae51494

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

cime_config/allactive/config_compsets.xml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -383,42 +383,52 @@
383383

384384
<compset>
385385
<alias>CRYO1850</alias>
386-
<lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
386+
<lname>1850SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
387387
</compset>
388388

389389
<compset>
390390
<alias>CRYO1850-4xCO2</alias>
391-
<lname>1850SOI_EAM%CMIP6-4xCO2_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
391+
<lname>1850SOI_EAM%CMIP6-4xCO2_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
392+
</compset>
393+
394+
<compset>
395+
<alias>CRYO1850-1pctCO2</alias>
396+
<lname>1850SOI_EAM%CMIP6-1pctCO2_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
392397
</compset>
393398

394399
<compset>
395400
<alias>CRYO1950</alias>
396-
<lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
401+
<lname>1950SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
397402
</compset>
398403

399404
<compset>
400405
<alias>CRYO1850-DISMF</alias>
401-
<lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
406+
<lname>1850SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
402407
</compset>
403408

404409
<compset>
405410
<alias>CRYO1950-DISMF</alias>
406-
<lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
411+
<lname>1950SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
407412
</compset>
408413

409414
<compset>
410415
<alias>CRYO20TR</alias>
411-
<lname>20TRSOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
416+
<lname>20TRSOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
417+
</compset>
418+
419+
<compset>
420+
<alias>CRYOSSP245</alias>
421+
<lname>SSP245SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
412422
</compset>
413423

414424
<compset>
415425
<alias>CRYOSSP585</alias>
416-
<lname>SSP585SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
426+
<lname>SSP585SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
417427
</compset>
418428

419429
<compset>
420430
<alias>CRYOSSP370</alias>
421-
<lname>SSP370SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
431+
<lname>SSP370SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
422432
</compset>
423433

424434
<compset>

0 commit comments

Comments
 (0)