Skip to content

Complete the FATES-CLM nitrogen coupling#1472

Open
slevis-lmwg wants to merge 28 commits intoNGEET:mainfrom
slevis-lmwg:fates-cn
Open

Complete the FATES-CLM nitrogen coupling#1472
slevis-lmwg wants to merge 28 commits intoNGEET:mainfrom
slevis-lmwg:fates-cn

Conversation

@slevis-lmwg
Copy link
Copy Markdown
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
Reminder to address #1526

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: To be discussed at CTSM Software meeting tomorrow

Integrator

  • FATES PASS/FAIL regression tests were run
    As posted here, I ran the fates test-suite against the corresponding baseline with satisfactory results
  • Evaluation of test results for answer changes was performed and results provided
    As posted here, I identified the lines of code responsible for the answer changes
  • FATES-CLM6 Code Freeze: satellite phenology regression tests are b4b
    In /glade/derecho/scratch/slevis/tests_0413-123625de I invoked ./cs.status.fails | grep -i fatessp with this result:
    FAIL ERI_D_Ld9.f45_f45_mg37.I2000Clm60FatesSpCruRsGs.derecho_gnu.clm-FatesColdSatPhenCamLndTuningMode NLCOMP
    FAIL SMS_D.1x1_brazil.I2000Clm60FatesSpCruRsGs.derecho_gnu.clm-FatesColdSatPhen NLCOMP
    FAIL SMS_D_Ld3.f09_g17.I2000Clm60FatesSpCruRsGs.derecho_gnu.clm-FatesColdSatPhen_prescribed NLCOMP
    FAIL ERP_P128x2_Ld30.f45_f45_mg37.I2000Clm60FatesSpCruRsGs.derecho_intel.clm-FatesColdSatPhen NLCOMP
    FAIL ERS_Ld30.f45_f45_mg37.I2000Clm60FatesSpCruRsGs.derecho_intel.clm-FatesColdSatPhen NLCOMP
    FAIL SMS_Lm1.f45_f45_mg37.I2000Clm60FatesSpCruRsGs.derecho_intel.clm-FatesColdBasic NLCOMP
    FAIL SMS.f45_f45_mg37.I2000Clm60FatesSpRsGs.derecho_nvhpc.clm-FatesColdSatPhen NLCOMP

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 thread biogeochem/EDCohortDynamicsMod.F90 Outdated
Comment thread main/FatesInterfaceMod.F90
@slevis-lmwg
Copy link
Copy Markdown
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
Copy Markdown
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 7 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.
Comment thread functional_unit_testing/parteh/f90src/FatesCohortWrapMod.F90 Outdated
@slevis-lmwg slevis-lmwg requested review from glemieux and removed request for rgknox April 16, 2026 20:42
@slevis-lmwg
Copy link
Copy Markdown
Contributor Author

@glemieux I just added you as the reviewer also on the FATES side. This is the FATES-CN PR that we talked about this morning.

@slevis-lmwg
Copy link
Copy Markdown
Contributor Author

@glemieux I'm not certain whether it's ok for me to check the unchecked boxes at the top and merge this, or whether I should wait for you or @rgknox to do it.

@slevis-lmwg
Copy link
Copy Markdown
Contributor Author

I reviewed and checked all remaining checkboxes, and I have permission to merge. I will ask at tomorrow's CTSM Software meeting whether it's ok for me to merge and tag this PR.

@slevis-lmwg slevis-lmwg moved this from Under Review to Final Testing in FATES Pull Request Planning and Status Apr 23, 2026
@slevis-lmwg slevis-lmwg moved this from Final Testing to Ready to Integrate in FATES Pull Request Planning and Status Apr 23, 2026
@slevis-lmwg
Copy link
Copy Markdown
Contributor Author

  • I will rerun the fates test-suite to generate a new baseline
  • I will meet with @glemieux to discuss the merge steps

@slevis-lmwg
Copy link
Copy Markdown
Contributor Author

slevis-lmwg commented Apr 23, 2026

  • derecho in progress: ./run_sys_tests -s fates -c fates-sci.1.92.2_api.44.1.0-ctsm5.4.033 -g fates-sci.1.92.3_api.44.1.1-ctsm5.4.034
  • izumi still broken: ./run_sys_tests -s fates -c fates-sci.1.92.1_api.44.1.0-ctsm5.4.034 -g fates-sci.1.92.3_api.44.1.1-ctsm5.4.034 --skip-git-status
  • When done, rename the new baselines to the new fates tag

 Update check for missing values in incoming datasets

The land use timeseries and luh x pft mapping data checks have been
updated to handle NaN or -999 values for netcdf _FillValues
Updates to the grazing logic

This prevents crop and simliar being grazed to death in the off-season
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: Ready to Integrate

Development

Successfully merging this pull request may close these issues.

Add graceful fails to prevent P-coupling with CLM

3 participants