-
Notifications
You must be signed in to change notification settings - Fork 340
Complete the FATES-CLM nitrogen coupling #3409
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
Draft
slevis-lmwg
wants to merge
16
commits into
ESCOMP:master
Choose a base branch
from
slevis-lmwg:fates-cn
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.
Draft
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
e505dc8
Add two 1x1 FatesColdPRT2 tests, one with, one without MIMICS
slevis-lmwg 01671b9
Uncomment if ( .not. use_fates_sp ) section of clmfates_interfaceMod
slevis-lmwg 59f9d09
Replace plant_ndemand(c) * nuptake_prof(c,j) with plant_ndemand_vr(c,j)
slevis-lmwg b155e58
New use_fates section for plant_ndemand_vr and plant_ndemand from fates
slevis-lmwg c79230c
New use_fates section to set the FATES N uptake fluxes
slevis-lmwg 98b4b7d
Change clm_fate from "in" to "inout" argument
slevis-lmwg a46a76c
Replace if (use_fates) with (is_fates(c)) to add flexibility
slevis-lmwg f2202fb
Remove two unhelpful 1x1 FatesColdPRT2 tests that I added earlier
slevis-lmwg e96b87e
New is_fates section for plant_ndemand, now when use_nitrif_denitrif
slevis-lmwg b24738b
Add (really, uncomment) FATES npp to enable fixation
slevis-lmwg 00a332e
Uncomment hrv_deadstem_to_prod* lines in clmfates_interfaceMod
slevis-lmwg 2bbdd64
Add error check about fates_parteh_mode = 2 and suplnitro = suplnAll
slevis-lmwg d8bc6ce
Upd. namelist_defaults for suplnitro when parteh_mode == 1 or /= 1
slevis-lmwg 116b310
prt_carbon_allom_hyp -> fates_c_only & prt_cnp_flex_allom_hyp ->fates_cn
slevis-lmwg ba955b6
Correction to syntax error caught by gnu and nvhpc, not intel
slevis-lmwg 391a023
Update fates paramfile var prescribed_puptake to 1 for PRT2 test
slevis-lmwg 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
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.
Put the if fates_parteh_mode == 2 here and make the else set plant_ndemand(_vr) = 0 to hopefully resolve the N balance error
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.
Likely still need to resolve N bal. error when parteh == 2
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.
The 3rd test still fails with a N-bal error, and I'm running the 4th test to see what happens:
Uh oh!
There was an error while loading. Please reload this page.
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.
Rethinking my tests:
FAILED to get /glade/derecho/scratch/slevis/ERP_Ld9.f45_f45_mg37.I2000Clm50FatesRs.derecho_intel.clm-FatesColdPRT2.20250814_175600_rzyi7o/case2/ERP_Ld9.f45_f45_mg37.I2000Clm50FatesRs.derecho_intel.clm-FatesColdPRT2.20250814_175600_rzyi7o/fates_params_prt2_prescribed_np.ncso I will go back and try the preexisting PRT2 test and the closest non-PRT2:
UPDATE I had placed the new code in the
if (.not. use_nitrif_denitrif)opposite to what I should have done. I have now updated the code (while still keeping the new code in the ".not." section). Testing PASSed 20250825_174700_7w8gx9Same test PASSed with the above update 20250826_101645_52b4zd