Merge pull request #4083 from ekluzek/merge-b4bdev-20260605

ctsm5.4.044: Merge b4bdev 20260605

Author: ekluzek

.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

cime

@@ -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

cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/shell_commands

@@ -1,3 +1,2 @@
 ../Fates
 ../FatesCold
-../FatesSetupParamBuild/

cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods

@@ -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

cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands

@@ -1,3 +1,2 @@
 ../Fates
 ../FatesCold
-../FatesSetupParamBuild/

cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods

@@ -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

cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands

@@ -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

cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/README

@@ -1,3 +1,2 @@
 ../Fates
 ../FatesCold
-../FatesSetupParamBuild

cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/include_user_mods

@@ -1,4 +1,4 @@
-SRCDIR=`./xmlquery SRCROOT --value`
+SRCDIR=`./xmlquery COMP_ROOT_DIR_LND --value`
 CASEDIR=`./xmlquery CASEROOT --value`
 FATESDIR=$SRCDIR/src/fates/