Skip to content
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

Fates parteh api #537

Merged
merged 14 commits into from
Oct 24, 2018
Merged

Fates parteh api #537

merged 14 commits into from
Oct 24, 2018

Conversation

rgknox
Copy link
Collaborator

@rgknox rgknox commented Oct 15, 2018

Description of changes

FATES has undergone a significant refactor of plant allocation, growth and turnover (aka PARTEH). To facilitate these refactors, a namelist variable has been added which swaps the different modes or hypotheses that are executed. Some history variables are also no longer in the output files and had to be removed from tests.

Synced with: NGEET/fates#421

Specific notes

Contributors other than yourself, if any:

The FATES developer team.

CTSM Issues Fixed (include github issue #):

None

Are answers expected to change (and if so in what way)?

These changes must be syncronized with a new FATES release. The FATES release should not be B4B, no non-fates code or tests should be effected.

Any User Interface Changes (namelist or namelist defaults changes)?

yes! Added fates_parteh_mode = INT

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 cheyenne for gnu/pgi and hobart for gnu/pgi/nag is the standard for tags on master)

fates test suite, cheyenne, intel, all PASS (not b4b)

30 year, 14 PFT, f45 grid, smoke-test (PASS)

multi-decade comparison of biomass, leaf area and carbon fluxes against master at a tropical site.

NOTE: Be sure to check your Coding style against the standard:
https://github.com/ESCOMP/ctsm/wiki/CTSM-coding-guidelines

@rgknox rgknox added FATES API update Changes to the FATES version that also REQUIRE an API change in CTSM status: work in progress labels Oct 15, 2018
@rgknox rgknox mentioned this pull request Oct 15, 2018
5 tasks
@@ -196,6 +196,9 @@ module clm_varctl
logical, public :: use_fates = .false. ! true => use fates

! These are INTERNAL to the FATES module
integer, public :: fates_parteh_mode = -9 ! 1 => carbon only
Copy link
Contributor

Choose a reason for hiding this comment

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

@rgknox what does the -9 mean here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

it is a bogus initialization value, that will force the model to fail if not set correctly.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, let's add a comment to that effect in case its not obvious.

Suggested change
integer, public :: fates_parteh_mode = -9 ! 1 => carbon only
integer, public :: fates_parteh_mode = -9 ! 1 => carbon only; -9 => junk value that will force fail unless reset later

Copy link
Contributor

@ckoven ckoven left a comment

Choose a reason for hiding this comment

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

this looks good to me. thanks @rgknox!

@rgknox rgknox added PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete and removed status: work in progress labels Oct 24, 2018
@rgknox
Copy link
Collaborator Author

rgknox commented Oct 24, 2018

FATES side changes have been integrated. All tests pass.
1 team-member reviewed. Merging into fates_next_api

@rgknox rgknox self-assigned this Oct 24, 2018
@rgknox rgknox merged commit c27f7fa into ESCOMP:fates_next_api Oct 24, 2018
ekluzek added a commit to ekluzek/CTSM that referenced this pull request Mar 9, 2019
…tesvers

Author: Ryan Knox <[email protected]>
Date:   Wed Oct 24 13:05:11 2018 -0700

    Merge pull request ESCOMP#537 from rgknox/fates-parteh-api

    Fates parteh api
@rgknox rgknox deleted the fates-parteh-api branch October 31, 2023 19:18
AGonzalezNicolas pushed a commit to HPSCTerrSys/clm5_0 that referenced this pull request Jun 27, 2024
AGonzalezNicolas pushed a commit to HPSCTerrSys/clm5_0 that referenced this pull request Jun 27, 2024
…tesvers

Author: Ryan Knox <[email protected]>
Date:   Wed Oct 24 13:05:11 2018 -0700

    Merge pull request ESCOMP#537 from rgknox/fates-parteh-api

    Fates parteh api
AGonzalezNicolas pushed a commit to HPSCTerrSys/clm5_0 that referenced this pull request Jul 5, 2024
AGonzalezNicolas pushed a commit to HPSCTerrSys/clm5_0 that referenced this pull request Jul 5, 2024
…tesvers

Author: Ryan Knox <[email protected]>
Date:   Wed Oct 24 13:05:11 2018 -0700

    Merge pull request ESCOMP#537 from rgknox/fates-parteh-api

    Fates parteh api
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
FATES API update Changes to the FATES version that also REQUIRE an API change in CTSM PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants