Skip to content

Conversation

@slevis-lmwg
Copy link
Contributor

@slevis-lmwg slevis-lmwg commented Sep 22, 2025

Description:

I started this PR with changes needed in ESCOMP/CTSM#3409.
So far that's just the renaming of
prt_carbon_allom_hyp to fates_c_only
prt_cnp_flex_allom_hyp to fates_cn

The corresponding ESCOMP issue:
ESCOMP/CTSM#3378

Resolves #1454

Collaborators:

@rgknox
@adrifoster

Expectation of Answer Changes:

I do not expect answers to change as a result of this PR alone; however, I expect answers to change for fates_parteh_mode = 2 as a result of the corresponding ESCOMP PR. So far I have not seen such diffs, while I have seen diffs for fates_parteh_mode = 1.

Checklist

All checklist items must be checked to enable merging this pull request:

Contributor

  • The in-code documentation has been updated with descriptive comments
  • The documentation has been assessed to determine if updates are necessary

Integrator

  • FATES PASS/FAIL regression tests were run
  • Evaluation of test results for answer changes was performed and results provided
  • FATES-CLM6 Code Freeze: satellite phenology regression tests are b4b

If satellite phenology regressions are not b4b, please hold merge and notify the FATES development team.

Documentation

Test Results:

CTSM (or) E3SM (specify which) test hash-tag:

CTSM (or) E3SM (specify which) baseline hash-tag:

FATES baseline hash-tag:

Test Output:

This renaming of variables corresponds to
116b310cd20f29bf5ca07b1d89f9e812f4e94477
Comment on lines +2321 to +2327
! [kgC/plant/yr] -> [gC/m2/yr]
site_npp = site_npp + ccohort%npp_acc_hold * ccohort%n*area_inv * &
g_per_kg * hlm_days_per_year / sec_per_day
g_per_kg
Copy link
Contributor Author

@slevis-lmwg slevis-lmwg Dec 8, 2025

Choose a reason for hiding this comment

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

Effectively the same change as in PR #1513 (commit 8eca6e3). Update to it when the latter gets merged to main. OR just merge PR #1513.

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Dec 10, 2025

From meeting with @rgknox
We may decide to revert the parameter renaming, pending group feedback.
Keep the other changes!

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Dec 15, 2025

Ryan's update 2025/12/15:
"the team agreed at the fates software meeting that "fates_conly" and "fates_cn" were good names for the switch, both in the namelist and for the integer named constants that we pass between files"

In our meeting 2025/12/16 Ryan offered to change the integer values (1 and 2) to strings. (I made the change from hardwired values to named params in the code.)

@slevis-lmwg slevis-lmwg marked this pull request as ready for review December 16, 2025 19:26
@slevis-lmwg slevis-lmwg requested a review from rgknox December 16, 2025 19:26
@slevis-lmwg slevis-lmwg added the HLM: ctsm An issue is related to ctsm host land model or a particular PR has a corresponding ctsm-side PR label Dec 16, 2025
slevis-lmwg and others added 3 commits December 16, 2025 18:38
This changes how we regulate root proportions, such that in CNP mode root proportions are not allowed to change while both N and P are supplementing. This was introduced by Bharat Sharma.

slevis resolved conflicts:
biogeochem/EDPhysiologyMod.F90
main/EDMainMod.F90
main/EDPftvarcon.F90
main/FatesInterfaceMod.F90
JSON formatted parameter files.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

HLM: ctsm An issue is related to ctsm host land model or a particular PR has a corresponding ctsm-side PR

Projects

Status: Under Review

Development

Successfully merging this pull request may close these issues.

Add graceful fails to prevent P-coupling with CLM

1 participant