Skip to content

Commit

Permalink
Merge pull request #199 from billsacks/cism_compset_longnames
Browse files Browse the repository at this point in the history
Description of changes

Explicitly put GRIS (for Greenland Ice Sheet) in the long name. This
shouldn't change any behavior. CISM has been backwards compatible in
this respect, but making this compset long name change will allow us to
remove the backwards compatibility code in CISM.
Specific notes

Contributors other than yourself, if any: none

Fixes #181

User interface changes?: No

Testing performed (automated tests and/or manual tests):

    Ran create_newcase with each of the changed compsets (but didn't run any further than that)
  • Loading branch information
fischer-ncar authored Jan 3, 2022
2 parents caa7ea3 + b0fc715 commit f75734c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,28 @@

<compset>
<alias>B1850</alias>
<lname>1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD</lname>
<lname>1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%GRIS-NOEVOLVE_WW3_BGC%BDRD</lname>
</compset>

<compset>
<alias>BW1850</alias>
<lname>1850_CAM60%WCTS_CLM50%BGC-CROP_CICE_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3</lname>
<lname>1850_CAM60%WCTS_CLM50%BGC-CROP_CICE_POP2%ECO%NDEP_MOSART_CISM2%GRIS-NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>BWma1850</alias>
<lname>1850_CAM60%WCCM_CLM50%BGC-CROP_CICE_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3</lname>
<lname>1850_CAM60%WCCM_CLM50%BGC-CROP_CICE_POP2%ECO%NDEP_MOSART_CISM2%GRIS-NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BHIST</alias>
<lname>HIST_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD</lname>
<lname>HIST_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%GRIS-NOEVOLVE_WW3_BGC%BDRD</lname>
</compset>

<!-- BG compsets: evolving ice sheet -->

<compset>
<alias>B1850G</alias>
<lname>1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%EVOLVE_WW3_BGC%BDRD</lname>
<lname>1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%GRIS-EVOLVE_WW3_BGC%BDRD</lname>
</compset>

<!-- Prognostic wave -->
Expand Down Expand Up @@ -90,15 +90,15 @@
<!-- MOM is an optional component of CESM and is not checked out by default
use checkout_externals mom to add it -->
<alias>B1850MOM</alias>
<lname>1850_CAM60_CLM50%BGC-CROP_CICE_MOM6_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD</lname>
<lname>1850_CAM60_CLM50%BGC-CROP_CICE_MOM6_MOSART_CISM2%GRIS-NOEVOLVE_SWAV_BGC%BDRD</lname>
</compset>

<!-- All active except data atmosphere
Used for spinup and testing of CISM couplings -->

<compset>
<alias>J1850G</alias>
<lname>1850_DATM%CRUv7_CLM50%BGC-CROP_CICE_POP2_MOSART_CISM2%EVOLVE_SWAV</lname>
<lname>1850_DATM%CRUv7_CLM50%BGC-CROP_CICE_POP2_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
</compset>

<entries>
Expand Down

0 comments on commit f75734c

Please sign in to comment.