Merge pull request #49 from GerritHoogenboom/develop

ETPHOT protections
lpmorenoc · Nov 20, 2020 · 3f584ee · 3f584ee
2 parents 29f1303 + 951a709
commit 3f584ee
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
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 21)
+SET(BUILD 23)
 
 # Get the current working branch
 execute_process(

diff --git a/Data/WEATHER.CDE b/Data/WEATHER.CDE
@@ -1,5 +1,5 @@
 *WEATHER DATA CODES
-! DSSAT v4.7; 10/09/2020
+! DSSAT v4.7; 11/20/2020
 
 ! Headers used in the @ line to identify variables are listed first; codes
 ! ('flags') used to designate data types are listed next.
@@ -61,10 +61,10 @@ REFHT    Reference height for weather measurements, m                         IB
 RHUM     Relative humidity average, %                                         IB
 RNUM     Rainy days, # month-1                                                IB
 RTOT     Rainfall total, mm month-1                                           IB
-SAMN     Solar radiation,all days,monthly average, MJ m-2 d-1                 IB
-SDMN     Solar radiation,dry days,monthly average, MJ m-2 d-1                 IB
-SDSD     Solar radiation,dry days,monthly standard deviation, MJ m-2 d-1      IB
-SHMN     Daily sunshine duration, monthly average, percent                    IB
+SAMN     Solar radiation,all days, monthly average, MJ m-2 d-1                IB
+SDMN     Solar radiation,dry days, monthly average, MJ m-2 d-1                IB
+SDSD     Solar radiation,dry days, monthly standard deviation, MJ m-2 d-1     IB
+SHMN     Daily sunshine duration,  monthly average, %                         IB
 SOURCE   Source of daily weather data, text                                   IB
 SRAD     Daily solar radiation, MJ m-2 day-1                                  IB
 SRAY     Solar radiation,yearly average, MJ m-2 day-1                         IB

diff --git a/SPAM/ETPHOT.for b/SPAM/ETPHOT.for
@@ -458,7 +458,7 @@ C            added by BAK on 10DEC2015
      &      CCNEFF, CICAD, CMXSF, CQESF, PGPATH,          !Input
      &      AGEQESL, CO2QESL, QEFFSL)                     !Output
 
-C         Integrate instantaneous canopy photoynthesis (�mol CO2/m2/s)
+C         Integrate instantaneous canopy photoynthesis (µmol CO2/m2/s)
 C         and evapotranspiration (mm/h) to get daily values (g CO2/m2/d
 C         and mm/d).
 

diff --git a/Utilities/CSMVersion.for.in b/Utilities/CSMVersion.for.in
@@ -22,6 +22,9 @@
       CHARACTER(len=*), PARAMETER :: VBranch = '-develop'
 
 !     Version history:  
+!       4.7.5.23 gh  11/13/2020 ETPHOT corrections: phase 1; zero divide corrections
+!       4.7.5.22 gh  11/13/2020 Minor updates; sorghum ecotype file
+
 !       4.7.5.21 chp 10/09/2020 Y4K- 4 digit years in weather file
 !       4.7.5.20 chp 10/09/2020 Minor bug fixes 
 !       4.7.5.19 gh  10/02/2020 Quinoa added as a new crop