Skip to content

Commit

Permalink
Merging v4.7.5.21 into netcdf
Browse files Browse the repository at this point in the history
  • Loading branch information
palderman committed Oct 16, 2020
2 parents df5c65e + e4470f7 commit 830ad43
Show file tree
Hide file tree
Showing 56 changed files with 1,495 additions and 327 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ Version047.rc
.DS_Store
Data/.DS_Store
Resources/RC*
*makefile*
build/
nbproject/
.metadata/
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
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 21)

# Get the current working branch
execute_process(
Expand Down Expand Up @@ -168,6 +168,7 @@ set(
"InputModule/IPSOIL_Inp.for"
"InputModule/IPTILL.for"
"InputModule/IPVAR.for"
"InputModule/MAKEFILEW.f90"
"InputModule/OPGEN.for"
"InputModule/OPHEAD.for"
"InputModule/PATH.for"
Expand Down
44 changes: 22 additions & 22 deletions CSM_Main/LAND.for
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ C-----------------------------------------------------------------------
C Soil Processes Module Variables
C-----------------------------------------------------------------------
REAL SNOW, WINF
REAL, DIMENSION(NL) :: NH4, NO3, SPi_Avail, SKi_Avail, ST, UPPM
REAL, DIMENSION(NL) :: SW, SWDELTS, UPFLOW
REAL, DIMENSION(NL) :: NH4_plant, NO3_plant, SPi_Avail, SKi_Avail
REAL, DIMENSION(NL) :: ST, UPPM, SW, SWDELTS, UPFLOW
TYPE (SoilType) SOILPROP !type defined in ModuleDefs
TYPE (FloodWatType) FLOODWAT
TYPE (FloodNType) FloodN
Expand Down Expand Up @@ -167,8 +167,8 @@ C-----------------------------------------------------------------------
& KUptake, OMAData, PUptake, SENESCE, ST, !Input
& FracRts, SWDELTX,TILLVALS, UNH4, UNO3, UPFLOW, !Input
& WEATHER, XHLAI, FLOODN, FLOODWAT, MULCH, !I/O
& NH4, NO3, SKi_AVAIL, SNOW, SPi_AVAIL, SOILPROP, !Output
& SomLitC, SomLitE, !Output
& NH4_plant, NO3_plant, SKi_AVAIL, SNOW, !Output
& SPi_AVAIL, SOILPROP, SomLitC, SomLitE, !Output
& SW, SWDELTS, SWDELTU, UPPM, WINF, YREND) !Output

C-----------------------------------------------------------------------
Expand All @@ -187,7 +187,7 @@ C Read initial plant module data
C-----------------------------------------------------------------------
CALL PLANT(CONTROL, ISWITCH,
& EO, EOP, EOS, EP, ES, FLOODWAT, HARVFRAC, !Input
& NH4, NO3, SKi_Avail, SomLitC, SomLitE, !Input
& NH4_plant, NO3_plant, SKi_Avail, SomLitC, SomLitE, !Input
& SPi_AVAIL, SNOW, SOILPROP, SRFTEMP, ST, SW, !Input
& TRWU, TRWUP, UPPM, WEATHER, YREND, YRPLT, !Input
& IRRAMT, !Input
Expand Down Expand Up @@ -249,16 +249,16 @@ C-----------------------------------------------------------------------
& KUptake, OMAData, PUptake, SENESCE, ST, !Input
& FracRts, SWDELTX,TILLVALS, UNH4, UNO3, UPFLOW, !Input
& WEATHER, XHLAI, FLOODN, FLOODWAT, MULCH, !I/O
& NH4, NO3, SKi_AVAIL, SNOW, SPi_AVAIL, SOILPROP, !Output
& SomLitC, SomLitE, !Output
& NH4_plant, NO3_plant, SKi_AVAIL, SNOW, !Output
& SPi_AVAIL, SOILPROP, SomLitC, SomLitE, !Output
& SW, SWDELTS, SWDELTU, UPPM, WINF, YREND) !Output

C-----------------------------------------------------------------------
C Initialize PLANT routines (including phenology and pest)
C-----------------------------------------------------------------------
CALL PLANT(CONTROL, ISWITCH,
& EO, EOP, EOS, EP, ES, FLOODWAT, HARVFRAC, !Input
& NH4, NO3, SKi_Avail, SomLitC, SomLitE, !Input
& NH4_plant, NO3_plant, SKi_Avail, SomLitC, SomLitE, !Input
& SPi_AVAIL, SNOW, SOILPROP, SRFTEMP, ST, SW, !Input
& TRWU, TRWUP, UPPM, WEATHER, YREND, YRPLT, !Input
& IRRAMT, !Input
Expand Down Expand Up @@ -307,8 +307,8 @@ C-----------------------------------------------------------------------
& KUptake, OMAData, PUptake, SENESCE, ST, !Input
& FracRts, SWDELTX,TILLVALS, UNH4, UNO3, UPFLOW, !Input
& WEATHER, XHLAI, FLOODN, FLOODWAT, MULCH, !I/O
& NH4, NO3, SKi_AVAIL, SNOW, SPi_AVAIL, SOILPROP, !Output
& SomLitC, SomLitE, !Output
& NH4_plant, NO3_plant, SKi_AVAIL, SNOW, !Output
& SPi_AVAIL, SOILPROP, SomLitC, SomLitE, !Output
& SW, SWDELTS, SWDELTU, UPPM, WINF, YREND) !Output

C-----------------------------------------------------------------------
Expand All @@ -332,7 +332,7 @@ C-----------------------------------------------------------------------
& YRDOY .GE. YRPLT .AND. YRPLT .NE. -99) THEN
CALL PLANT(CONTROL, ISWITCH,
& EO, EOP, EOS, EP, ES, FLOODWAT, HARVFRAC, !Input
& NH4, NO3, SKi_Avail, SomLitC, SomLitE, !Input
& NH4_plant, NO3_plant, SKi_Avail, SomLitC, SomLitE, !Input
& SPi_AVAIL, SNOW, SOILPROP, SRFTEMP, ST, SW, !Input
& TRWU, TRWUP, UPPM, WEATHER, YREND, YRPLT, !Input
& IRRAMT, !Input
Expand All @@ -355,8 +355,8 @@ C-----------------------------------------------------------------------
& KUptake, OMAData, PUptake, SENESCE, ST, !Input
& FracRts, SWDELTX,TILLVALS, UNH4, UNO3, UPFLOW, !Input
& WEATHER, XHLAI, FLOODN, FLOODWAT, MULCH, !I/O
& NH4, NO3, SKi_AVAIL, SNOW, SPi_AVAIL, SOILPROP, !Output
& SomLitC, SomLitE, !Output
& NH4_plant, NO3_plant, SKi_AVAIL, SNOW, !Output
& SPi_AVAIL, SOILPROP, SomLitC, SomLitE, !Output
& SW, SWDELTS, SWDELTU, UPPM, WINF, YREND) !Output

C-----------------------------------------------------------------------
Expand All @@ -378,7 +378,7 @@ C-----------------------------------------------------------------------
& YRDOY .GE. YRPLT .AND. YRPLT .NE. -99) THEN
CALL PLANT(CONTROL, ISWITCH,
& EO, EOP, EOS, EP, ES, FLOODWAT, HARVFRAC, !Input
& NH4, NO3, SKi_Avail, SomLitC, SomLitE, !Input
& NH4_plant, NO3_plant, SKi_Avail, SomLitC, SomLitE, !Input
& SPi_AVAIL, SNOW, SOILPROP, SRFTEMP, ST, SW, !Input
& TRWU, TRWUP, UPPM, WEATHER, YREND, YRPLT, !Input
& IRRAMT, !Input
Expand Down Expand Up @@ -412,8 +412,8 @@ C***********************************************************************
& KUptake, OMAData, PUptake, SENESCE, ST, !Input
& FracRts, SWDELTX,TILLVALS, UNH4, UNO3, UPFLOW, !Input
& WEATHER, XHLAI, FLOODN, FLOODWAT, MULCH, !I/O
& NH4, NO3, SKi_AVAIL, SNOW, SPi_AVAIL, SOILPROP, !Output
& SomLitC, SomLitE, !Output
& NH4_plant, NO3_plant, SKi_AVAIL, SNOW, !Output
& SPi_AVAIL, SOILPROP, SomLitC, SomLitE, !Output
& SW, SWDELTS, SWDELTU, UPPM, WINF, YREND) !Output

CALL SPAM(CONTROL, ISWITCH,
Expand All @@ -430,7 +430,7 @@ C-----------------------------------------------------------------------
IF (CROP .NE. 'FA') THEN
CALL PLANT(CONTROL, ISWITCH,
& EO, EOP, EOS, EP, ES, FLOODWAT, HARVFRAC, !Input
& NH4, NO3, SKi_Avail, SomLitC, SomLitE, !Input
& NH4_plant, NO3_plant, SKi_Avail, SomLitC, SomLitE, !Input
& SPi_AVAIL, SNOW, SOILPROP, SRFTEMP, ST, SW, !Input
& TRWU, TRWUP, UPPM, WEATHER, YREND, YRPLT, !Input
& IRRAMT, !Input
Expand Down Expand Up @@ -462,8 +462,8 @@ C Print seasonal summaries and close files.
& KUptake, OMAData, PUptake, SENESCE, ST, !Input
& FracRts, SWDELTX,TILLVALS, UNH4, UNO3, UPFLOW, !Input
& WEATHER, XHLAI, FLOODN, FLOODWAT, MULCH, !I/O
& NH4, NO3, SKi_AVAIL, SNOW, SPi_AVAIL, SOILPROP, !Output
& SomLitC, SomLitE, !Output
& NH4_plant, NO3_plant, SKi_AVAIL, SNOW, !Output
& SPi_AVAIL, SOILPROP, SomLitC, SomLitE, !Output
& SW, SWDELTS, SWDELTU, UPPM, WINF, YREND) !Output

CALL SPAM(CONTROL, ISWITCH,
Expand All @@ -476,7 +476,7 @@ C Print seasonal summaries and close files.

CALL PLANT(CONTROL, ISWITCH,
& EO, EOP, EOS, EP, ES, FLOODWAT, HARVFRAC, !Input
& NH4, NO3, SKi_Avail, SomLitC, SomLitE, !Input
& NH4_plant, NO3_plant, SKi_Avail, SomLitC, SomLitE, !Input
& SPi_AVAIL, SNOW, SOILPROP, SRFTEMP, ST, SW, !Input
& TRWU, TRWUP, UPPM, WEATHER, YREND, YRPLT, !Input
& IRRAMT, !Input
Expand Down Expand Up @@ -537,8 +537,8 @@ C***********************************************************************
& KUptake, OMAData, PUptake, SENESCE, ST, !Input
& FracRts, SWDELTX,TILLVALS, UNH4, UNO3, UPFLOW, !Input
& WEATHER, XHLAI, FLOODN, FLOODWAT, MULCH, !I/O
& NH4, NO3, SKi_AVAIL, SNOW, SPi_AVAIL, SOILPROP, !Output
& SomLitC, SomLitE, !Output
& NH4_plant, NO3_plant, SKi_AVAIL, SNOW, !Output
& SPi_AVAIL, SOILPROP, SomLitC, SomLitE, !Output
& SW, SWDELTS, SWDELTU, UPPM, WINF, YREND) !Output

!! Temporary timer function
Expand Down
3 changes: 2 additions & 1 deletion Data/DETAIL.CDE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*EXPERIMENTAL DETAILS CODES
! DSSAT v4.7; 09/01/2017
! DSSAT v4.7; 09/18/2020

! Headers used in the @ line to identify variables are listed first, codes to
! identify methods, chemicals, etc. are listed next in sections that relate to
Expand Down Expand Up @@ -265,6 +265,7 @@ PO Perennial peanut IB
PP Pigeon pea IB
PR Pepper IB
PT Potato IB
QU Quinoa IB
RG Ryegrass IB
RI Rice IB
RP Rhizoma peanut IB
Expand Down
2 changes: 1 addition & 1 deletion Data/DSCSM047.CTR
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $SIMULATION_CONTROLS
@N CONTROLS_TITLE
5 Detail output (VBOSE='D')
@N OUTPUTS FNAME OVVEW SUMRY FROPT GROUT CAOUT WAOUT NIOUT MIOUT DIOUT VBOSE CHOUT OPOUT FMOPT
5 OU . . . . . . . . . . D . Y .
5 OU . . . 1 . . . . . . D . Y .

!-----------------------------------------------------------------------------------------
@N CONTROLS_TITLE
Expand Down
2 changes: 2 additions & 0 deletions Data/DSSATPRO.L47.in
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
4 changes: 4 additions & 0 deletions Data/Genotype/PRGRO047.SPE
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,10 @@

!*EVAPOTRANSPIRATION
0.75 1.0 KEP, EORATIO


*FRESH WEIGHT
Y Switch for fresh weight option

*PHOSPHORUS CONTENT Copied from Soybean! Need to set for pepper
! Two options for Optimum and minimum P concentrations for shoots:
Expand Down
42 changes: 42 additions & 0 deletions Data/Genotype/QUGRO047.CUL
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
*QUINOA GENOTYPE COEFFICIENTS: CRGRO047 MODEL
!
! COEFF DEFINITIONS
! ===== ===========
! VAR# Identification code or number for a specific cultivar.
! VAR-NAME Name of cultivar
! EXPNO Number of experiments used to estimate cultivar parameters
! ECO# Code for the ecotype to which this cultivar belongs (see *.eco file)
! CSDL Critical Short Day Length below which reproductive development
! progresses with no daylength effect (for shortday plants) (hour)
! PPSEN Slope of the relative response of development to photoperiod with time
! (positive for shortday plants) (1/hour)
! EM-FL Time between plant emergence and flower appearance (R1)
! (photothermal days)
! FL-SH Time between first flower and first pod (R3) (photothermal days)
! FL-SD Time between first flower and first seed (R5) (photothermal days)
! SD-PM Time between first seed (R5) and physiological maturity (R7)
! (photothermal days)
! FL-LF Time between first flower (R1) and end of leaf expansion
! (photothermal days)
! LFMAX Maximum leaf photosynthesis rate at 30 C, 350 vpm CO2, and high light
! (mg CO2/m2-s)
! SLAVR Specific leaf area of cultivar under standard growth conditions
! (cm2/g)
! SIZLF Maximum size of full leaf (three leaflets) (cm2)
! XFRT Maximum fraction of daily growth that is partitioned to seed + shell
! WTPSD Maximum weight per seed (g)
! SFDUR Seed filling duration for pod cohort at standard growth conditions
! (photothermal days)
! SDPDV Average seed per pod under standard growing conditions (#/pod)
! PODUR Time required for cultivar to reach final pod load under optimal
! conditions (photothermal days)
! THRSH Threshing percentage. The maximum ratio of (seed/(seed+shell))
! at maturity. Causes seeds to stop growing as their dry weight
! increases until shells are filled in a cohort.
! SDPRO Fraction protein in seeds (g(protein)/g(seed))
! SDLIP Fraction oil in seeds (g(oil)/g(seed))
!
@VAR# VAR-NAME........ EXPNO ECO# CSDL PPSEN EM-FL FL-SH FL-SD SD-PM FL-LF LFMAX SLAVR SIZLF XFRT WTPSD SFDUR SDPDV PODUR THRSH SDPRO SDLIP
! 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
UH0001 Zeno (00) . QU0001 14.35 0.008 11.2 2.9 8.6 34.40 26.00 1.730 250. 7.0 1.00 0.060 22.0 2.20 16.0 75.5 .135 .060
UH0002 Jessie (00) . QU0002 14.35 0.008 11.2 3.0 9.1 30.90 26.00 1.700 255. 6.5 0.98 0.060 22.5 2.20 15.0 74.5 .155 .070
47 changes: 47 additions & 0 deletions Data/Genotype/QUGRO047.ECO
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
*QUINOA ECOTYPE COEFFICIENTS: CRGRO047 MODEL
!
! COEFF DEFINITIONS
! ===== ===========
! ECO# Code for the ecotype to which a cultivar belongs (see *.cul
! file)
! ECONAME Name of the ecotype, which is referenced from *.CUL file
! MG Maturity group number for this ecotype, such as maturity
! group in soybean
! TM Indicator of temperature adaptation
! THVAR Minimum rate of reproductive development under long days
! and optimal temperature
! PL-EM Time between planting and emergence (V0) (thermal days)
! EM-V1 Time required from emergence to first true leaf (V1), thermal
! days
! V1-JU Time required from first true leaf to end of juvenile phase,
! thermal days
! JU-R0 Time required for floral induction, equal to the minimum
! number of days for floral induction under optimal temperature and
! daylengths, photothermal days
! PM06 Proportion of time between first flower and first pod for
! first peg (peanut only)
! PM09 Proportion of time between first seed and physiological
! maturity that the last seed can be formed
! LNGSH Time required for growth of individual shells (photothermal
! days)
! R7-R8 Time between physiological (R7) and harvest maturity (R8) (days)
! FL-VS Time from first flower to last leaf on main stem (photothermal
! days)
! TRIFL Rate of appearance of leaves on the mainstem (leaves per
! thermal day)
! RWDTH Relative width of this ecotype in comparison to the standard
! width per node (YVSWH) defined in the species file (*.SPE)
! RHGHT Relative height of this ecotype in comparison to the
! standard height per node (YVSHT) defined in the species file
! (*.SPE)
! R1PPO Increase in daylength sensitivity after R1 (CSDVAR and CLDVAR
! both decrease with the same amount) (h)
! OPTBI Minimum daily temperature above which there is no effect on
! slowing normal development toward flowering (oC)
! SLOBI Slope of relationship reducing progress toward flowering if
! TMIN for the day is less than OPTBI
!
@ECO# ECONAME.......... MG TM THVAR PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNGSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
! 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
QU0001 MATURITY GROUP 0 00 01 0.0 3.2 2.0 0.0 05.0 0.0 0.35 10.0 12.0 20.00 0.90 1.0 1.0 .189 18.0 .028
QU0002 MATURITY GROUP 0 00 01 0.0 3.2 2.0 0.0 05.0 0.0 0.35 10.0 12.0 20.00 1.20 0.80 0.80 .189 18.0 .028
Loading

0 comments on commit 830ad43

Please sign in to comment.