-
Notifications
You must be signed in to change notification settings - Fork 357
ctsm5.3.044: Introduce time-evolving LEAFCN_TARGET as function of leafcn parameter #1654
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
35 commits
Select commit
Hold shift + click to select a range
fa75892
New subr. time_evolv_params to calc. time-evolving leafcn_patch
slevis-lmwg 26ad2e5
Rename new history variable to LEAFCN_TARGET
slevis-lmwg 48c2912
Correction for new history field LEAFCN_TARGET to appear in hist
slevis-lmwg 878728a
Add time-evolving leafcn_patch (LEAFCN_TARGET) to restart
slevis-lmwg 6c230ef
Move leafcn_patch declaration to CNVegNitrogenStateType from CanopyState
slevis-lmwg 86b805b
Replace pftcon%leafcn w cnveg_nitrogenstate_inst%leafcn_patch
slevis-lmwg 13a9af8
Repl. pftcon%leafcn also in function SpeciesTypeMultiplier
slevis-lmwg a5f4856
Renamed subr. time_evolv_params to time_evolv_leafcn to be specific
slevis-lmwg 0fe849e
Changed hardwired settings for cn_slope and co2_base
slevis-lmwg 1414d0d
Merge tag 'ctsm5.3.030' into time_evolv_params
slevis-lmwg 830abfa
Additional conflict resolutions from side-by-side comparison of mods
slevis-lmwg 1d64552
Corrections for aux_clm tests to build successfully
slevis-lmwg 625ded8
Updates to get specific failing test to pass
slevis-lmwg 1be5e2a
Merge tag 'ctsm5.3.033' into time_evolv_params
slevis-lmwg f7be84e
Try allocating leafcn_patch twice to prevent test failures
slevis-lmwg a619476
Missed this change in the original implementation
slevis-lmwg a24446f
This should have gone together with the last commit
slevis-lmwg 8e1e2c6
Clarify the variable name to leafcn_t_evolving in CNFUNMod
slevis-lmwg 237d949
Apply use_cn to the new code in Photosynthesis and clm_driver
slevis-lmwg 6da19db
Remove the new variable from restart and update its initialization
slevis-lmwg cb1880a
Code change to address izumi failures
slevis-lmwg 430b5b1
Code change to address FUNIT failure on derecho
slevis-lmwg 1503e17
Read params leafcn_co2_base and leafcn_co2_slope from the paramfile
slevis-lmwg 287fea8
Rename leafcn to leafcn_t_evolving where appropriate and add comments
slevis-lmwg 56a3d6c
Rename leafcn_patch to leafcn_t_evolving_patch update some comments
slevis-lmwg 9bbc216
Remove redundant leafcn_t_evolving_patch update from subr. restart
slevis-lmwg 50785f6
Update comments
slevis-lmwg f298fc8
Rm allocate(this%leafcn_t_evolving_patch from subr. time_evolv_leafcn
slevis-lmwg e511893
Add testmods_dirs/clm/leafcn_t_evolving for aux_clm test to be added
slevis-lmwg 14ef248
Add the new test to testlist_clm.xml
slevis-lmwg c7f008b
Move "call time_evolv_leafcn" into a loop over clumps (Bill's review)
slevis-lmwg e859033
Use the bgc_vegp filter instead of an if-statement for efficiency
slevis-lmwg 9eab348
Merge tag 'ctsm5.3.043' into time_evolv_params
slevis-lmwg 4ad5256
Calculate co2_ppmv with both pco2 & pbot not_downscaled (Bill's review)
slevis-lmwg 7371590
Updated ChangeLog/Sum
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,12 @@ | ||
| This points to an alternate params file with | ||
| rf_cwdl2 = 0.5 | ||
| rf_cwdl3_bgc = 0.5 | ||
| while by default these parameters equal zero. | ||
| ceta = 450 (default = 358) | ||
|
|
||
| The README used to say that the alternate paramfile contained | ||
| rf_cwdl2 = 0.5 (default 0) | ||
| rf_cwdl3_bgc = 0.5 (default 0) | ||
| but now 0.5 is the default. | ||
|
|
||
| The README also used to say: | ||
| The test outputs inactive history fields that would contain zeros | ||
| when running with the default params file and should be greater than zero | ||
| when running with the alternate params file. |
6 changes: 6 additions & 0 deletions
6
cime_config/testdefs/testmods_dirs/clm/leafcn_t_evolving/README
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,6 @@ | ||
| This points to an alternate params file with | ||
| leafcn_co2_slope = 30 (default = 0) | ||
| to confirm that the leafcn_t_evolving calculation doesn't fail. | ||
|
|
||
| When we added this test, slevis and ekluzek agreed to consolidate our custom paramfiles into one. | ||
| The first of the consolidated paramfiles is named ctsm60_ceta450_cn30_co2_slope30.c250326.nc. |
1 change: 1 addition & 0 deletions
1
cime_config/testdefs/testmods_dirs/clm/leafcn_t_evolving/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 @@ | ||
| ../default |
1 change: 1 addition & 0 deletions
1
cime_config/testdefs/testmods_dirs/clm/leafcn_t_evolving/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 @@ | ||
| paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm60_ceta450_cn30_co2_slope30.c250326.nc' |
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
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.