ESCOMP · slevis-lmwg · Oct 2, 2026 · Apr 30, 2024 · May 1, 2024 · May 1, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -68,31 +68,31 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
 [submodule "ccs_config"]
 path = ccs_config
 url = https://github.com/ESMCI/ccs_config_cesm.git
-fxtag = ccs_config_cesm1.0.88
+fxtag = ccs_config_cesm1.0.92
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 
 [submodule "cime"]
 path = cime
 url = https://github.com/ESMCI/cime
-fxtag = cime6.5.5
+fxtag = cime6.5.20
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/cime
 
 [submodule "cmeps"]
 path = components/cmeps
 url = https://github.com/ESCOMP/CMEPS.git
-fxtag = cmeps1.1.69
+fxtag = cmeps1.1.71
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.109
+fxtag = cdeps1.0.110
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
@@ -2403,9 +2403,26 @@ sub setup_logic_urban {
 
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'building_temp_method');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'urban_hac');
+  add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'building_humidity_mode');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'urban_explicit_ac');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'urban_traffic');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'init_interp_fill_missing_urban_with_HD');
+  my $building_humidity_mode = $nl->get_value('building_humidity_mode');
+  if ($building_humidity_mode < 0 || $building_humidity_mode > 2) {
+     $log->fatal_error("building_humidity_mode must be 0, 1, or 2");
+  }
+  if ($building_humidity_mode >= 1 && $nl->get_value('building_temp_method') != 1) {
+     $log->fatal_error("building_humidity_mode=1 or 2 requires building_temp_method=1");
+  }
+  if ($building_humidity_mode == 2) {
+     my $urban_hac = remove_leading_and_trailing_quotes($nl->get_value('urban_hac'));
+     if ($urban_hac ne 'ON' && $urban_hac ne 'ON_WASTEHEAT') {
+        $log->fatal_error("building_humidity_mode=2 requires urban_hac to be ON or ON_WASTEHEAT");
+     }
+     if (! value_is_true($nl->get_value('urban_explicit_ac'))) {
+        $log->fatal_error("building_humidity_mode=2 requires urban_explicit_ac=.true.");
+     }
+  }
 }
 
 #-------------------------------------------------------------------------------

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -235,6 +235,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <calc_human_stress_indices               >FAST</calc_human_stress_indices>
 <calc_human_stress_indices phys="clm4_5" >NONE</calc_human_stress_indices>
 
+<!-- Urban building humidity and air-conditioning dehumidification -->
+<building_humidity_mode>0</building_humidity_mode>
+
 <!-- Explicit, time-varying urban air conditioning adoption rate scheme -->
 <urban_explicit_ac>.false.</urban_explicit_ac>
 <urban_explicit_ac phys="clm6_0" >.true.</urban_explicit_ac>

diff --git a/bld/namelist_files/namelist_definition_ctsm.xml b/bld/namelist_files/namelist_definition_ctsm.xml
@@ -1247,6 +1247,18 @@ Turn urban air conditioning/heating ON or OFF and add wasteheat:
 <entry id="urban_explicit_ac" type="logical" category="clm_physics"
        group="clmu_inparm" valid_values="" >
 If TRUE, use explicit, time-varying AC adoption rate for air-conditioning flux and interior building temperature calculations.
+See Li et al. (2024), doi:10.1029/2023MS004107
+</entry>
+
+<entry id="building_humidity_mode" type="integer" category="clm_physics"
+       group="clmu_inparm" valid_values="0,1,2" >
+Select treatment of indoor building humidity:
+    0 = Existing CLMU formulation without indoor humidity or air-conditioning dehumidification
+    1 = Indoor humidity and latent heat exchange without air-conditioning dehumidification
+    2 = Indoor humidity and latent heat exchange with air-conditioning dehumidification and condensate production
+Modes 1 and 2 require building_temp_method=1 (prognostic calculation of interior building temp (clm5_0)).
+Mode 2 also requires urban_hac to be ON or ON_WASTEHEAT and urban_explicit_ac=.true.
+See Li et al. (2026), doi:10.1038/s44284-026-00474-4
 </entry>
 
 <entry id="urban_traffic" type="logical" category="clm_physics"

diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
@@ -165,7 +165,7 @@ sub cat_and_create_namelistinfile {
 #
 # Figure out number of tests that will run
 #
-my $ntests = 3411;
+my $ntests = 3415;
 
 if ( defined($opts{'compare'}) ) {
    $ntests += 2061;
@@ -634,6 +634,36 @@ sub cat_and_create_namelistinfile {
 system( "touch $finidat" );
 
 my %failtest = (
+     "building humidity mode below range"
+                                  =>{ options=>"-envxml_dir .",
+                                     namelst=>"building_humidity_mode=-1",
+                                     phys=>"clm6_0",
+                                   },
+     "building humidity mode above range"
+                                  =>{ options=>"-envxml_dir .",
+                                     namelst=>"building_humidity_mode=3",
+                                     phys=>"clm6_0",
+                                   },
+     "humidity mode 1 with simple temperature"
+                                  =>{ options=>"-envxml_dir .",
+                                     namelst=>"building_humidity_mode=1,building_temp_method=0",
+                                     phys=>"clm6_0",
+                                   },
+     "humidity mode 2 with simple temperature"
+                                  =>{ options=>"-envxml_dir .",
+                                     namelst=>"building_humidity_mode=2,building_temp_method=0,urban_hac='ON',urban_explicit_ac=.true.",
+                                     phys=>"clm6_0",
+                                   },
+     "humidity mode 2 with AC off"
+                                  =>{ options=>"-envxml_dir .",
+                                     namelst=>"building_humidity_mode=2,building_temp_method=1,urban_hac='OFF',urban_explicit_ac=.true.",
+                                     phys=>"clm6_0",
+                                   },
+     "humidity mode 2 without explicit AC"
+                                  =>{ options=>"-envxml_dir .",
+                                     namelst=>"building_humidity_mode=2,building_temp_method=1,urban_hac='ON',urban_explicit_ac=.false.",
+                                     phys=>"clm6_0",
+                                   },
      "cmip7_w_issp"              =>{ options=>"-envxml_dir . -use_case 1850-2100_SSP2-4.5_transient",
                                      namelst=>"",
                                      CLM_CMIP_ERA=>"cmip7",
@@ -1211,10 +1241,6 @@ sub cat_and_create_namelistinfile {
                                      namelst=>"use_fates_inventory_init=.true.",
                                      phys=>"clm4_5",
                                    },
-     "inventoryfileDNE"          =>{ options=>"-bgc fates -envxml_dir . -no-megan",
-                                     namelst=>"use_fates_inventory_init=.true., fates_inventory_ctrl_filename='zztop'",
-                                     phys=>"clm4_5",
-                                   },
      "useFATESLUH2butnotfile"    =>{ options=>"--res 0.9x1.25 --bgc fates --envxml_dir . --no-megan",
                                      namelst=>"use_fates_luh=.true.",
                                      phys=>"clm4_5",
@@ -1223,10 +1249,6 @@ sub cat_and_create_namelistinfile {
                                      namelst=>"use_fates_lupft=.true.",
                                      phys=>"clm4_5",
                                    },
-     "useFATESLUH2fileDNE"       =>{ options=>"-bgc fates -envxml_dir . -no-megan",
-                                     namelst=>"use_fates_luh=.true., fluh_timeseries='zztop'",
-                                     phys=>"clm4_5",
-                                   },
      "useFATESLUH2invalidlogic"  =>{ options=>"-bgc fates -envxml_dir . -no-megan",
                                      namelst=>"use_fates_luh=.true., fates_lu_transition_logic=0",
                                      phys=>"clm6_0",

diff --git a/ccs_config b/ccs_config
diff --git a/cime b/cime
diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
@@ -30,11 +30,17 @@
 
   <!-- ctsm_sci test suite failures -->
   <test name="SMS_Ld12_Mmpi-serial.1x1_urbanc_alpha.I1PtClm60SpRsGs.derecho_intel.clm-output_sp_highfreq">
-    <phase name="RUN">
+    <phase name="SETUP">
       <status>FAIL</status>
       <issue>CDEPS/#243 and/or #2122</issue>
     </phase>
   </test>
+  <test name="SMS_Ln9.ne30pg3_t232.I1850Clm60BgcCropCrujraG.derecho_intel.clm-clm60cam7LndTuningMode--clm-norESMTest">
+    <phase name="RUN">
+      <status>FAIL</status>
+      <issue>#4238</issue>
+    </phase>
+  </test>
 
   <test name="SMS_Ld5.f09_g17.ISSP245Clm50BgcCrop.derecho_intel.clm-ciso_dec2050Start">
     <phase name="RUN">
@@ -128,63 +134,6 @@
     </phase>
   </test>
 
-  <test name="ERP_Ly3_P64x2.f10_f10_mg37.IHistClm50BgcCrop.derecho_intel.clm-cropMonthOutput">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#4160</issue>
-    </phase>
-  </test>
-
-  <test name="ERP_P64x2_Ld1096.f10_f10_mg37.I2000Clm50BgcCrop.derecho_intel.clm-clm50cropIrrigMonth_interp">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#4160</issue>
-    </phase>
-  </test>
-
-  <test name="ERP_P64x2_Ld1096.f10_f10_mg37.I2000Clm50BgcCrop.derecho_intel.clm-irrig_o3falk_reduceOutput">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#4160</issue>
-    </phase>
-  </test>
-
-  <test name="ERP_P64x2_Ld366.f10_f10_mg37.I2000Clm50BgcCrop.derecho_intel.clm-irrig_alternate_monthly">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#4160</issue>
-    </phase>
-  </test>
-
-  <test name="ERP_P64x2_Ld765.f10_f10_mg37.I2000Clm60BgcCrop.derecho_intel.clm-monthly">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#4160</issue>
-    </phase>
-  </test>
-
-  <test name="ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_gnu.clm-monthly">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#4160</issue>
-    </phase>
-  </test>
-
-  <test name="ERP_P64x2_Ld396.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#4160</issue>
-    </phase>
-  </test>
-
-  <test name="ERP_Ly3_P64x2.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm-cropMonthOutput--clm-matrixcnOn_ignore_warnings">
-    <phase name="COMPARE_base_rest">
-      <status>FAIL</status>
-      <issue>#4160</issue>
-      <comment>Does this also relate to #2619?</comment>
-    </phase>
-  </test>
-
   <!-- mpi-serial failures on derecho_intel with the intel compiler update to intel/2025.3.2 -->
   <test name="ERS_D_Ld7_Mmpi-serial.1x1_smallvilleIA.IHistClm50BgcCropRsGs.derecho_intel.clm-decStart1851_noinitial">
     <phase name="RUN">

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -317,6 +317,16 @@
       <option name="comment">CESM3 development test at the standard coupled resolution for a month</option>
     </options>
   </test>
+  <test name="SMS_Ln9" grid="ne30pg3_t232" compset="I1850Clm60BgcCropCrujraG" testmods="clm-clm60cam7LndTuningMode--clm-norESMTest">
+    <machines>
+      <machine name="derecho" compiler="intel" category="ctsm_sci"/>
+      <machine name="derecho" compiler="intel" category="ctsm_release"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">Test that settting CIME_MODEL==NorESM doesn't break</option>
+    </options>
+  </test>
   <test name="ERS_Ly3" grid="f10_f10_ais8gris4_mg37" compset="I1850Clm60SpGag">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -2213,16 +2223,6 @@
       <option name="comment">Want a multi-year global crop restart test; this was 5 years when we were doing cold start, but 3 years is probably sufficient given that we have spun-up crop initial conditions</option>
     </options>
   </test>
-  <test name="ERP_P64x2_Ld364" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_o3falk_reduceOutput">
-    <machines>
-      <machine name="derecho" compiler="intel" category="aux_clm"/>
-      <machine name="derecho" compiler="intel" category="ctsm_release"/>
-    </machines>
-    <options>
-      <option name="wallclock">01:40:00</option>
-      <option name="comment">Repeat the ERP_64x2_Ld1096 test above for a shorter period, this can be removed when #4160 is resolved</option>
-    </options>
-  </test>
   <test name="ERP_P64x2_Ld1096" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/clm50cropIrrigMonth_interp">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -2233,16 +2233,6 @@
       <option name="comment">Want a multi-year global crop restart test; this was 5 years when we were doing cold start, but 3 years is probably sufficient given that we have spun-up crop initial conditions</option>
     </options>
   </test>
-  <test name="ERP_P64x2_Ld364" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/clm50cropIrrigMonth_interp">
-    <machines>
-      <machine name="derecho" compiler="intel" category="aux_clm"/>
-      <machine name="derecho" compiler="intel" category="ctsm_release"/>
-    </machines>
-    <options>
-      <option name="wallclock">01:40:00</option>
-      <option name="comment">Repeat the ERP_64x2_Ld1096 test above for a shorter period, this can be removed when #4160 is resolved</option>
-    </options>
-  </test>
   <test name="ERP_P64x2_Ld366" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_alternate_monthly">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -2253,16 +2243,6 @@
        <option name="comment">Want an ERP test covering some non-default irrigation options. Long enough so that we're likely to exercise the various groundwater irrigation code.</option>
     </options>
   </test>
-  <test name="ERP_P64x2_Ld364" grid="f10_f10_mg37" compset="I2000Clm50BgcCrop" testmods="clm/irrig_alternate_monthly">
-    <machines>
-      <machine name="derecho" compiler="intel" category="aux_clm"/>
-      <machine name="derecho" compiler="intel" category="ctsm_release"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:30:00</option>
-      <option name="comment">Repeat the ERP_64x2_Ld366 test above for a shorter period, this can be removed when #4160 is resolved</option>
-    </options>
-  </test>
   <test name="ERS_D" grid="f10_f10_mg37" compset="I1850Clm50BgcCrop" testmods="clm/reseedresetsnow">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_clm"/>
@@ -5044,7 +5024,7 @@
       <machine name="derecho" compiler="intel" category="crop_calendars"/>
     </machines>
     <options>
-      <option name="wallclock">12:00:00</option>
+      <option name="wallclock">06:00:00</option>
       <option name="comment">This test is designed to test the ability to prescribe crop sowing dates and maturity requirements. It first performs a GDD-generating run, then calls Python code to generate the maturity requirement file. This is then used in a sowing+maturity forced run, which finally is tested to ensure correct behavior.</option>
     </options>
   </test>
@@ -5057,7 +5037,7 @@
       <machine name="derecho" compiler="intel" category="ctsm_sci"/>
     </machines>
     <options>
-      <option name="wallclock">6:00:00</option>
+      <option name="wallclock">01:40:00</option>
       <option name="comment">This test is designed to test the ability to prescribe crop sowing dates and maturity requirements. It first performs a GDD-generating run, then calls Python code to generate the maturity requirement file. This is then used in a sowing+maturity forced run, which finally is tested to ensure correct behavior.</option>
     </options>
   </test>

diff --git a/cime_config/testdefs/testmods_dirs/clm/norESMTest/shell_commands b/cime_config/testdefs/testmods_dirs/clm/norESMTest/shell_commands
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./xmlchange MODEL="noresm"
diff --git a/components/cdeps b/components/cdeps
diff --git a/components/cmeps b/components/cmeps
diff --git a/doc/.ChangeLog_template b/doc/.ChangeLog_template
@@ -95,7 +95,7 @@ infrastructure should be run when appropriate, as described below.
 
     derecho -
 
-  python testing (if python code has changed; see instructions in python/README.md; document testing done):
+  python testing (if python or CIME code has changed; see instructions in python/README.md; document testing done):
 
     derecho -
+9 −0		machines/derecho/config_machines.xml
+176 −3		modelgrid_aliases_nuopc.xml
+1 −1		.gitmodules
+2 −1		CIME/SystemTests/system_tests_common.py
+1 −1		CIME/Tools/Makefile
+7 −7		CIME/Tools/case.build
+9 −0		CIME/Tools/jenkins_generic_job
+7 −1		CIME/XML/archive_base.py
+49 −31		CIME/XML/env_batch.py
+21 −3		CIME/XML/env_mach_pes.py
+51 −0		CIME/XML/env_run.py
+1 −2		CIME/bless_test_results.py
+10 −25		CIME/build.py
+4 −2		CIME/build_scripts/buildlib.pio
+9 −16		CIME/case/case.py
+5 −2		CIME/case/case_clone.py
+116 −5		CIME/case/case_setup.py
+1 −14		CIME/case/case_st_archive.py
+16 −2		CIME/case/preview_namelists.py
+0 −11		CIME/config.py
+1 −5		CIME/data/config/cesm/config_files.xml
+153 −133		CIME/data/config/noresm/config_files.xml
+1 −1		CIME/data/config/xml_schemas/config_machines_template.xml
+23 −7		CIME/get_tests.py
+1 −1		CIME/hist_utils.py
+4 −0		CIME/jenkins_generic_job.py
+7 −3		CIME/non_py/src/timing/GPTLget_memusage.c
+1 −1		CIME/scripts/create_newcase.py
+8 −16		CIME/scripts/create_test.py
+11 −14		CIME/test_scheduler.py
+0 −58		CIME/tests/test_unit_build.py
+89 −0		CIME/tests/test_unit_case_setup.py
+39 −37		CIME/tests/test_unit_test_scheduler.py
+40 −0		CIME/tests/test_unit_xml_archive_base.py
+81 −5		CIME/tests/test_unit_xml_env_batch.py
+40 −0		CIME/tests/test_unit_xml_env_mach_pes.py
+102 −10		CIME/utils.py
+1 −1		doc/source/ccs/building-a-case.rst
+13 −2		doc/source/ccs/index.rst
+0 −2		doc/source/ccs/model-configuration/customize-cime.rst
+4 −1		doc/source/ccs/model-configuration/variables/component.rst
+1 −1		doc/source/ccs/model-configuration/variables/machine.rst
+1 −1		test-requirements.txt
+1 −1		tools/utils/find_circular_dependency.py
+27 −25		dglc/dglc_datamode_noevolve_mod.F90
+1 −0		dshr/CMakeLists.txt
+157 −0		dshr/dshr_global_sums_mod.F90
+12 −1		cesm/nuopc_cap_share/driver_pio_mod.F90
+15 −15		cime_config/config_component.xml
+20 −0		cime_config/namelist_definition_drv.xml
+1 −0		mediator/CMakeLists.txt
+157 −0		mediator/med_global_sums_mod.F90
+38 −33		mediator/med_phases_post_rof_mod.F90
+3 −16		mediator/med_phases_prep_atm_mod.F90
+80 −63		mediator/med_phases_prep_glc_mod.F90