Skip to content

ctsm5.3.027: Migrate FATES parameter file switches to the namelist#2904

Merged
adrifoster merged 30 commits intoESCOMP:masterfrom
glemieux:fates-switch-migration
Mar 3, 2025
Merged

ctsm5.3.027: Migrate FATES parameter file switches to the namelist#2904
adrifoster merged 30 commits intoESCOMP:masterfrom
glemieux:fates-switch-migration

Conversation

@glemieux
Copy link
Copy Markdown
Contributor

@glemieux glemieux commented Dec 10, 2024 •
edited
Loading

Addresses NGEET/fates#1295.

To be coordinated with NGEET/fates#1300.

Description of changes

List of switches to be moved:

  • fates_daylength_factor_switch
  • fates_hydro_solver
  • fates_leaf_photo_tempsens_model
  • fates_leaf_stomatal_assim_model
  • fates_leaf_stomatal_model
  • fates_maintresp_leaf_model
  • fates_mort_cstarvation_model
  • fates_rad_model
  • fates_regeneration_model

This also adds a new switch in preparation for a forthcoming fates update per NGEET/fates#1337.

Specific notes

Contributors other than yourself, if any:

CTSM Issues Fixed (include github issue #):

Are answers expected to change (and if so in what way)? Should be B4B aside from namelist differences

Any User Interface Changes (namelist or namelist defaults changes)? Yes as this brings in new namelist options.

Does this create a need to change or add documentation? Did you do so?

Testing performed, if any:
(List what testing you did to show your changes worked as expected)
(This can be manual testing or running of the different test suites)
(Documentation on system testing is here: https://github.com/ESCOMP/ctsm/wiki/System-Testing-Guide)
(aux_clm on derecho for intel/gnu and izumi for intel/gnu/nag/nvhpc is the standard for tags on master)

NOTE: Be sure to check your coding style against the standard
(https://github.com/ESCOMP/ctsm/wiki/CTSM-coding-guidelines) and review
the list of common problems to watch out for
(https://github.com/ESCOMP/CTSM/wiki/List-of-common-problems).

@glemieux glemieux force-pushed the fates-switch-migration branch 2 times, most recently from 63076c8 to 7cbb40c Compare December 11, 2024 00:33
@glemieux glemieux mentioned this pull request Dec 11, 2024
Merged
13 tasks
@glemieux glemieux requested a review from rgknox December 11, 2024 19:15
@glemieux
add fates daylength factor switch
922a317 
This commit facilitates moving this switch from the fates parameter file
to the API.  Note that the actual daylength factor value is always
passed through the API.  This just adds the switch to tell FATES to use
it.
@glemieux glemieux force-pushed the fates-switch-migration branch from 2284172 to 1780cc7 Compare December 12, 2024 00:51
@glemieux
add FATES switch to enable photosynthetic temp acclimation
949c668 
This commit facilitates moving this switch from the FATES parameter file
to the namelist
@glemieux glemieux force-pushed the fates-switch-migration branch 2 times, most recently from 204bb5f to d825989 Compare December 12, 2024 06:28
@glemieux
Copy link
Copy Markdown
Contributor Author

glemieux commented Dec 12, 2024

Per discussion at the CTSM SE meeting today, we came to a consensus that the FATES stomatal and leaf respiration models shouldn't be controlled by the existing namelist switches for CLM (stomatalcond_mtd and leafresp_method). The rationale is that even though both share the same options currently, the implementation is different enough to warrant having separate namelist switches to avoid suggesting to the user that they will be using the same code under the hood.

@glemieux
add FATES namelist switch for stomatal conductance
59fef8c 
This commit facilitates moving this switch from the FATES parameter file
to the namelist
@glemieux
add FATES namelist switch for stomatal assimilation
9edf742 
This commit facilitates moving this switch from the FATES parameter file
to the namelist
@glemieux
add FATES namelist switch for leaf respiration model
59eb9f4 
This commit facilitates moving this switch from the FATES parameter file
to the namelist
@glemieux
add FATES switch to select carbon starvation model
11a1708 
This commit facilitates moving this switch from the FATES parameter file
to the namelist
@glemieux
add FATES seed regeneration model switch to namelist
3f2ed72 
This commit facilitates moving this switch from the FATES parameter file
to the namelist
@glemieux
add FATES hydro solver selection switch to namelist
adf7d56 
This commit facilitates moving this switch from the FATES parameter file
to the namelist
@glemieux
add FATES radiation model switch to the namelist
47fd489 
This commit facilitates moving this switch from the FATES parameter file
to the namelist
@glemieux glemieux force-pushed the fates-switch-migration branch from d825989 to 47fd489 Compare December 12, 2024 20:14
@glemieux glemieux marked this pull request as ready for review December 12, 2024 20:20
@glemieux
Copy link
Copy Markdown
Contributor Author

glemieux commented Dec 13, 2024

Note: This could be rebased to the b4b-dev branch if the fates tag update does not contain b4b differences from the perspective of aux_clm.

@glemieux glemieux mentioned this pull request Dec 13, 2024
Merged
@glemieux glemieux requested a review from adrifoster December 16, 2024 20:20
rgknox
rgknox reviewed Dec 18, 2024
View reviewed changes
Comment thread src/main/clm_varctl.F90 Outdated
rgknox
rgknox reviewed Jan 13, 2025
View reviewed changes
Comment thread bld/namelist_files/namelist_definition_ctsm.xml
@ekluzek ekluzek changed the title Migrate FATES parameter file switches to the namelist ctsm5.3.XXX: Migrate FATES parameter file switches to the namelist Jan 13, 2025
rgknox
rgknox reviewed Jan 13, 2025
View reviewed changes
Comment thread src/utils/clmfates_interfaceMod.F90 Outdated
rgknox
rgknox requested changes Jan 13, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@rgknox rgknox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

consider changing the temperature acclimation to integer, and fix typo on hydro solver, from '2D_Taylor' to '2D_Newton'

@bishtgautam bishtgautam mentioned this pull request Jan 13, 2025
Closed
rgknox
rgknox approved these changes Feb 17, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@rgknox rgknox left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks @glemieux

@slevis-lmwg slevis-lmwg changed the title Migrate FATES parameter file switches to the namelist ctsm5.3.027: Migrate FATES parameter file switches to the namelist Feb 21, 2025
@glemieux
Merge tag 'ctsm5.3.025' into fates-switch-migration
2d0a541 
FATES default parameter file update

This tag updates the default parameter file for FATES bringing in a
number of updates:
   - adds parameters for land use grazing
   - updates the FATES z0mr turbulence parameters for consistency with
     CLM
   - adds FATES pft-dependent btran model switches for a forthcoming
     update
   - updates the default hydro solver switch to Picard 2D

This also updates the default FATES tag which includes two issue fixes
and introduces
the aforementioned land use grazing capability.
@glemieux
update default fates parameter file
877e986
@glemieux
update fates twostream tests per switch migration
9af9f32
@glemieux
fix namelist definition valid values
ef27e7d
@glemieux
correct fates API check for radation model
527a4e0
@glemieux
correct default fates hydro solver
aea8a4e
@glemieux
update fates commit
7d13840
@glemieux
Copy link
Copy Markdown
Contributor Author

glemieux commented Feb 24, 2025

Regression testing on derecho and izumi is underway.

@glemieux
Copy link
Copy Markdown
Contributor Author

glemieux commented Feb 24, 2025 •
edited
Loading

Regression testing against ctsm5.3.025 is B4B against all expected tests on derecho and izumi. There are expected NLCOMP differences due to the change of parameter file name and the addition of new namelist parameters per this PR.

Results:
/glade/u/home/glemieux/ctsm/tests_0223-231253de
/home/glemieux/ctsm/tests_0223-231958iz

@glemieux glemieux mentioned this pull request Feb 26, 2025
Closed
@glemieux
update default parameter file
6d26981 
This adds in a new parameter to be utilized with a forthcoming fates
pull request
@glemieux glemieux mentioned this pull request Feb 27, 2025
Merged
4 tasks
@glemieux
Merge tag 'ctsm5.3.026' into fates-switch-migration
8fe2323 
Merge b4b-dev to master: run_tower updates, reduce log noise

Merge b4b-dev to master.

Some run_tower updatesm, fix some issues, and improve code health. Also
reduces some log noise.
@glemieux
update fates gitmodule commit hash
4c69e5e
@glemieux
Copy link
Copy Markdown
Contributor Author

glemieux commented Feb 27, 2025

Regression testing on derecho against ctsm5.3.026 is complete. All expected tests are B4B. There are NLCOMP diffs as expected for the fates tests given the fates parameter file update.

Results: /glade/u/home/glemieux/scratch/ctsm-tests/tests_0227-100601de

Testing on izumi is underway.

@glemieux
Copy link
Copy Markdown
Contributor Author

glemieux commented Mar 2, 2025

aux_clm regression testing on izumi is complete. All expected tests are b4b.

Results: /home/glemieux/ctsm/tests_0228-131242iz

@adrifoster adrifoster merged commit 7af91e9 into ESCOMP:master Mar 3, 2025
@github-project-automation github-project-automation Bot moved this from Final Testing to Ready to Integrate in FATES Pull Request Planning and Status Mar 3, 2025
@github-project-automation github-project-automation Bot moved this from In progress - master/b4b-dev to Done (non release/external) in CTSM: Upcoming tags Mar 3, 2025
@mvdebolskiy mvdebolskiy mentioned this pull request Mar 11, 2025
Merged
@ekluzek ekluzek mentioned this pull request May 22, 2025
Open
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ekluzek ekluzek ekluzek left review comments

@rgknox rgknox rgknox approved these changes

@adrifoster adrifoster Awaiting requested review from adrifoster

+1 more reviewer

@ckoven ckoven ckoven left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@glemieux glemieux

Labels

b4b bit-for-bit test: aux_clm Pass aux_clm suite before merging test: fates Pass fates test suite before merging

Projects

CTSM: Upcoming tags
Status: Done (non release/external)

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@glemieux @rgknox @ckoven @ekluzek @samsrabin @adrifoster