Feature phenology biomass scaling #480
Merged
Conversation
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
Merge master into fg_specificity
biomass and transpiration are now specified in rgroup.in at the rgroup level, so the sxwbvt.in file was deleted. I also added some documentation along the way. There is still a great deal of documenting to be done.
Merge master into fg_specificity_sxw
(issue #349) Litter values are now specified per group per month. To do this I turned _prod_litter into a 2D array and adjusted allocation, population, usage, and deallocation accordingly. While I was modifying functions I also added some Doxygen documentation comments.
(issue #349) In my last commit I made a small error. I assigned v->veg[k].litter[m] in the same loop where we were accumulating v->veg[k].biomass[m]. This is equivalent to the difference between for(i = 0; i < 5; ++i){ k += i; l = k; } and for(i = 0; i < 5; ++i){ k += i; } l = k; In both come snippets "l" will be correctly assigned, but in the first implementation multiple erronous assignments would be made first.
_prod_litter values now differ for shrubs and grasses/forbs. These were calculated as: litter biomass / total biomass using the values in veg.in for each SOILWAT2 vegetation type.
-updated documentation in sxwphen.in -searched code and found no additional mention of phen values summing to 1.0, so nothing changed here -found no evidence for the check that re-scales phen values to 1.0 if they do not sum to 1.0 in sxwphen.in, so nothing changed here
Merge master into sxw specificity branch
Merge master into phenology scaling branch
Merge master into phenology scaling branch
- also had to adjust the bottom limit of deep soil layers in siteparm.in as 7 soil layers now have roots - also had to adjust the trco for shrubs, as they now have roots in the 7 soil layer. Trco shrubs is > 0 now in layer 7.
Merge master into phenology scaling branch
- few small changes to default values as documented in issue #431 and associated spreadsheet
- final adjustments to root fractsion based on spreadsheet in issue #463
|
Opening a pull request for this branch so @chaukap and I can both carefully review. |
kpalmqui
modified the milestones:
enhancement_cheatgrass_wildfire_loop,
phenology_biomass_scaling
|
Cannot be merged in until the complementary branch of rSFSTEP2 is approved and merged. |
-deleted extra declarations of killfreq, prop_killed, prop_recovered, grazing_frq, prop_grazing that were merged in accidentally.
- %live peaks now match peaks in phenological activity
- Peak litter fractions for cheatgrass now occur in the early fall
- updates to values used as defaults in simulations - these changes result in a.cool.forb and a.warm.forb now being non-zero
dschlaep
approved these changes
May 14, 2020
There was a problem hiding this comment.
I looked through the changes and all looks good.
I added a couple small suggestions to enhance two comments of input files so that they may be even more clear to users.
I also successfully compiled and run commit b130738 with make clean bint_testing_nongridded and make clean bint_testing_gridded.
testing.sagebrush.master/Stepwat_Inputs/Input/sxw/sxwprod_v2.in
Outdated
Show resolved
Hide resolved
-updated comments that describe litter, biomass, %live fractions -update comments that describe calculation of bvt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This branch contains important updates to phenological activity, root fractions, biomass fractions, percent live fractions, and litter fractions.