Skip to content

Generic ecotype read #472

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

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

Generic ecotype read #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
949eecb
Generic read routine for Ecotype file
Jan 9, 2025
17318ec
Add a few calls to ECO_read
Jan 9, 2025
1993fdb
Add ECO_read.for to CMakeLists.txt
Jan 9, 2025
b251ae3
Remove use of DFAULT ecotype if no ecotype found.
Jan 10, 2025
8956aed
Implement ECO_read in CANOPY, DEMAND, IPPHENOL, LTGROW, and VEGGR.
Jan 10, 2025
56c75d6
Add crop-specific error checking.
Jan 21, 2025
77b79e3
Temporary write stmts for debugging
Jan 21, 2025
b642498
check ecotype parameter exclusions by MODEL not CROP
Jan 21, 2025
bb0026c
Last ECO reads for CROPGRO
Jan 21, 2025
ae258a9
Make all CROPGRO ecotype headers consistent.
Jan 21, 2025
1922329
Remove temporary write statements
Jan 26, 2025
2004e30
Clean-up and comments
Jan 27, 2025
e2f00d9
Minor
Jan 28, 2025
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ set(
"Management/Tillage.for"
"Management/TillEvent.for"
"Plant/plant.for"
"Plant/ECO_read.for"
"Plant/ALOHA-Pineapple/Aloha_GROSUB.for"
"Plant/ALOHA-Pineapple/Aloha_mod.f90"
"Plant/ALOHA-Pineapple/Aloha_NFACTO.for"
Expand Down
3 changes: 2 additions & 1 deletion Data/Genotype/AMGRO048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
! SLOBI Slope of relationship reducing progress toward flowering if
! TMIN for the day is less than OPTBI
!
@ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
!ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
@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
!Calibration N N N P P N N N G G P G G G G P P P

Expand Down
3 changes: 2 additions & 1 deletion Data/Genotype/BRGRO048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
! SLOBI Slope of relationship reducing progress toward flowering if
! TMIN for the day is less than OPTBI
!
@ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
!ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
@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
BR0001 DEFAULT BRACHI 00 01 1.00 3.0 6.0 9999. 9999. 0.0 0.75 10.0 9999. 9999. 0.10 1.0 1.0 .000 0.0 .000
DFAULT DEFAULT ECOTYPE 00 01 1.00 0.0 0.0 9999. 9999. 0.0 0.75 10.0 9999. 9999. 0.10 1.0 1.0 .000 0.0 .000
5 changes: 3 additions & 2 deletions Data/Genotype/CBGRO048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
! SLOBI Slope of relationship reducing progress toward flowering if
! TMIN for the day is less than OPTBI
!
@ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
!ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
@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
!Calibration N N N N N N N N G G P G G G G N N N

Expand All @@ -55,4 +56,4 @@
CB0401 CABBAGE TYPE 1 04 01 0.0 3.6 6.0 0.0 05.0 0.0 0.35 25.0 12.0 35.00 0.38 1.0 1.0 .000 20.0 .035
CB0402 CABBAGE TYPE 2 04 01 0.0 3.6 6.0 0.0 05.0 0.0 0.35 25.0 12.0 39.00 0.38 1.0 1.0 .000 20.0 .035
CB0403 Kalorama 04 01 0.0 3.6 6.0 0.0 05.0 0.0 0.35 25.0 12.0 23.00 0.45 1.8 1.2 .000 20.0 .035
DFAULT DEFAULT TYPE 04 01 0.0 3.6 6.0 0.0 05.0 0.0 0.35 25.0 12.0 39.00 0.38 1.0 1.0 .000 20.0 .035
DFAULT DEFAULT TYPE 04 01 0.0 3.6 6.0 0.0 05.0 0.0 0.35 25.0 12.0 39.00 0.38 1.0 1.0 .000 20.0 .035
3 changes: 2 additions & 1 deletion Data/Genotype/CPGRO048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
! TMIN for the day is less than OPTBI
! PM09 is 1.35 for CP0410. Not good. Parameter cannot exceed 1.00
!
@ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
!ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
@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
!Calibration N N N P P N N N G G P G G G G N N N

Expand Down
3 changes: 2 additions & 1 deletion Data/Genotype/FBGRO048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
! 4/11/23 reduced PL-EM from 6.0 to 4.0 to recover time to emergence, V1, and anthesis.
! Exe has soil temp fix. Soil temp 2-3C cooler now

@ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
!ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
@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
!Calibration N N N P P N N N G G P G G G G N N N

Expand Down
3 changes: 2 additions & 1 deletion Data/Genotype/LTGRO048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
! TMIN for the day is less than OPTBI
!

@ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
!ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
@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
!Calibration N N N P P N N N G G P G G G G N N N

Expand Down
3 changes: 2 additions & 1 deletion Data/Genotype/PRGRO048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
! TMIN for the day is less than OPTBI
! XMAGE Photothermal time required for Multi-harvest
!
@ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI XMAGE
!ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI XMAGE
@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 XMAGE
! 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
!Calibration N N N N N N N G G G N G G G G N N N G

Expand Down
6 changes: 4 additions & 2 deletions Data/Genotype/SBGRO048.CUL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,10 @@ CCCA01 SAMIRA 1 . SB0401 13.09 0.294 19.4 7.0 15.0 34.50 26.00 1
IB0045 DON MARIO (4) . SB0501 12.95 0.294 15.0 9.7 19.4 35.10 26.00 1.200 390. 200.0 1.00 0.19 21.0 2.10 16.0 78.0 .400 .200
IB0056 ASGROW (4) . SB0401 13.20 0.294 12.5 8.5 15.0 28.00 26.00 1.250 400. 200.0 1.00 0.19 21.0 2.10 12.0 77.0 .405 .205

RB0002 MG77PA (13) . SB0777 11.80 0.325 25.0 5.0 10.5 27.50 22.00 1.200 365. 230.0 1.00 0.150 18.2 2.00 10. 76.0 .400 .200
RB0003 MG88PA (11) . SB0888 11.50 0.340 24.5 8.2 12.0 25.00 18.00 1.175 388. 216.0 1.00 0.160 25.0 2.06 10. 78.0 .400 .200
!RB0002 MG77PA (13) . SB0777 11.80 0.325 25.0 5.0 10.5 27.50 22.00 1.200 365. 230.0 1.00 0.150 18.2 2.00 10. 76.0 .400 .200
!RB0003 MG88PA (11) . SB0888 11.50 0.340 24.5 8.2 12.0 25.00 18.00 1.175 388. 216.0 1.00 0.160 25.0 2.06 10. 78.0 .400 .200
RB0002 MG77PA (13) . DFAULT 11.80 0.325 25.0 5.0 10.5 27.50 22.00 1.200 365. 230.0 1.00 0.150 18.2 2.00 10. 76.0 .400 .200
RB0003 MG88PA (11) . DFAULT 11.50 0.340 24.5 8.2 12.0 25.00 18.00 1.175 388. 216.0 1.00 0.160 25.0 2.06 10. 78.0 .400 .200

! Brazil
990248 BRS 399 . SB0601 12.58 0.311 20.4 8.2 13.7 28.70 18.00 1.030 335. 180.0 1.00 0.19 23.0 2.40 10.0 78.0 .400 .200
2 changes: 1 addition & 1 deletion Data/Genotype/SRGRO048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
!
@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 XMAGE XFPHT XFINT
!
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
! 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
!Calibration N N N N N N N N N G N G G G G N N N G G G

999991 MINIMA . . 0.0 6.0 22.0 0.0 05.0 0.0 0.99 8.0 0.0 70.0 0.36 0.9 0.9 .000 00.0 .000 9.0 58.0 0.18
Expand Down
3 changes: 2 additions & 1 deletion Data/Genotype/VBGRO048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
! SLOBI Slope of relationship reducing progress toward flowering if
! TMIN for the day is less than OPTBI
!
@ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
!ECO# ECONAME.......... MG TM PP-SS PL-EM EM-V1 V1-JU JU-R0 PM06 PM09 LNHSH R7-R8 FL-VS TRIFL RWDTH RHGHT R1PPO OPTBI SLOBI
@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
!Calibration N N N P P N N N G G P G G G G N N N

Expand Down
62 changes: 33 additions & 29 deletions Plant/CROPGRO/CANOPY.for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,26 @@ C Calls : ERROR, FIND, IGNORE
C========================================================================

SUBROUTINE CANOPY(DYNAMIC,
& ECONO, FILECC, FILEGC, KCAN, PAR, ROWSPC, !Input
! & ECONO, FILECC, FILEGC, KCAN, PAR, ROWSPC, !Input
& FILECC, KCAN, PAR, ROWSPC, !Input
& RVSTGE, TGRO, TURFAC, VSTAGE, XLAI, NSTRES, !Input
& CANHT, CANWH) !Output

C-----------------------------------------------------------------------
USE ModuleDefs
IMPLICIT NONE
EXTERNAL GETLUN, FIND, ERROR, IGNORE, TABEX
EXTERNAL GETLUN, FIND, ERROR, IGNORE, TABEX, ECO_read
SAVE

CHARACTER*6 ERRKEY
PARAMETER (ERRKEY = 'CANOPY')

CHARACTER*6 SECTION
CHARACTER*6 ECOTYP, ECONO
CHARACTER*92 FILECC, FILEGC
! CHARACTER*6 ECOTYP, ECONO
CHARACTER*92 FILECC !, FILEGC
CHARACTER*255 C255

INTEGER I, II, LUNCRP, LUNECO, ERR, LINC, LNUM, ISECT
INTEGER I, II, LUNCRP, ERR, LINC, LNUM, ISECT !, LUNECO
INTEGER DYNAMIC
INTEGER FOUND

Expand Down Expand Up @@ -134,31 +135,34 @@ C-----------------------------------------------------------------------
C-----------------------------------------------------------------------
C Read Ecotype Parameter File
C-----------------------------------------------------------------------
CALL GETLUN('FILEE', LUNECO)
OPEN (LUNECO,FILE = FILEGC,STATUS = 'OLD',IOSTAT=ERR)
IF (ERR .NE. 0) CALL ERROR(ERRKEY,ERR,FILEGC,0)
ECOTYP = ' '
LNUM = 0
DO WHILE (ECOTYP .NE. ECONO)
CALL IGNORE(LUNECO, LNUM, ISECT, C255)
IF ((ISECT .EQ. 1) .AND. (C255(1:1) .NE. ' ') .AND.
& (C255(1:1) .NE. '*')) THEN
READ (C255,'(A6,90X,2(1X,F5.0))',IOSTAT=ERR)
& ECOTYP, RWIDTH, RHGHT
IF (ERR .NE. 0) CALL ERROR(ERRKEY,ERR,FILEGC,LNUM)
IF (ECOTYP .EQ. ECONO) THEN
EXIT
ENDIF

ELSE IF (ISECT .EQ. 0) THEN
IF (ECONO .EQ. 'DFAULT') CALL ERROR(ERRKEY,35,FILEGC,LNUM)
ECONO = 'DFAULT'
REWIND(LUNECO)
LNUM = 0
ENDIF
ENDDO
! CALL GETLUN('FILEE', LUNECO)
! OPEN (LUNECO,FILE = FILEGC,STATUS = 'OLD',IOSTAT=ERR)
! IF (ERR .NE. 0) CALL ERROR(ERRKEY,ERR,FILEGC,0)
! ECOTYP = ' '
! LNUM = 0
! DO WHILE (ECOTYP .NE. ECONO)
! CALL IGNORE(LUNECO, LNUM, ISECT, C255)
! IF ((ISECT .EQ. 1) .AND. (C255(1:1) .NE. ' ') .AND.
! & (C255(1:1) .NE. '*')) THEN
! READ (C255,'(A6,90X,2(1X,F5.0))',IOSTAT=ERR)
! & ECOTYP, RWIDTH, RHGHT
! IF (ERR .NE. 0) CALL ERROR(ERRKEY,ERR,FILEGC,LNUM)
! IF (ECOTYP .EQ. ECONO) THEN
! EXIT
! ENDIF
!
! ELSE IF (ISECT .EQ. 0) THEN
! IF (ECONO .EQ. 'DFAULT') CALL ERROR(ERRKEY,35,FILEGC,LNUM)
! ECONO = 'DFAULT'
! REWIND(LUNECO)
! LNUM = 0
! ENDIF
! ENDDO
!
! CLOSE (LUNECO)

CLOSE (LUNECO)
CALL ECO_read('RWDTH', RWIDTH)
CALL ECO_read('RHGHT', RHGHT)

CANHT = 0.0
CANWH = 0.0
Expand Down
12 changes: 8 additions & 4 deletions Plant/CROPGRO/CROPGRO.for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,8 @@ C-----------------------------------------------------------------------
!-----------------------------------------------------------------------
CALL VEGGR (RUNINIT,
& AGRLF, AGRRT, AGRSTM, CMINEP, CSAVEV, DTX, !Input
& DXR57, ECONO, FILECC, FILEGC, FNINL, FNINR, !Input
! & DXR57, ECONO, FILECC, FILEGC, FNINL, FNINR, !Input
& DXR57, FILECC, FNINL, FNINR, !Input
& FNINS, KCAN, NAVL, NDMNEW, NDMOLD, !Input
& NFIXN, NMINEA, NR1, PAR, PCH2O, PG, PGAVL, !Input
& PStres2, ROWSPC, RVSTGE, STMWT, TGRO, !Input
Expand Down Expand Up @@ -614,7 +615,8 @@ C Initialize pest coupling point and damage variables
!-----------------------------------------------------------------------
CALL VEGGR (SEASINIT,
& AGRLF, AGRRT, AGRSTM, CMINEP, CSAVEV, DTX, !Input
& DXR57, ECONO, FILECC, FILEGC, FNINL, FNINR, !Input
! & DXR57, ECONO, FILECC, FILEGC, FNINL, FNINR, !Input
& DXR57, FILECC, FNINL, FNINR, !Input
& FNINS, KCAN, NAVL, NDMNEW, NDMOLD, !Input
& NFIXN, NMINEA, NR1, PAR, PCH2O, PG, PGAVL, !Input
& PStres2, ROWSPC, RVSTGE, STMWT, TGRO, !Input
Expand Down Expand Up @@ -838,7 +840,8 @@ C-----------------------------------------------------------------------
!-----------------------------------------------------------------------
CALL VEGGR(EMERG,
& AGRLF, AGRRT, AGRSTM, CMINEP, CSAVEV, DTX, !Input
& DXR57, ECONO, FILECC, FILEGC, FNINL, FNINR, !Input
! & DXR57, ECONO, FILECC, FILEGC, FNINL, FNINR, !Input
& DXR57, FILECC, FNINL, FNINR, !Input
& FNINS, KCAN, NAVL, NDMNEW, NDMOLD, !Input
& NFIXN, NMINEA, NR1, PAR, PCH2O, PG, PGAVL, !Input
& PStres2, ROWSPC, RVSTGE, STMWT, TGRO, !Input
Expand Down Expand Up @@ -1149,7 +1152,8 @@ C Call routine to compute actual vegetative growth, C to mine or add
C-----------------------------------------------------------------------
CALL VEGGR(INTEGR,
& AGRLF, AGRRT, AGRSTM, CMINEP, CSAVEV, DTX, !Input
& DXR57, ECONO, FILECC, FILEGC, FNINL, FNINR, !Input
! & DXR57, ECONO, FILECC, FILEGC, FNINL, FNINR, !Input
& DXR57, FILECC, FNINL, FNINR, !Input
& FNINS, KCAN, NAVL, NDMNEW, NDMOLD, !Input
& NFIXN, NMINEA, NR1, PAR, PCH2O, PG, PGAVL, !Input
& PStres2, ROWSPC, RVSTGE, STMWT, TGRO, !Input
Expand Down
Loading