v4.8 to develop branch #228
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
…/dssat-csm-os into OilCropSun_by_FV
Update Weather subroutine to support NASA format files.
…into OilCropSun_by_FV
OilCropSun model for Sunflower - Developed by Francisco Villalobos
…into develop_v4.8
Updated calibration for chia, quinoa and safflower by Ken Boote
Develop v4.8
Added PLTPOP protection for NWheat
…at-csm-os into Compiler-issues
Sccsp seg fault
Fix extra comma at the end of CSV rows
…into develop_v4.8
# Conflicts: # Soil/GHG/GHG_mod.for
(cherry picked from commit adab464)
Adding major changes of the cassava model.
New crops list
Release notes updated - final
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 pulls branch develop_4.8 into the develop branch, which has been v4.7.5 up until this merge. The resulting develop branch will be the release v4.8.0.27 plus the plastic mulch routines.