Develop #16
Merged
Develop #16
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
…m:abhimishr/magpie into f_timber_develop
…off realization now calculated timber demand and pays a nominal cost of USD100 for every unit of timber proiduced without harvesting forests.
…e PR is approved)
…dr in timber plantations
…antation area distribution
Timber production and dynamic forestry
changed to: "Crop residues in developed regions are fully assigned to house, while in developing regions we assume that 25% of the Nr in residues are consumed directly on croplands during stubble grazing."
Bugfix bracket bug in confinement equation
FelicitasBeier
pushed a commit
that referenced
this pull request
Jun 29, 2021
Merge sticky and other developments into PR for new calib PR
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.
Merge magpie develop into my develop