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.

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

Revert cice tag and update compsets. #308

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
url = https://github.com/ESCOMP/CESM_CICE
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
fxrequired = ToplevelRequired
fxtag = cesm_cice6_6_0_1
fxtag = cesm3_cice6_5_0_15

[submodule "mom"]
path = components/mom
Expand Down
37 changes: 25 additions & 12 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,59 +40,72 @@

<compset>
<alias>B1850C_MTt4s</alias>
<lname>1850C_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850C_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>B1850CM</alias>
<lname>1850C_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850C_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>


<compset>
<alias>B1850C_MTso</alias>
<lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BMT1850</alias>
<lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BMT1850_MARBL</alias>
<lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
</compset>

<compset>
<alias>BHISTC_MTso</alias>
<lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BHISTC_MTt4s</alias>
<lname>HISTC_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>HISTC_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>BHISTCM</alias>
<lname>HISTC_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>HISTC_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>


<compset>
<alias>B1850C_LTso</alias>
<lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>BLT1850</alias>
<lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BLT1850_MARBL</alias>
<lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_SWAV</lname>
</compset>

<compset>
<alias>BHISTC_LTso</alias>
<lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>

<!-- Emissions driven compsets for CESM3 -->

<compset>
<alias>B1850E_MTt4s</alias>
<lname>1850E_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850E_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>B1850EM</alias>
<lname>1850E_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6%MARBL-BIO_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850E_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_DGLC%NOEVOLVE_WW3</lname>
</compset>

<!-- SOM compsets -->
Expand Down
Loading