Skip to content
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 @@ -58,7 +58,7 @@
path = components/cam
url = https://www.github.com/ESCOMP/CAM
fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM
fxtag = cam6_4_147
fxtag = cam6_4_149
fxrequired = ToplevelRequired

[submodule "clm"]
Expand Down
16 changes: 8 additions & 8 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@

<compset>
<alias>B1850C_MTt4s</alias>
<lname>1850C_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850C_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>B1850CM</alias>
<lname>1850C_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850C_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

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

<compset>
<alias>BHISTC_MTt4s</alias>
<lname>HISTC_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>HISTC_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BHISTCM</alias>
<lname>HISTC_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>HISTC_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
Expand Down Expand Up @@ -97,20 +97,20 @@

<compset>
<alias>B1850E_MTt4s</alias>
<lname>1850E_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850E_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>B1850EM</alias>
<lname>1850E_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>1850E_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BHISTE_MTt4s</alias>
<lname>HISTE_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>HISTE_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>
<compset>
<alias>BHISTEM</alias>
<lname>HISTE_CAM70%MT%CT4S_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
<lname>HISTE_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
</compset>

<!-- SOM compsets -->
Expand Down
2 changes: 1 addition & 1 deletion components/cam
Submodule cam updated 120 files