ESCOMP · ekluzek · Jun 8, 2026 · Apr 23, 2026 · Apr 23, 2026 · May 6, 2026
diff --git a/.gitmodules b/.gitmodules
@@ -76,31 +76,31 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 [submodule "cime"]
 path = cime
 url = https://github.com/ESMCI/cime
-fxtag = cime6.1.176
+fxtag = cime6.2.2
 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.44
+fxtag = cmeps1.1.47
 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.93
+fxtag = cdeps1.0.96
 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
 
 [submodule "share"]
 path = share
 url = https://github.com/ESCOMP/CESM_share
-fxtag = share1.1.19
+fxtag = share1.1.20
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
@@ -124,7 +124,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial
 [submodule "doc-builder"]
 path = doc/doc-builder
 url = https://github.com/ESMCI/doc-builder
-fxtag = v3.1.1
+fxtag = v3.2.1
 fxrequired = ToplevelOptional
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/doc-builder
diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm
@@ -2264,6 +2264,7 @@ sub setup_logic_params_file {
   # get param data
   my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
 
+  $nl_flags->{'use_hillslope'} = $nl->get_value('use_hillslope');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'paramfile',
               'phys'=>$nl_flags->{'phys'},
               'use_hillslope'=>$nl_flags->{'use_hillslope'},
@@ -3677,11 +3678,8 @@ sub setup_logic_hillslope {
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_transmissivity_method' );
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_pft_distribution_method' );
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_soil_profile_method' );
-
-  $nl_flags->{'use_hillslope'} = $nl->get_value('use_hillslope');
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_hillslope_routing', 'use_hillslope'=>$nl_flags->{'use_hillslope'} );
   add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'hillslope_fsat_equals_zero', 'use_hillslope'=>$nl_flags->{'use_hillslope'} );
-
   my $use_hillslope = $nl->get_value('use_hillslope');
   my $use_hillslope_routing = $nl->get_value('use_hillslope_routing');
   if ( (! &value_is_true($use_hillslope)) && &value_is_true($use_hillslope_routing) ) {

diff --git a/cime b/cime
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/shell_commands
@@ -1,4 +1,4 @@
-SRCDIR=`./xmlquery SRCROOT --value`
+SRCDIR=`./xmlquery COMP_ROOT_DIR_LND --value`
 CASEDIR=`./xmlquery CASEROOT --value`
 FATESDIR=$SRCDIR/src/fates/
 FATESPARAMFILE=$CASEDIR/fates_params_init_dbh.json

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods
@@ -1,3 +1,2 @@
 ../Fates
 ../FatesCold
-../FatesSetupParamBuild/
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands
@@ -1,4 +1,4 @@
-SRCDIR=`./xmlquery SRCROOT --value`
+SRCDIR=`./xmlquery COMP_ROOT_DIR_LND --value`
 CASEDIR=`./xmlquery CASEROOT --value`
 FATESDIR=$SRCDIR/src/fates/
 FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_p.json

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods
@@ -1,3 +1,2 @@
 ../Fates
 ../FatesCold
-../FatesSetupParamBuild/
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands
@@ -1,4 +1,4 @@
-SRCDIR=`./xmlquery SRCROOT --value`
+SRCDIR=`./xmlquery COMP_ROOT_DIR_LND --value`
 CASEDIR=`./xmlquery CASEROOT --value`
 FATESDIR=$SRCDIR/src/fates/
 FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_np.json

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/README b/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/README
@@ -11,8 +11,8 @@ Given that the default fates parameter file has the above variables as unset,
 a custom fates parameter file must be supplied to appropriately test this mode.
 This testmod itself addresses CTSM issue 2151: https://github.com/ESCOMP/CTSM/issues/2151
 Note that to avoid exceeding the filename string length maximu, the parameter
-file generated on the fly is placed in the $SRCROOT/src/fates/parameter_files
-directory.  This may still run into problems is the $SRCROOT string is too long.
+file generated on the fly is placed in the $COMP_ROOT_DIR_LND/src/fates/parameter_files
+directory.  This may still run into problems is the $COMP_ROOT_DIR_LND string is too long.
 
 The max_dist value will impact the size of the 'neighborhood' of gridcells
 that fates will attempt to distribute seeds to.  To limit the neighborhood to

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/include_user_mods
@@ -1,3 +1,2 @@
 ../Fates
 ../FatesCold
-../FatesSetupParamBuild
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/shell_commands
@@ -1,4 +1,4 @@
-SRCDIR=`./xmlquery SRCROOT --value`
+SRCDIR=`./xmlquery COMP_ROOT_DIR_LND --value`
 CASEDIR=`./xmlquery CASEROOT --value`
 FATESDIR=$SRCDIR/src/fates/
 

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStream/README b/cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStream/README
@@ -5,8 +5,8 @@ parameter from 1 to 2.  This is all that is needed, both radiation schemes
 fates_rad_model
 
 Note that to avoid exceeding the filename string length maximum, the parameter
-file generated on the fly is placed in the $SRCROOT/src/fates/parameter_files
-directory.  This may still run into problems is the $SRCROOT string is too long.
+file generated on the fly is placed in the $COMP_ROOT_DIR_LND/src/fates/parameter_files
+directory.  This may still run into problems is the $COMP_ROOT_DIR_LND string is too long.
 
 Like the test with seed dispersal activation, the main downside of this method is
 that this file will require a custom update for every fates parameter file API update.

diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesSetupParamBuild/README.md b/cime_config/testdefs/testmods_dirs/clm/FatesSetupParamBuild/README.md
diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesSetupParamBuild/run_shell_commands_tests b/cime_config/testdefs/testmods_dirs/clm/FatesSetupParamBuild/run_shell_commands_tests
+67 −0		.agents/skills/cime-documentation-writer/SKILL.md
+78 −0		.agents/skills/cime-sys-testing/SKILL.md
+94 −0		.agents/skills/cime-unit-testing/SKILL.md
+22 −171		AGENTS.md
+1 −1		CIME/SystemTests/err.py
+23 −1		CIME/Tools/case.build
+1 −1		CIME/XML/env_batch.py
+55 −3		CIME/build.py
+2 −0		CIME/data/config/cesm/config_files.xml
+137 −0		CIME/tests/test_unit_clean_cache.py
+174 −0		CIME/tests/test_unit_copy_over_file.py
+461 −0		CIME/tests/test_unit_safe_copy.py
+137 −0		CIME/tests/test_unit_system_tests_err.py
+36 −0		CIME/tests/test_unit_xml_env_batch.py
+34 −8		CIME/utils.py
+17 −3		CIME/wait_for_tests.py