Repository navigation
ctsm5.4.036: 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
Merged
Merged
Changes from all commits
Commits
Show all changes
57 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 e881a89
Adjust unit conversions to agree with FATES commit b2a1da6
slevis-lmwg 8135820
Change fates paramfile var prescribed_puptake to 10 for PRT2 test
slevis-lmwg e73b42d
Replace fates_cn with fates_cnp throughout
slevis-lmwg 25ea275
Remove FATES_ERROR_EL from user_nl_clm (out-of-scope fix)
slevis-lmwg 71ed0fe
Merge tag 'ctsm5.4.004' into fates-cn
slevis-lmwg 3b7e863
Merge tag 'ctsm5.4.005' into fates-cn
slevis-lmwg b146c70
Add PRT2 test with synthetic N to replicate the pre-CN-coupling setup
slevis-lmwg 223b6e1
changing namelist type for fates_parteh_mode, part 1
rgknox fab4aa0
Update two namelist error-checks
slevis-lmwg e5403d2
Update equivalent to last error-checks, this time in controlMod.F90
slevis-lmwg cfa42fa
Add FatesColdPRT2_suplnAll test and corresponding testmod
slevis-lmwg f09d9ac
more name changes for fates CNP and c-only
rgknox b3afab9
working on passing nl defaults
rgknox 94fc2e2
Merge branch 'fates-cn' into fates-cn
slevis-lmwg d260110
fixes to namelist processing of suplnitro
rgknox e4b33ae
more explicit logic on suplnitro with fates
rgknox 88a6770
more explicit namelist defaults
rgknox 8f2c0bb
Remove trailing whitespace
slevis-lmwg dde7942
Changes for namelist updates to work
slevis-lmwg 069000f
Merge pull request #19 from rgknox/fates-cn
slevis-lmwg dd4bd70
Merge tag 'ctsm5.4.019' into fates-cn-merge
rgknox 631b728
merge with 5.3.026
rgknox 924347c
Added uptake fluxes to restarts for fates, pass in boundary condition…
rgknox 1f3bba8
Merge pull request #20 from rgknox/fates-cn
slevis-lmwg 9d17906
Merge branch 'master' into fates-cn
slevis-lmwg 911f307
Simplify elsif in CLMBuildNamelist.pm to get past failure
slevis-lmwg d7d8a22
Correct minor typo
slevis-lmwg f798627
Add 2 expected failure tests to build-namelist_test.pl
slevis-lmwg 488b93c
Merge tag 'ctsm5.4.032' into fates-cn
slevis-lmwg 83bf1f1
Update to existing compsets in new PRT2 tests for cases to create
slevis-lmwg 2a5158f
Merge tag 'ctsm5.4.034' into fates-cn
slevis-lmwg 566b160
Remove passing test from expected failures
slevis-lmwg 8aa1f66
Update .gitmodules with the new FATES tag (ie, FATES-side fates-cn)
slevis-lmwg e7598c6
Remove machine lawrencium from testlist_clm.xml
slevis-lmwg 868f277
Add comments about suplnitro in namelist_defaults_ctsm.xml
slevis-lmwg 38463da
Change fates_parteh_mode to SHR_KIND_CS (char*80 inst. of 256)
slevis-lmwg 17cad76
Add comments clarifying the presence of two very similar loops
slevis-lmwg 7a779d6
Merge remote-tracking branch 'escomp/master' into fates-cn
slevis-lmwg 200f1ff
Update total number of tests in build-namelist_test.pl
slevis-lmwg 907d6b3
Draft updates to ChangeLog/ChangeSum
slevis-lmwg 4565761
Revert 25ea275 by putting FATES_ERROR_EL back in user_nl_clm
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
Some comments aren't visible on the classic Files Changed page.
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
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
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
9 changes: 3 additions & 6 deletions
9
cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/shell_commands
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,10 @@ | ||
| SRCDIR=`./xmlquery SRCROOT --value` | ||
| CASEDIR=`./xmlquery CASEROOT --value` | ||
| FATESDIR=$SRCDIR/src/fates/ | ||
|
|
||
| FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_np.json | ||
| FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_p.json | ||
|
|
||
| cp $FATESDIR/parameter_files/fates_params_default.json $FATESPARAMFILE | ||
|
|
||
| $FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_nuptake --values 1.0 --indices all | ||
|
|
||
| $FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_puptake --values 1.0 --indices all | ||
| $FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_puptake --values 10.0 --indices all | ||
|
|
||
| echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm | ||
| echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm |
2 changes: 1 addition & 1 deletion
2
cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2/user_nl_clm
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
3 changes: 3 additions & 0 deletions
3
cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_suplnAll/include_user_mods
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ../nofireemis | ||
| ../cn_conly | ||
| ../FatesColdPRT2 |
3 changes: 3 additions & 0 deletions
3
cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/include_user_mods
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ../Fates | ||
| ../FatesCold | ||
| ../FatesSetupParamBuild/ |
11 changes: 11 additions & 0 deletions
11
cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/shell_commands
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| SRCDIR=`./xmlquery SRCROOT --value` | ||
| CASEDIR=`./xmlquery CASEROOT --value` | ||
| FATESDIR=$SRCDIR/src/fates/ | ||
| FATESPARAMFILE=$CASEDIR/fates_params_prt2_prescribed_np.json | ||
|
|
||
| cp $FATESDIR/parameter_files/fates_params_default.json $FATESPARAMFILE | ||
|
|
||
| $FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_puptake --values 10.0 --indices all | ||
| $FATESDIR/tools/modify_fates_paramfile.py --overwrite --fin $FATESPARAMFILE --param fates_cnp_prescribed_nuptake --values 10.0 --indices all | ||
|
|
||
| echo "fates_paramfile = '$FATESPARAMFILE'" >> $CASEDIR/user_nl_clm |
12 changes: 12 additions & 0 deletions
12
cime_config/testdefs/testmods_dirs/clm/FatesColdPRT2_synthN/user_nl_clm
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| fates_parteh_mode = 'carbon_nitrogen' | ||
| hist_fincl1 = 'FATES_L2FR','FATES_L2FR_CANOPY_REC_PF','FATES_L2FR_USTORY_REC_PF', | ||
| 'FATES_NH4UPTAKE_SZPF','FATES_NO3UPTAKE_SZPF','FATES_NEFFLUX_SZPF', | ||
| 'FATES_NDEMAND_SZPF','FATES_NFIX_SYM_SZPF','FATES_NH4UPTAKE','FATES_NO3UPTAKE', | ||
| 'FATES_NEFFLUX','FATES_NDEMAND','FATES_NFIX_SYM','FATES_STOREN','FATES_STOREN_TF', | ||
| 'FATES_VEGN','FATES_SAPWOODN','FATES_LEAFN','FATES_FROOTN','FATES_REPRON','FATES_VEGN_SZPF', | ||
| 'FATES_LEAFN_SZPF','FATES_FROOTN_SZPF','FATES_SAPWOODN_SZPF','FATES_STOREN_SZPF','FATES_STOREN_TF_CANOPY_SZPF', | ||
| 'FATES_STOREN_TF_USTORY_SZPF','FATES_REPRON_SZPF','FATES_STOREP','FATES_STOREP_TF','FATES_VEGP','FATES_SAPWOODP', | ||
| 'FATES_LEAFP','FATES_FROOTP','FATES_REPROP','FATES_PUPTAKE','FATES_PEFFLUX','FATES_PDEMAND', | ||
| 'FATES_VEGP_SZPF','FATES_LEAFP_SZPF','FATES_FROOTP_SZPF','FATES_SAPWOODP_SZPF','FATES_STOREP_SZPF', | ||
| 'FATES_STOREP_TF_CANOPY_SZPF','FATES_STOREP_TF_USTORY_SZPF','FATES_REPROP_SZPF','FATES_PUPTAKE_SZPF', | ||
| 'FATES_PEFFLUX_SZPF','FATES_PDEMAND_SZPF' |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.