Merge pull request #35 from GerritHoogenboom/develop

Update DSSATPRO for quinoa
DSSAT · Oct 2, 2020 · 2661020 · 2661020
2 parents 2b19243 + f605477
commit 2661020
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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(

diff --git a/Data/DSSATPRO.L47.in b/Data/DSSATPRO.L47.in
@@ -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
@@ -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

diff --git a/Utilities/CSMVersion.for.in b/Utilities/CSMVersion.for.in
@@ -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,