Skip to content
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.

Sign up for GitHub

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

Update DSSATPRO for quinoa #35

Merged
merged 1 commit into from
Oct 2, 2020
Merged

Update DSSATPRO for quinoa #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PROJECT(DSSAT-CSM Fortran)
SET(MAJOR 4)
SET(MINOR 7)
SET(MODEL 5)
SET(BUILD 18)
SET(BUILD 19)

# Get the current working branch
execute_process(
Expand Down
2 changes: 2 additions & 0 deletions Data/DSSATPRO.L47.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ MPO // @CMAKE_INSTALL_PREFIX@
MPP // @CMAKE_INSTALL_PREFIX@ dscsm047 CRGRO047
MPR // @CMAKE_INSTALL_PREFIX@ dscsm047 CRGRO047
MPT // @CMAKE_INSTALL_PREFIX@ dscsm047 PTSUB047
MQU // @CMAKE_INSTALL_PREFIX@ dscsm047 CRGRO047
MRI // @CMAKE_INSTALL_PREFIX@ dscsm047 RICER047
MRP // @CMAKE_INSTALL_PREFIX@
MSB // @CMAKE_INSTALL_PREFIX@ dscsm047 CRGRO047
Expand Down Expand Up @@ -145,6 +146,7 @@ POD // @CMAKE_INSTALL_PREFIX@/PerennialPeanut
PPD // @CMAKE_INSTALL_PREFIX@/Pigeonpea
PRD // @CMAKE_INSTALL_PREFIX@/Pepper
PTD // @CMAKE_INSTALL_PREFIX@/Potato
QUD // @CMAKE_INSTALL_PREFIX@/Quinoa
RID // @CMAKE_INSTALL_PREFIX@/Rice
RPD // @CMAKE_INSTALL_PREFIX@/Rhizomapeanut
SBD // @CMAKE_INSTALL_PREFIX@/Soybean
Expand Down
1 change: 1 addition & 0 deletions Utilities/CSMVersion.for.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
CHARACTER(len=*), PARAMETER :: VBranch = '-develop'

! Version history:
! 4.7.5.19 gh 10/02/2020 Quinoa added as a new crop
! 4.7.5.18 chp 08/03/2020 NWheat cultivar/ecotype file changes, ozone response
! SAMUCA initialization bugfix
! 4.7.5.17 chp 07/31/2020 NWheat pest linkage, Maize pest bug fix,
Expand Down