Merge branch 'ESCOMP:cesm3.0-alphabranch' into DART_lowres_cesm

kdraeder · web-flow · commit 9d689793be62 · 2026-04-10T13:42:17.000-06:00
diff --git a/.gitmodules b/.gitmodules
@@ -30,14 +30,14 @@
         path = ccs_config
         url = https://github.com/ESMCI/ccs_config_cesm.git
         fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
-        fxtag = ccs_config_cesm1.0.69
+        fxtag = ccs_config_cesm1.0.79
         fxrequired = ToplevelRequired
 
 [submodule "cime"]
         path = cime
         url = https://github.com/ESMCI/cime
         fxDONOTUSEurl = https://github.com/ESMCI/cime
-	fxtag = cime6.1.159
+	fxtag = cime6.1.169
         fxrequired = ToplevelRequired
 
 [submodule "fms"]
@@ -51,29 +51,29 @@
         path = share
         url = https://github.com/ESCOMP/CESM_share
         fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
-        fxtag = share1.1.18
+        fxtag = share1.1.19
         fxrequired = ToplevelRequired
 
 [submodule "cam"]
         path = components/cam
         url = https://www.github.com/ESCOMP/CAM
         fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM
-        fxtag = cam6_4_147
+        fxtag = cam6_4_161
         fxrequired = ToplevelRequired
 
 [submodule "clm"]
         path = components/clm
         url = https://github.com/ESCOMP/CTSM
         fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
         fxrequired = ToplevelRequired
-        fxtag = ctsm5.4.003
+        fxtag = ctsm5.4.027
 
 [submodule "cice"]
         path = components/cice
         url = https://github.com/ESCOMP/CESM_CICE
         fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
         fxrequired = ToplevelRequired
-        fxtag = cesm3_cice6_6_1_10
+        fxtag = cesm3_cice6_6_3_6
 
 [submodule "mom"]
         path = components/mom
@@ -94,14 +94,14 @@
         url = https://github.com/ESCOMP/CDEPS
         fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS
         fxrequired = ToplevelRequired
-        fxtag = cdeps1.0.85
+        fxtag = cdeps1.0.93
 
 [submodule "cmeps"]
         path = components/cmeps
         url = https://github.com/ESCOMP/CMEPS.git
         fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
         fxrequired = ToplevelRequired
-	fxtag = cmeps1.1.31
+	fxtag = cmeps1.1.42
 
 [submodule "rtm"]
         path = components/rtm
@@ -114,11 +114,11 @@
         path = components/ww3
         url = https://github.com/ESCOMP/WW3_interface
         fxDONOTUSEurl = https://github.com/ESCOMP/WW3_interface
-        fxtag = main_0.0.18
+        fxtag = main_0.0.19
         fxrequired = ToplevelRequired
 
 [submodule "mizuroute"]
-        path = components/mizuroute
+        path = components/mizuRoute
         url = https://github.com/ESCOMP/mizuRoute
         fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
         fxrequired = ToplevelRequired
@@ -129,7 +129,7 @@
         url = https://github.com/ESCOMP/MOSART
         fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
         fxrequired = ToplevelRequired
-        fxtag = mosart1.1.12
+        fxtag = mosart1.1.13
 
 [submodule "parallelio"]
         path = libraries/parallelio
@@ -145,6 +145,13 @@
         fxtag = MPIserial_2.5.4
         fxrequired = ToplevelRequired
 
+[submodule "tuv-x"]
+	path = libraries/tuv-x
+	url = https://github.com/NCAR/tuv-x.git
+	fxDONOTUSEurl = https://github.com/NCAR/tuv-x.git
+	fxrequired = ToplevelRequired
+	fxtag = v0.14.3
+
 [submodule "pysect"]
         path = tools/statistical_ensemble_test/pyCECT
         url = https://github.com/NCAR/PyCECT
diff --git a/ChangeLog b/ChangeLog
diff --git a/README.rst b/README.rst
@@ -69,7 +69,7 @@ More details on porting CESM
 ----------------------------
 
 For more details on porting CESM to a new machine, see
-http://esmci.github.io/cime/versions/master/html/users_guide/porting-cime.html
+https://esmci.github.io/cime/versions/master/html/ccs/model-configuration/support-a-new-machine.html
 
 Obtaining the full model code and associated scripting infrastructure
 =====================================================================
diff --git a/ccs_config b/ccs_config
@@ -1 +1 @@
-Subproject commit 7182e93b1d4ca1367f023a3ae3727d477a9b6c2b
+Subproject commit 8fe3339bd2b75c2090e06b054972bcd805c9d408
diff --git a/cime b/cime
@@ -1 +1 @@
-Subproject commit 39fe6a0e7f0918bdae8662da9f7aea1209a821b6
+Subproject commit ffbf6c596c5736538690af1bc9269d830abcd53c
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -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>
@@ -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>
@@ -103,20 +103,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 -->
diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
@@ -49,7 +49,7 @@
 	  <ntasks_lnd>5400</ntasks_lnd>
 	  <ntasks_rof>104</ntasks_rof>
 	  <ntasks_ice>5400</ntasks_ice>
-	  <ntasks_ocn>384</ntasks_ocn>
+	  <ntasks_ocn>640</ntasks_ocn>
 	  <ntasks_glc>104</ntasks_glc>
 	  <ntasks_wav>104</ntasks_wav>
 	  <ntasks_cpl>5400</ntasks_cpl>
@@ -213,16 +213,16 @@
 	</rootpe>
       </pes>
       <pes pesize="M" compset="CAM.*%LT.*MOM6(?!.*%MARBL-BIO)">
-	<comment>10 ypd/ 5500 pe-hrs/simyr expected</comment>
+	<comment>11.6 ypd/ 7100 pe-hrs/simyr expected</comment>
 	<ntasks>
-	  <ntasks_atm>1920</ntasks_atm>
-	  <ntasks_lnd>1152</ntasks_lnd>
-	  <ntasks_rof>512</ntasks_rof>
-	  <ntasks_ice>768</ntasks_ice>
-	  <ntasks_ocn>512</ntasks_ocn>
-	  <ntasks_glc>64</ntasks_glc>
-	  <ntasks_wav>64</ntasks_wav>
-	  <ntasks_cpl>1920</ntasks_cpl>
+	  <ntasks_atm>2700</ntasks_atm>
+	  <ntasks_lnd>2700</ntasks_lnd>
+	  <ntasks_rof>1280</ntasks_rof>
+	  <ntasks_ice>2700</ntasks_ice>
+	  <ntasks_ocn>640</ntasks_ocn>
+	  <ntasks_glc>116</ntasks_glc>
+	  <ntasks_wav>116</ntasks_wav>
+	  <ntasks_cpl>2700</ntasks_cpl>
 	</ntasks>
 	<nthrds>
 	  <nthrds_atm>1</nthrds_atm>
@@ -238,24 +238,24 @@
 	  <rootpe_atm>0</rootpe_atm>
 	  <rootpe_lnd>0</rootpe_lnd>
 	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>1152</rootpe_ice>
-	  <rootpe_ocn>1920</rootpe_ocn>
-	  <rootpe_glc>2496</rootpe_glc>
-	  <rootpe_wav>2432</rootpe_wav>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>2816</rootpe_ocn>
+	  <rootpe_glc>2700</rootpe_glc>
+	  <rootpe_wav>2700</rootpe_wav>
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
       <pes pesize="M" compset="CAM.*%LT.*MOM6%[^_]*MARBL-BIO">
 	<comment>10 ypd/ 7000 pe-hrs/simyr expected</comment>
 	<ntasks>
-	  <ntasks_atm>1920</ntasks_atm>
-	  <ntasks_lnd>640</ntasks_lnd>
-	  <ntasks_rof>512</ntasks_rof>
-	  <ntasks_ice>1152</ntasks_ice>
+	  <ntasks_atm>2700</ntasks_atm>
+	  <ntasks_lnd>2700</ntasks_lnd>
+	  <ntasks_rof>1280</ntasks_rof>
+	  <ntasks_ice>2700</ntasks_ice>
 	  <ntasks_ocn>1408</ntasks_ocn>
-	  <ntasks_glc>64</ntasks_glc>
-	  <ntasks_wav>64</ntasks_wav>
-	  <ntasks_cpl>1920</ntasks_cpl>
+	  <ntasks_glc>116</ntasks_glc>
+	  <ntasks_wav>116</ntasks_wav>
+	  <ntasks_cpl>2700</ntasks_cpl>
 	</ntasks>
 	<nthrds>
 	  <nthrds_atm>1</nthrds_atm>
@@ -271,10 +271,10 @@
 	  <rootpe_atm>0</rootpe_atm>
 	  <rootpe_lnd>0</rootpe_lnd>
 	  <rootpe_rof>0</rootpe_rof>
-	  <rootpe_ice>704</rootpe_ice>
-	  <rootpe_ocn>1920</rootpe_ocn>
-	  <rootpe_glc>1856</rootpe_glc>
-	  <rootpe_wav>1792</rootpe_wav>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>2816</rootpe_ocn>
+	  <rootpe_glc>2700</rootpe_glc>
+	  <rootpe_wav>2700</rootpe_wav>
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml
@@ -202,14 +202,6 @@
       <option name="wallclock"> 00:30:00 </option>
     </options>
   </test>
-  <test name="ERS_Ld7" grid="ne30pg3_t232" compset="B1850C_LSC" testmods="allactive/defaultio">
-    <machines>
-      <machine name="derecho"   compiler="intel" category="prealpha"/>
-    </machines>
-    <options>
-      <option name="wallclock"> 00:30:00 </option>
-    </options>
-  </test>
   <!-- PET tests do not work because of issues with openmp in the se dycore -->
   <test name="PET_PM" grid="ne30pg3_t232" compset="B1850C_LTso" testmods="allactive/defaultiomi">
     <machines>
diff --git a/cime_config/testmods_dirs/allactive/defaultio/user_nl_cpl b/cime_config/testmods_dirs/allactive/defaultio/user_nl_cpl
@@ -0,0 +1 @@
+histaux_wav2med_file1_ntperfile = 1
diff --git a/components/cam b/components/cam
@@ -1 +1 @@
-Subproject commit 1ee3228dcc7914bd1e317ea9f372854978072d49
+Subproject commit da38e55454ee870107addf6a157c0d67bc2f7978
diff --git a/components/cdeps b/components/cdeps
@@ -1 +1 @@
-Subproject commit e43e82954c2081db10e2bb214c389c6ef63e865b
+Subproject commit 3f7f22d0426ccc1428a1ebfd4357caf90009132a
diff --git a/components/cice b/components/cice
@@ -1 +1 @@
-Subproject commit 53196b354a8a9f8013048f2ae9b166595d577bec
+Subproject commit 8a5be1e383ac1845c6668cc4f3dab3582e1148fa
diff --git a/components/clm b/components/clm
@@ -1 +1 @@
-Subproject commit 98067b43147f62bc0fee7dedabc67763a061e166
+Subproject commit 9ec4ef38275acb8813e783f2c7e0b30db884c963
diff --git a/components/cmeps b/components/cmeps
@@ -1 +1 @@
-Subproject commit 8d3ff3aff46a0072679649acd82337a85ccc3b2a
+Subproject commit 567e1845f00e3f8047bb6634eec16ca9f0161f9f
diff --git a/components/mizuRoute b/components/mizuRoute
diff --git a/components/mosart b/components/mosart
@@ -1 +1 @@
-Subproject commit 0faa624a59b5ce677c40ed64f1ca65bb4997db8d
+Subproject commit a6f6e90606e362aa6367f7003cb4c130c4664bc6
diff --git a/components/ww3 b/components/ww3
@@ -1 +1 @@
-Subproject commit b93a64f3e763442a9f1b914ade98d503d89d90cf
+Subproject commit d9689af631c74a671c0397445149f0aeb09136bf
diff --git a/libraries/tuv-x b/libraries/tuv-x
@@ -0,0 +1 @@
+Subproject commit 5fdf789255aa657ebdd7da61e09a076ed9c704fe
diff --git a/share b/share
@@ -1 +1 @@
-Subproject commit 23567289f1533fdd0047e5a5d80e34dd390bf959
+Subproject commit 9aa0b449c47f0f22badf27eff2e6fd37ecdd2def
