Skip to content

Fix fates paramgen in tests #4024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvdebolskiy wants to merge 12 commits into
base: b4b-dev
Choose a base branch
from
Open

Fix fates paramgen in tests #4024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
da0a557
add new fates namelist switch for dbh init when nocomp is on
mvdebolskiy Apr 3, 2026
137fb39
add test for init_dbh
mvdebolskiy May 4, 2026
b16c753
update fates tag
glemieux May 11, 2026
57935a9
update changelog for ctsm5.4.039
glemieux May 11, 2026
4ec34fd
add bld namelist unit test for new option
glemieux May 14, 2026
70118d0
update changelog with test results
glemieux May 14, 2026
8b0a8d3
Small ChangeLog corrections
slevis-lmwg May 14, 2026
2da7d05
fix srcroot, remove parabuild include
mvdebolskiy May 15, 2026
0daf650
remove double line
mvdebolskiy May 15, 2026
b492702
Merge branch 'b4b-dev' into fix-fates-paramgen-in-tests
mvdebolskiy May 22, 2026
ce3b42c
fix changelog
mvdebolskiy May 22, 2026
c4cec77
remove extra=
mvdebolskiy May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
../Fates
../FatesCold
../FatesSetupParamBuild/
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
../Fates
../FatesCold
../FatesSetupParamBuild/
3 changes: 1 addition & 2 deletions cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
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

cp $FATESDIR/parameter_files/fates_params_default.json $FATESPARAMFILE

$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_puptake --values 10.0 --indices all
$FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_nuptake --values 10.0 --indices all

echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm
4 changes: 2 additions & 2 deletions cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
../Fates
../FatesCold
../FatesSetupParamBuild
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/clm/FatesColdSeedDisp/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SRCDIR=`./xmlquery SRCROOT --value`
SRCDIR=`./xmlquery COMP_ROOT_DIR_LND --value`
CASEDIR=`./xmlquery CASEROOT --value`
FATESDIR=$SRCDIR/src/fates/

Expand Down
4 changes: 2 additions & 2 deletions cime_config/testdefs/testmods_dirs/clm/FatesColdTwoStream/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cime_config/testdefs/testmods_dirs/clm/FatesSetupParamBuild/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ check_if_runable () {
main() {
# If under a casedirectory get a few variables for later use
if [ -f xmlquery ]; then
SRCDIR=$(./xmlquery SRCROOT --value || echo "null")
check_error $? "Trouble getting SRCROOT from case"
SRCDIR=$(./xmlquery COMP_ROOT_DIR_LND --value || echo "null")
check_error $? "Trouble getting COMP_ROOT_DIR_LND from case"
DEBUG=0
# otherwise if this is being run in the testmod directory for debugging
else
Expand Down
Loading