Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/DSSAT/dssat-csm-os into …
Browse files Browse the repository at this point in the history 
…develop
  • Loading branch information
@fabiooliveira72
fabiooliveira72 committed Apr 26, 2024
2 parents c99886b + f65fc5c commit 185324f
Show file tree
Hide file tree
Showing 19 changed files with 588 additions and 310 deletions.
34 changes: 20 additions & 14 deletions Plant/ALOHA-Pineapple/Aloha_OPHARV.for
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
! in OVERVIEW.OUT and EVALUATE.OUT files (OPVIEW subroutine)
INTEGER ACOUNT
CHARACTER*6, DIMENSION(EvaluateNum) :: OLAB, OLAP !OLAP in dap
CHARACTER*6 X(EvaluateNum)
CHARACTER*12 X(EvaluateNum)
CHARACTER*8 Simulated(EvaluateNum), Measured(EvaluateNum)
CHARACTER*50 DESCRIP(EvaluateNum)

Expand Down Expand Up @@ -351,7 +351,8 @@ C-----------------------------------------------------------------------
ELSE
TRT_ROT = TRTNUM
ENDIF
CALL READA (FILEA, PATHEX,OLAB, TRT_ROT, YRSIM, X)
!CALL READA (FILEA, PATHEX,OLAB, TRT_ROT, YRSIM, X)
CALL READA_Y4K(FILEA, PATHEX,OLAB, TRT_ROT, YRSIM, X)

!-----------------------------------------------------------------------
FBTONS = FBIOM*0.01 !Biomass at forcing, t/ha
Expand Down Expand Up @@ -433,24 +434,29 @@ C-----------------------------------------------------------------------
WRITE(Simulated(2),'(I8)') DNR7; WRITE(Measured(2),'(I8)') DMAT !MDAT
WRITE(Simulated(3),'(I8)') HDAP; WRITE(Measured(3),'(I8)') DHARV !HDAT
WRITE(Simulated(4),'(F8.2)') YIELDFresh/1000.
WRITE(Measured(4),'(A8)') X(4) !FWAH
WRITE(Measured(4),'(A8)')TRIM(X(4)) !FWAH
WRITE(Simulated(5),'(F8.2)') YIELD/1000.
WRITE(Measured(5),'(A8)') X(5) !YDWAH
WRITE(Measured(5),'(A8)')TRIM(X(5)) !YDWAH
WRITE(Simulated(6),'(F8.1)') FBTONS
WRITE(Measured(6),'(A8)') X(6) !BADMF
WRITE(Measured(6),'(A8)')TRIM(X(6)) !BADMF
WRITE(Simulated(7),'(F8.1)') PBIOMS
WRITE(Measured(7),'(A8)') X(7) !BADMH
WRITE(Simulated(8),'(F8.2)')VWATM;WRITE(Measured(8),'(A8)') X(8) !VWATM
WRITE(Measured(7),'(A8)')TRIM(X(7)) !BADMH
WRITE(Simulated(8),'(F8.2)')VWATM;
WRITE(Measured(8),'(A8)')TRIM(X(8)) !VWATM
WRITE(Simulated(9),'(F8.2)') MAXLAI
WRITE(Measured(9),'(A8)') X(9) !LAIX
WRITE(Simulated(10),'(F8.1)') LN; WRITE(Measured(10),'(A8)')X(10) !L#SM
WRITE(Simulated(11),'(F8.3)') HI; WRITE(Measured(11),'(A8)')X(11) !HIAM
WRITE(Measured(9),'(A8)')TRIM(X(9)) !LAIX
WRITE(Simulated(10),'(F8.1)') LN;
WRITE(Measured(10),'(A8)')TRIM(X(10)) !L#SM
WRITE(Simulated(11),'(F8.3)') HI;
WRITE(Measured(11),'(A8)')TRIM(X(11)) !HIAM
WRITE(Simulated(12),'(I8)') NINT(GPSM)
WRITE(Measured(12),'(A8)')X(12) !E#AM
WRITE(Simulated(13),'(F8.1)') GPP;WRITE(Measured(13),'(A8)')X(13) !E#UM
WRITE(Measured(12),'(A8)')TRIM(X(12)) !E#AM
WRITE(Simulated(13),'(F8.1)') GPP;
WRITE(Measured(13),'(A8)')TRIM(X(13)) !E#UM
WRITE(Simulated(14),'(F8.3)') EYEWT
WRITE(Measured(14),'(A8)')X(14) !EWUM
WRITE(Simulated(15),'(F8.1)')CNAM;WRITE(Measured(15),'(A8)')X(15) !CNAM
WRITE(Measured(14),'(A8)')TRIM(X(14)) !EWUM
WRITE(Simulated(15),'(F8.1)')CNAM;
WRITE(Measured(15),'(A8)')TRIM(X(15)) !CNAM

! These aren't calculated - remove from Overview output
! WRITE(Simulated(3),'(I8)') -99 ; WRITE(Measured(3),'(I8)') -99 !PDFT - not used
Expand Down
48 changes: 28 additions & 20 deletions Plant/AROIDS/TR_Opharv.for
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ C=======================================================================
! Arrays which contain predicted and Measured data for printing
! in OVERVIEW.OUT and EVALUATE.OUT files (OPVIEW subroutine)
CHARACTER*6 OLAB(40), OLAP(40) !OLAP modified for dap
CHARACTER*6 X(40)
CHARACTER*12 X(40)
CHARACTER*8 Simulated(40), Measured(40)
CHARACTER*50 DESCRIP(40)

Expand Down Expand Up @@ -112,7 +112,7 @@ c & 'GW%M ', ! 4 Product Moisture Content (%)
& 'CWAA ', ! 8 Tot DM wt at max veg growth (kg dm/ha)
& 'CNAA ', ! 9 Tops N at at max veg growth (kg/ha)
& 'TWAH ', !10 Tot DM wt at maturity (kg dm/ha)
& 'BWAH ', !11 By-product harvest (kg dm/ha)
& 'BWAM ', !11 By-product harvest (kg dm/ha)
& 'HIAM ', !12 Harvest index at maturity
& 'L#SX ', !13 Leaf number per stem,maximum
& 'UNAM ', !14 Corm N at maturity (kg/ha)
Expand Down Expand Up @@ -280,7 +280,8 @@ C-----------------------------------------------------------------------
ELSE
TRT_ROT = TRTNUM
ENDIF
CALL READA(FILEA, PATHEX, OLAB, TRT_ROT, YRSIM, X)
!CALL READA(FILEA, PATHEX, OLAB, TRT_ROT, YRSIM, X)
CALL READA_Y4K(FILEA, PATHEX,OLAB, TRT_ROT, YRSIM, X)

! Convert from YRDOY format to DAP. Change descriptions to match.
CALL READA_Dates(X(1), YRSIM, IFLR)
Expand Down Expand Up @@ -325,33 +326,40 @@ C-----------------------------------------------------------------------
C
! Write values to Simulated and Measured arrays
! WRITE(Simulated(1), '(I8)') DNR0; WRITE(Measured(1),'(I8)') DPIN
WRITE(Simulated(1), '(I8)') DNR1; WRITE(Measured(1),'(A8)') X(1)
WRITE(Simulated(2), '(I8)') DNR7; WRITE(Measured(2),'(I8)') DMAT
WRITE(Simulated(1), '(I8)') DNR1;
WRITE(Measured(1),'(A8)') TRIM(X(1))
WRITE(Simulated(2), '(I8)') DNR7;
WRITE(Measured(2),'(I8)') DMAT
WRITE(Simulated(3), '(I8)') YIELD/1000;
WRITE(Measured(3),'(A8)') X(3)
WRITE(Simulated(4),'(F8.1)')DYIELD; WRITE(Measured(4),'(A8)') X(4)
WRITE(Simulated(5),'(F8.2)')MCORMWT;WRITE(Measured(5),'(A8)') X(5)
WRITE(Measured(3),'(A8)') TRIM(X(3))
WRITE(Simulated(4),'(F8.1)')DYIELD;
WRITE(Measured(4),'(A8)') TRIM(X(4))
WRITE(Simulated(5),'(F8.2)')MCORMWT;
WRITE(Measured(5),'(A8)') TRIM(X(5))
WRITE(Simulated(6), '(I8)') NINT(CORMLNO)
WRITE(Measured(6),'(A8)') X(6)
WRITE(Simulated(7),'(F8.2)')MAXLAI; WRITE(Measured(7),'(A8)') X(7)
WRITE(Measured(6),'(A8)') TRIM(X(6))
WRITE(Simulated(7),'(F8.2)')MAXLAI;
WRITE(Measured(7),'(A8)') TRIM(X(7))
WRITE(Simulated(8),'(I8)') NINT(CANWAA*10)
WRITE(Measured(8),'(A8)') X(8)
WRITE(Measured(8),'(A8)') TRIM(X(8))
WRITE(Simulated(9),'(I8)') NINT(CANNAA*10)
WRITE(Measured(9),'(A8)')X(9)
WRITE(Measured(9),'(A8)')TRIM(X(9))
WRITE(Simulated(10),'(I8)') NINT(PBIOMS)
WRITE(Measured(10),'(A8)')X(10)
WRITE(Measured(10),'(A8)')TRIM(X(10))
WRITE(Simulated(11),'(I8)') NINT(STOVER)
WRITE(Measured(11),'(A8)')X(11)
WRITE(Simulated(12),'(F8.3)') HI; WRITE(Measured(12),'(A8)')X(12)
WRITE(Simulated(13),'(I8)') LEAFNO;WRITE(Measured(13),'(A8)')X(13)
WRITE(Measured(11),'(A8)')TRIM(X(11))
WRITE(Simulated(12),'(F8.3)') HI;
WRITE(Measured(12),'(A8)')TRIM(X(12))
WRITE(Simulated(13),'(I8)') LEAFNO;
WRITE(Measured(13),'(A8)')TRIM(X(13))
WRITE(Simulated(14),'(I8)') NINT(CORMNUP)
WRITE(Measured(14),'(A8)')X(14)
WRITE(Measured(14),'(A8)')TRIM(X(14))
WRITE(Simulated(15),'(I8)') NINT(TOTNUP)
WRITE(Measured(15),'(A8)')X(15)
WRITE(Measured(15),'(A8)')TRIM(X(15))
WRITE(Simulated(16),'(I8)') NINT(APTNUP)
WRITE(Measured(16),'(A8)')X(16)
WRITE(Measured(16),'(A8)')TRIM(X(16))
WRITE(Simulated(17),'(F8.2)') PCORMN
WRITE(Measured(17),'(A8)')X(17)
WRITE(Measured(17),'(A8)')TRIM(X(17))
ENDIF


Expand Down
35 changes: 22 additions & 13 deletions Plant/CANEGRO-Sugarcane/SC_OPHARV.for
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ c Define CANEGRO composite variables:
! Arrays which contain Simulated and Measured data for printing
! in OVERVIEW.OUT and EVALUATE.OUT files (OPVIEW subroutine)
CHARACTER*6, DIMENSION(EvaluateNum) :: OLAB, OLAP !OLAP in dap
CHARACTER*6 X(EvaluateNum)
CHARACTER*12 X(EvaluateNum)
CHARACTER*8 Simulated(EvaluateNum), Measured(EvaluateNum)
CHARACTER*50 DESCRIP(EvaluateNum)

Expand Down Expand Up @@ -386,24 +386,33 @@ c Green Leaf area index at harvest
ELSE
TRT_ROT = CONTROL % TRTNUM
ENDIF
CALL READA (FILEA, PATHEX,OLAB, TRT_ROT, YRSIM, X)
!CALL READA (FILEA, PATHEX,OLAB, TRT_ROT, YRSIM, X)
CALL READA_Y4K(FILEA, PATHEX,OLAB, TRT_ROT, YRSIM, X)

! Store Simulated and Measured data for this season.
WRITE(Simulated(1),'(F8.2)') SUCH; WRITE(Measured(1),'(A8)')X(1)
WRITE(Simulated(2),'(F8.2)') AELH; WRITE(Measured(2),'(A8)')X(2)
WRITE(Simulated(3),'(F8.2)') STKH; WRITE(Measured(3),'(A8)')X(3)
WRITE(Simulated(4),'(F8.2)') TRSH; WRITE(Measured(4),'(A8)')X(4)
WRITE(Simulated(5),'(F8.2)') GLAI; WRITE(Measured(5),'(A8)')X(5)
WRITE(Simulated(6),'(F8.2)')MAXLAI;WRITE(Measured(6),'(A8)')X(6)
WRITE(Simulated(1),'(F8.2)') SUCH;
WRITE(Measured(1),'(A8)')TRIM(X(1))
WRITE(Simulated(2),'(F8.2)') AELH;
WRITE(Measured(2),'(A8)')TRIM(X(2))
WRITE(Simulated(3),'(F8.2)') STKH;
WRITE(Measured(3),'(A8)')TRIM(X(3))
WRITE(Simulated(4),'(F8.2)') TRSH;
WRITE(Measured(4),'(A8)')TRIM(X(4))
WRITE(Simulated(5),'(F8.2)') GLAI;
WRITE(Measured(5),'(A8)')TRIM(X(5))
WRITE(Simulated(6),'(F8.2)')MAXLAI;
WRITE(Measured(6),'(A8)')TRIM(X(6))
WRITE(Simulated(7),'(F8.2)') CaneCrop%CANHEIGHT
WRITE(Measured(7),'(A8)')X(7)
WRITE(Simulated(8),'(F8.2)') HIAM; WRITE(Measured(8),'(A8)')X(8)
WRITE(Simulated(9),'(F8.2)') L_SH; WRITE(Measured(9),'(A8)')X(9)
WRITE(Measured(7),'(A8)')TRIM(X(7))
WRITE(Simulated(8),'(F8.2)') HIAM;
WRITE(Measured(8),'(A8)')TRIM(X(8))
WRITE(Simulated(9),'(F8.2)') L_SH;
WRITE(Measured(9),'(A8)')TRIM(X(9))
WRITE(Simulated(10),'(I8)') DNR_EMRG
WRITE(Measured(10),'(A8)')X(10)
WRITE(Measured(10),'(A8)')TRIM(X(10))
c MJ, Feb 2012: add fresh stalk mass at harvest to output file
WRITE(Simulated(13),'(F8.1)') Part%STKWM
WRITE(Measured(10),'(A8)')X(11)
WRITE(Measured(10),'(A8)')TRIM(X(11))
ENDIF


Expand Down
55 changes: 32 additions & 23 deletions Plant/CASUPRO-Sugarcane/CSP_OPHARV.for
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ C-----------------------------------------------------------------------
! Arrays which contain Simulated and Measured data for printing
! in OVERVIEW.OUT and EVALUATE.OUT files (OPVIEW subroutine)
CHARACTER*6 OLAB(40), OLAP(40) !OLAP modified for dap
CHARACTER*6 X(40)
CHARACTER*12 X(40)
CHARACTER*8 Simulated(40), Measured(40)
CHARACTER*50 DESCRIP(40)

Expand Down Expand Up @@ -378,7 +378,8 @@ C-----------------------------------------------------------------------
ELSE
TRT_ROT = CONTROL % TRTNUM
ENDIF
CALL READA (FILEA, PATHEX, OLAB, TRT_ROT, YRSIM, X)
!CALL READA (FILEA, PATHEX, OLAB, TRT_ROT, YRSIM, X)
CALL READA_Y4K(FILEA, PATHEX,OLAB, TRT_ROT, YRSIM, X)

! Convert Date of max leaf area index from YRDOY to DAP.
! and change descriptions to match.
Expand Down Expand Up @@ -466,40 +467,48 @@ C-----------------------------------------------------------------------

!-----------------------------------------------------------------------
! Store Simulated and Measured data for this season.
WRITE(Simulated(1),'(F8.2)')SMFMH; WRITE(Measured(1),'(A8)')X(1)
WRITE(Simulated(2),'(F8.2)')SUCH; WRITE(Measured(2),'(A8)')X(2)
WRITE(Simulated(3),'(F8.2)')SSTKH; WRITE(Measured(3),'(A8)')X(3)
WRITE(Simulated(1),'(F8.2)')SMFMH;
WRITE(Measured(1),'(A8)')TRIM(X(1))
WRITE(Simulated(2),'(F8.2)')SUCH;
WRITE(Measured(2),'(A8)')TRIM(X(2))
WRITE(Simulated(3),'(F8.2)')SSTKH;
WRITE(Measured(3),'(A8)')TRIM(X(3))
WRITE(Simulated(4),'(F8.2)')CWAM/1000;
WRITE(Measured(4),'(A8)')X(4)
WRITE(Simulated(5),'(F8.2)')TRSH; WRITE(Measured(5),'(A8)')X(5)
WRITE(Simulated(6),'(F8.2)') LAIMX; WRITE(Measured(6),'(A8)')X(6)
WRITE(Simulated(7),'(I8)')LAIXD; WRITE(Measured(7),'(I8)')DLFX
WRITE(Simulated(8),'(F8.2)') LAIH; WRITE(Measured(8),'(A8)')X(8)
WRITE(Simulated(9),'(F8.0)')AvgLfAr; WRITE(Measured(9),'(A8)')X(9)
WRITE(Measured(4),'(A8)')TRIM(X(4))
WRITE(Simulated(5),'(F8.2)')TRSH;
WRITE(Measured(5),'(A8)')TRIM(X(5))
WRITE(Simulated(6),'(F8.2)') LAIMX;
WRITE(Measured(6),'(A8)')TRIM(X(6))
WRITE(Simulated(7),'(I8)')LAIXD;
WRITE(Measured(7),'(I8)')DLFX
WRITE(Simulated(8),'(F8.2)') LAIH;
WRITE(Measured(8),'(A8)')TRIM(X(8))
WRITE(Simulated(9),'(F8.0)')AvgLfAr;
WRITE(Measured(9),'(A8)')TRIM(X(9))
WRITE(Simulated(10),'(F8.2)')AvgLfWt;
WRITE(Measured(10),'(A8)')X(10)
WRITE(Measured(10),'(A8)')TRIM(X(10))
WRITE(Simulated(11),'(F8.2)')AvgNode;
WRITE(Measured(11),'(A8)')X(11)
WRITE(Measured(11),'(A8)')TRIM(X(11))
WRITE(Simulated(12),'(I8)')SPDAT;
WRITE(Measured(12),'(I8)')DSPT
WRITE(Measured(12),'(I8)')DSPT
WRITE(Simulated(13),'(I8)')EDAT0;
WRITE(Measured(13),'(I8)')DEM0
WRITE(Measured(13),'(I8)')DEM0
WRITE(Simulated(14),'(I8)')EDAT1;
WRITE(Measured(14),'(I8)')DEM1
WRITE(Measured(14),'(I8)')DEM1
WRITE(Simulated(15),'(I8)')EDAT2;
WRITE(Measured(15),'(I8)')DEM2
WRITE(Measured(15),'(I8)')DEM2
WRITE(Simulated(16),'(F8.2)')MaxStkPop;
WRITE(Measured(16),'(A8)')X(16)
WRITE(Measured(16),'(A8)')TRIM(X(16))
WRITE(Simulated(17),'(I8)')MaxStkDay;
WRITE(Measured(17),'(I8)')DTMX
WRITE(Measured(17),'(I8)')DTMX
WRITE(Simulated(18),'(I8)')StkDecDay;
WRITE(Measured(18),'(I8)')DPOP
WRITE(Measured(18),'(I8)')DPOP
WRITE(Simulated(19),'(F8.2)')SNAH;
WRITE(Measured(19),'(A8)')X(19)
WRITE(Measured(19),'(A8)')TRIM(X(19))
WRITE(Simulated(20),'(F8.2)')AvgHeight;
WRITE(Measured(20),'(A8)')X(20)
WRITE(Measured(20),'(A8)')TRIM(X(20))
WRITE(Simulated(21),'(F8.2)')HIAM;
WRITE(Measured(21),'(A8)')X(21)
WRITE(Measured(21),'(A8)')TRIM(X(21))

ENDIF

Expand Down
Loading

0 comments on commit 185324f

Please sign in to comment.