-
Notifications
You must be signed in to change notification settings - Fork 355
ctsm5.4.039: add new fates namelist switch for dbh init when nocomp is on #3910
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.
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
7
commits into
ESCOMP:master
Choose a base branch
from
mvdebolskiy:add-fates-switch
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e7e9e5f
add new fates namelist switch for dbh init when nocomp is on
mvdebolskiy cd74892
add test for init_dbh
mvdebolskiy dc352b8
Merge branch 'master' into add-fates-switch
mvdebolskiy 88423d3
Merge tag 'ctsm5.4.037' into add-fates-switch
glemieux 92ec0f4
Merge tag 'ctsm5.4.038' into add-fates-switch
glemieux 512665b
update fates tag
glemieux edd1e88
update changelog for ctsm5.4.039
glemieux File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/include_user_mods
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../FatesColdNoComp |
10 changes: 10 additions & 0 deletions
10
cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/shell_commands
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| SRCDIR=`./xmlquery SRCROOT --value` | ||
| CASEDIR=`./xmlquery CASEROOT --value` | ||
| FATESDIR=$SRCDIR/src/fates/ | ||
| FATESPARAMFILE=$CASEDIR/fates_params_init_dbh.json | ||
|
|
||
| cp $FATESDIR/parameter_files/fates_params_default.json $FATESPARAMFILE | ||
|
|
||
| $FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_recruit_init_seed --values 0.01 --indices all | ||
|
|
||
| echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm |
1 change: 1 addition & 0 deletions
1
cime_config/testdefs/testmods_dirs/clm/FatesColdNoCompInitDbh/user_nl_clm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| use_fates_dbh_init = .true. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,74 @@ | ||
| =============================================================== | ||
| Tag name: ctsm5.4.039 | ||
| Originator(s): mvdebolskiy (Matvey Debolskiy, University of Oslo, matvey.debolskiy@geo.uio.no) | ||
| Date: Mon May 11 04:00:00 PR MDT 2026 | ||
| One-line Summary: Add FATES namelist option to initialize cohorts with diameter at breast height (DBH) | ||
|
|
||
| Purpose and description of changes | ||
| ---------------------------------- | ||
|
|
||
| FATES allows for the ability to initialize seedling by density or DBH. Prior to this change, | ||
| the user would update the `fates_recruit_init_density` parameter to use a negative value to | ||
| initalize by DBH. This pull request removes this global switch behavior and creates a namelist | ||
| option for the user. The FATES parameter file and behavior has been updated to include a new | ||
| parameter for users to set the initial DBH by plant functional type. | ||
|
|
||
| Notes of particular relevance for users | ||
| --------------------------------------- | ||
|
|
||
| Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): | ||
| New namelist option to control FATES: | ||
| use_fates_dbh_init | ||
|
|
||
| Changes made to namelist defaults (e.g., changed parameter values): | ||
| Sets the default for use_fates_dbh_init to false | ||
|
|
||
| Changes to the parameter file (output of tools/param_utils/compare_paramfiles): | ||
| Adds fates_recruit_init_dbh to the FATES parameter file | ||
|
|
||
| Notes of particular relevance for developers: | ||
| --------------------------------------------- | ||
|
|
||
| Caveats for developers (e.g., code that is duplicated that requires double maintenance): | ||
| - Note that this option currently is only applicable with use_fates_nocomp | ||
|
|
||
| Changes to tests or testing: | ||
| Added test module FatesColdNoCompInitDbh | ||
|
|
||
| Testing summary: | ||
| ---------------- | ||
|
|
||
| build-namelist tests (if CLMBuildNamelist.pm has changed): | ||
|
|
||
| derecho - | ||
|
|
||
| regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): | ||
|
|
||
| derecho ----- TBD | ||
| izumi ------- OK | ||
|
|
||
| fates tests: (baseline comparison against fates-sci.1.92.4_api.45.0.0-ctsm5.4.037) | ||
| derecho ----- OK | ||
| izumi ------- OK | ||
|
|
||
| Answer changes | ||
| -------------- | ||
|
|
||
| Changes answers relative to baseline: No | ||
|
|
||
| Other details | ||
| ------------- | ||
|
|
||
| List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): | ||
| fates: sci.1.92.4_api.45.0.0 -> sci.1.92.5_api.46.0.0 | ||
|
|
||
| Pull Requests that document the changes (include PR ids): | ||
| (https://github.com/ESCOMP/ctsm/pull) | ||
| https://github.com/ESCOMP/CTSM/pull/3910 | ||
| https://github.com/NGEET/fates/pull/1550 | ||
|
|
||
| =============================================================== | ||
| =============================================================== | ||
| Tag name: ctsm5.4.038 | ||
| Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310) | ||
| Date: Thu May 7 03:29:26 PM MDT 2026 | ||
|
|
@@ -10249,7 +10319,7 @@ Answer changes | |
| -------------- | ||
|
|
||
| Changes answers relative to baseline: | ||
|
|
||
| sb | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This looks like an accidental add?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch, yep that's accidental |
||
| Summarize any changes to answers, i.e., | ||
| - what code configurations: FATES mode | ||
| - what platforms/compilers: ALL | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule fates
updated
5 files
| +6 −12 | main/EDInitMod.F90 | |
| +42 −18 | main/EDPftvarcon.F90 | |
| +15 −0 | main/FatesInterfaceMod.F90 | |
| +5 −0 | main/FatesInterfaceTypesMod.F90 | |
| +8 −1 | parameter_files/fates_params_default.json |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should add a failure test for this in the build-namelist tester.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've got this updated and tested on
derecho; I'll push it once it's back online.