Merge pull request #308 from fischer-ncar/cesm3.0-alphabranch

Revert cice tag and update compsets.
ESCOMP · Dec 11, 2024 · 2cae141 · 2cae141
2 parents ea9c94b + 2c44dbd
commit 2cae141
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -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

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -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 -->