-
Notifications
You must be signed in to change notification settings - Fork 92
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
Allow understory leaves to have a different turnover rate than canopy leaves #1136
Merged
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
a235f11
first pass adding understory leaf longevity
JessicaNeedham 8566508
add understory leaf turnover to trimming logic
JessicaNeedham 858cd68
fix typo
JessicaNeedham 4961637
update parameter file
JessicaNeedham 7bfbabb
add patch files for updating param file
JessicaNeedham 1240d32
address review comments - minor typo fixes
JessicaNeedham b8da4dd
update param names and valuess
JessicaNeedham 2cb1a25
used a local variable leaf_long to reduce redundant code
rgknox 1afa59e
update xml patch
JessicaNeedham 595bf02
reverting parameter file default
rgknox 8aa0aae
Adding api36.2 (or 36.1) parameter change xml file
rgknox ae54c1d
debugged and applied first pass of the api36.1 parameters
rgknox ca58099
updated naming convention of parameter changing files
rgknox 3fcbd19
fixing record of api36.0 parameter file record parameter_files/archiv…
rgknox 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 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 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
1,803 changes: 1,803 additions & 0 deletions
1,803
parameter_files/archive/api36.1.0_params_default.cdl
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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,129 @@ | ||
<?xml version="1.0"?> | ||
<all> | ||
<!-- This parameter patch file updates the parameter file with the changes | ||
brought in by Xiulin Gao, Jessie Needham, Jennifer Holm and Ryan Knox. | ||
This includes grass specific allometry parameters, canopy versus | ||
understory leaf turnover specifications, and changing default behavior of | ||
nutrient uptake to be fully coupled. --> | ||
|
||
<!-- To use this patch file run the following command: --> | ||
<!-- Run `python ../tools/UpdateParamAPI.py -/-f archive/api33.0.0_020524_patch_params.xml` --> | ||
|
||
<!-- General xml file usage notes: --> | ||
<!-- Special mod types "variable_add": creates a new variable | ||
"dimension_add": creates a new dimension | ||
"variable_del": removes a variable, must include attribute "name" | ||
"variable_change": change values in the parameter, possibly including the name, and | ||
this must also come with a name attribute as well --> | ||
<!-- To change a dimension. The easiest way to script this, is to delete the variables | ||
that use it, delete the dimension. Re-add it with the new size, and then re-add | ||
the variables --> | ||
<!-- --> | ||
|
||
<base_file>archive/api36.1.0_params_default.cdl</base_file> | ||
<new_file>fates_params_default.cdl</new_file> | ||
<pft_list> 1,2,3,4,5,6,7,8,9,10,11,12 </pft_list> | ||
<mods> | ||
<mod type="variable_change" name="fates_allom_agb1"> | ||
<val> 0.0673, 0.1364012, 0.0393057, 0.2653695, 0.0673, 0.0728698, 0.06896, 0.06896, 0.06896, 0.001, 0.001, 0.003 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_agb2"> | ||
<val> 0.976, 0.9449041, 1.087335, 0.8321321, 0.976, 1.0373211, 0.572, 0.572, 0.572, 1.6592, 1.6592, 1.3456 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_agb3"> | ||
<val> 1.94, 1.94, 1.94, 1.94, 1.94, 1.94, 1.94, 1.94, 1.94, 1.248, 1.248, 1.869 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_agb4"> | ||
<val> 0.931, 0.931, 0.931, 0.931, 0.931, 0.931, 0.931, 0.931, 0.931, -999.9, -999.9, -999.9 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_agb_frac"> | ||
<val> 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 1, 1, 1 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_amode"> | ||
<val> 3, 3, 3, 3, 3, 3, 1, 1, 1, 5, 5, 5 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_blca_expnt_diff"> | ||
<val> -0.12, -0.34, -0.32, -0.22, -0.12, -0.35, 0, 0, 0, -0.487, -0.487, -0.259 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_d2bl1"> | ||
<val> 0.04, 0.07, 0.07, 0.01, 0.04, 0.07, 0.07, 0.07, 0.07, 0.0004, 0.0004, 0.0012 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_d2bl2"> | ||
<val>1.6019679, 1.5234373, 1.3051237, 1.9621397, 1.6019679, 1.3998939, 1.3, 1.3, 1.3, 1.7092, 1.7092, 1.5879 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_d2bl3"> | ||
<val>0.55, 0.55, 0.55, 0.55, 0.55, 0.55, 0.55, 0.55, 0.55, 0.3417, 0.3417, 0.9948 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_d2ca_coefficient_max"> | ||
<val>0.2715891, 0.3693718, 1.0787259, 0.0579297, 0.2715891, 1.1553612, 0.6568464, 0.6568464, 0.6568464, 0.0408, 0.0408, 0.0862 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_d2ca_coefficient_min"> | ||
<val>0.2715891, 0.3693718, 1.0787259, 0.0579297, 0.2715891, 1.1553612, 0.6568464, 0.6568464, 0.6568464, 0.0408, 0.0408, 0.0862 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_d2h1"> | ||
<val>78.4087704, 306.842667, 106.8745821, 104.3586841, 78.4087704, 31.4557047, 0.64, 0.64, 0.64, 0.1812, 0.1812, 0.3353 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_d2h2"> | ||
<val>0.8124383, 0.752377, 0.9471302, 1.1146973, 0.8124383, 0.9734088, 0.37, 0.37, 0.37, 0.6384, 0.6384, 0.4235 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_dbh_maxheight"> | ||
<val>1000, 1000, 1000, 1000, 1000, 1000, 3, 3, 2, 20, 20, 30 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_hmode"> | ||
<val> 5, 5, 5, 5, 5, 5, 1, 1, 1, 3, 3, 3 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_l2fr"> | ||
<val> 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.67, 0.67, 1.41 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_lmode"> | ||
<val>2, 2, 2, 2, 2, 2, 1, 1, 1, 5, 5, 5 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_allom_smode"> | ||
<val>1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_leaf_slamax"> | ||
<val>0.0954, 0.0954, 0.0954, 0.0954, 0.0954, 0.0954, 0.012, 0.03, 0.03, 0.05, 0.05, 0.05 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_leaf_slatop"> | ||
<val>0.012, 0.005, 0.024, 0.009, 0.03, 0.03, 0.012, 0.03, 0.03, 0.05, 0.05, 0.05 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_recruit_height_min"> | ||
<val>1.3, 1.3, 1.3, 1.3, 1.3, 1.3, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_recruit_seed_alloc"> | ||
<val>0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0, 0, 0 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_recruit_seed_alloc_mature"> | ||
<val>0, 0, 0, 0, 0, 0, 0.9, 0.9, 0.9, 0.25, 0.25, 0.2 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_recruit_seed_dbh_repro_threshold"> | ||
<val>90, 80, 80, 80, 90, 80, 3, 3, 2, 3, 3, 3 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_cnp_prescribed_nuptake"> | ||
<val> 0,0,0,0,0,0,0,0,0,0,0,0 </val> | ||
</mod> | ||
<mod type="variable_change" name="fates_cnp_prescribed_puptake"> | ||
<val> 0,0,0,0,0,0,0,0,0,0,0,0 </val> | ||
</mod> | ||
<mod type="variable_del"> | ||
<na>fates_turnover_leaf</na> | ||
</mod> | ||
<mod type="variable_add"> | ||
<na> fates_turnover_leaf_canopy</na> | ||
<di> fates_leafage_class, fates_pft </di> | ||
<un> yr </un> | ||
<ln> Leaf longevity (ie turnover timescale) of canopy plants. For drought-deciduous PFTs, this also indicates the maximum length of the growing (i.e., leaves on) season. </ln> | ||
<val> 1.5, 4, 1, 1.5, 1, 1, 1.5, 1, 1, 1, 1, 1 </val> | ||
</mod> | ||
<mod type="variable_add"> | ||
<na> fates_turnover_leaf_ustory</na> | ||
<di> fates_leafage_class, fates_pft </di> | ||
<un> yr </un> | ||
<ln> Leaf longevity (ie turnover timescale) of understory plants. </ln> | ||
<val> 1.5, 4, 1, 1.5, 1, 1, 1.5, 1, 1, 1, 1, 1 </val> | ||
</mod> | ||
|
||
</mods> | ||
|
||
|
||
</all> |
This file contains 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.
Does this mean that the leaf longevity for understory must be always defined (as opposed to having them the same by default and only applying different longevities if the user wants it)? I'm fine either way, just curious about it.
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.
Yes, there has to be a value in the parameter file. But it defaults to the same as canopy trees so it is only different if a user wants it to be.
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.
These are now the same