Merge of release_candidate into develop #156
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
Updated copyright header + little bugfix
… files to caused a conopt4 crash (fatal system error 88120).
fix parameters to SSP2 values until 2020
bugfix trade exo over kall instead of k
resolved conflicts
weindl
approved these changes
Mar 31, 2020
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.
Most changes concern the fixing of parameters to SSP2 values until 2020
The change from "t" to "t_all" in some modules is needed for forestry (prepartory work).
The changes in the forestry module are in line with the upcoming forestry module by Abhi.
The magpie4 library has been updated accordingly (p32_carbon_density_ac)