Skip to content
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

Jump to bottom

Simplified ozone equations for NWheat and removed FOZ2 and SFOZ2 #250

Merged
merged 2 commits into from
Jul 29, 2022
Merged

Simplified ozone equations for NWheat and removed FOZ2 and SFOZ2 #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6b645d
Simplified ozone equations for NWheat and Teff by Jose Guarin
fabiooliveira72 Jul 29, 2022
232eb4b
Merge branch 'develop' of https://github.com/DSSAT/dssat-csm-os into …
fabiooliveira72 Jul 29, 2022
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
10 changes: 5 additions & 5 deletions Data/Genotype/TFAPS048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*TEF ECOTYPE COEFFICIENTS: TFAPS048 MODEL

! 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
@ECO# ECONAME......... TBASE TOPT ROPT TTOP P20 VREQ GDDE DSGFT RUE1 RUE2 KVAL1 KVAL2 SLAP2 TC1P1 TC1P2 DTNP1 PLGP1 PLGP2 P2AF P3AF P4AF P5AF P6AF ADLAI ADTIL ADPHO STEMN MXNUP MXNCR WFNU PNUPR EXNO3 MNNO3 EXNH4 MNNH4 INGWT INGNC FREAR MNNCR GPPSS GPPES MXGWT MNRTN NOMOB RTDP1 RTDP2 FOZ1 FOZ2 SFOZ1 SFOZ2 TSEN CDAY
! 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
@ECO# ECONAME......... TBASE TOPT ROPT TTOP P20 VREQ GDDE DSGFT RUE1 RUE2 KVAL1 KVAL2 SLAP2 TC1P1 TC1P2 DTNP1 PLGP1 PLGP2 P2AF P3AF P4AF P5AF P6AF ADLAI ADTIL ADPHO STEMN MXNUP MXNCR WFNU PNUPR EXNO3 MNNO3 EXNH4 MNNH4 INGWT INGNC FREAR MNNCR GPPSS GPPES MXGWT MNRTN NOMOB RTDP1 RTDP2 FOZ1 SFOZ1 TSEN CDAY
IB0001 GENERIC 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.60 0.70 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1
IB0002 GENERIC 1.0 34.0 34.0 34.0 12.5 70. 6.0 170. 3.8 3.8 0.60 0.70 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1
IB0003 GENERIC 0.0 34.0 34.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.60 0.70 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1
Expand All @@ -14,8 +14,8 @@ IB0004 TEF 1 7.8 30.0 30.0 42.0 12.5 0. 10.2 200. 3.8
DFAULT DEFAULT 0.0 34.0 34.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.60 0.70 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 2.47 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1

!chp added this for test of optional temperature input for cold damage
IB0099 Cold Hardy (test) 0.0 26.0 26.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.60 0.70 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.5 20
IB0098 Cold Sens. (test) 0.0 26.0 26.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.60 0.70 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 10.0 5
IB0099 Cold Hardy (test) 0.0 26.0 26.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.60 0.70 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.5 20
IB0098 Cold Sens. (test) 0.0 26.0 26.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.60 0.70 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 10.0 5

!TBASE - base temperature below which no development occurs, C
!TOPT - temperature at which maximum development rate occurs during vegetative stages, C
Expand Down Expand Up @@ -67,5 +67,5 @@ IB0098 Cold Sens. (test) 0.0 26.0 26.0 34.0 12.5 50. 6.0 170. 3.8
!FOZ2 - (no effect, TFAPS) ozone effect initialization on photosynthesis (dependent on FOZ1): 1.015 = ozone tolerant, 1.025 = intermediate, 1.125 = ozone sensitive
!SFOZ1 - (no effect, TFAPS) ozone effect rate on leaf senescence: 0.08 = ozone tolerant, 0.25 = intermediate, 0.40 = ozone sensitive
!SFOZ2 - (no effect, TFAPS) ozone effect initialization on leaf senescence (dependent on SFOZ1): 0.80 = ozone tolerant, 0.38 = intermediate, 0.00 = ozone sensitive
!TSEN - Critical temperature below which leaf damage occurs (default 6�C)
!TSEN - Critical temperature below which leaf damage occurs (default 6°C)
!CDAY - cold days parameter (default 15.0)
28 changes: 14 additions & 14 deletions Data/Genotype/WHAPS048.ECO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
*WHEAT ECOTYPE COEFFICIENTS: WHAPS048 MODEL

! 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
@ECO# ECONAME......... TBASE TOPT ROPT TTOP P20 VREQ GDDE DSGFT RUE1 RUE2 KVAL1 KVAL2 SLAP2 TC1P1 TC1P2 DTNP1 PLGP1 PLGP2 P2AF P3AF P4AF P5AF P6AF ADLAI ADTIL ADPHO STEMN MXNUP MXNCR WFNU PNUPR EXNO3 MNNO3 EXNH4 MNNH4 INGWT INGNC FREAR MNNCR GPPSS GPPES MXGWT MNRTN NOMOB RTDP1 RTDP2 FOZ1 FOZ2 SFOZ1 SFOZ2 TSEN CDAY
IB0001 GENERIC 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80
! 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
@ECO# ECONAME......... TBASE TOPT ROPT TTOP P20 VREQ GDDE DSGFT RUE1 RUE2 KVAL1 KVAL2 SLAP2 TC1P1 TC1P2 DTNP1 PLGP1 PLGP2 P2AF P3AF P4AF P5AF P6AF ADLAI ADTIL ADPHO STEMN MXNUP MXNCR WFNU PNUPR EXNO3 MNNO3 EXNH4 MNNH4 INGWT INGNC FREAR MNNCR GPPSS GPPES MXGWT MNRTN NOMOB RTDP1 RTDP2 FOZ1 SFOZ1 TSEN CDAY
IB0001 GENERIC 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08
!GENERIC with different SLAP2
IB0002 GENERIC2 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80
IB0002 GENERIC2 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08
!GENERIC with different SLAP2 and TC1P2
IB0003 GENERIC3 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 1.00 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80
IB0004 GENERIC4 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 225.0 2.50 1.00 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80
IB0003 GENERIC3 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 1.00 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08
IB0004 GENERIC4 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 225.0 2.50 1.00 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08
!GENERIC with different SLAP2 and P5AF
IB0005 GENERIC5 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 3.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80
IB0005 GENERIC5 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 3.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08
!GENERIC with different SLAP2, P2AF, and P5AF
IB0006 GENERIC6 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.10 50.0 3.00 3.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80
IB0006 GENERIC6 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.10 50.0 3.00 3.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08
!GENERIC with different SLAP2 and ADLAI
IB0007 GENERIC7 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 0.70 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80
IB0007 GENERIC7 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 0.70 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08
!GENERIC with different SLAP2, P2AF, P5AF, and ADLAI
IB0008 GENERIC8 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.10 50.0 3.00 3.00 3.00 0.50 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80
DFAULT DEFAULT 0.0 34.0 34.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80
IB0008 GENERIC8 0.0 26.0 26.0 34.0 12.5 50. 10.2 200. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.10 50.0 3.00 3.00 3.00 0.50 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08
DFAULT DEFAULT 0.0 34.0 34.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.63 0.63 270.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08

!chp added this for test of optional temperature input for cold damage
IB0099 Cold Hardy (test) 0.0 26.0 26.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.63 0.63 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80 0.5 20
IB0098 Cold Sens. (test) 0.0 26.0 26.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.63 0.63 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 1.015 0.08 0.80 10.0 5
IB0099 Cold Hardy (test) 0.0 26.0 26.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.63 0.63 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08 0.5 20
IB0098 Cold Sens. (test) 0.0 26.0 26.0 34.0 12.5 50. 6.0 170. 3.8 3.8 0.63 0.63 300.0 2.50 0.60 0.005 1400. 0.60 0.60 50.0 3.00 1.00 3.00 1.00 1.00 1.00 0.00 0.60 0.040 2.00 0.450 6.75 0.00 6.50 0.00 3.50 0.030 0.250 1.230 2.00 5.00 55.0 4.50 0.250 1 1 0.06 0.08 10.0 5

!TBASE - base temperature below which no development occurs, C
!TOPT - temperature at which maximum development rate occurs during vegetative stages, C
Expand Down Expand Up @@ -72,5 +72,5 @@ IB0098 Cold Sens. (test) 0.0 26.0 26.0 34.0 12.5 50. 6.0 170. 3.8
!FOZ2 - ozone effect initialization on photosynthesis (dependent on FOZ1): 1.015 = ozone tolerant, 1.025 = intermediate, 1.125 = ozone sensitive
!SFOZ1 - ozone effect rate on leaf senescence: 0.08 = ozone tolerant, 0.25 = intermediate, 0.40 = ozone sensitive
!SFOZ2 - ozone effect initialization on leaf senescence (dependent on SFOZ1): 0.80 = ozone tolerant, 0.38 = intermediate, 0.00 = ozone sensitive
!TSEN - Critical temperature below which leaf damage occurs (default 6�C)
!TSEN - Critical temperature below which leaf damage occurs (default 6°C)
!CDAY - cold days parameter (default 15.0)
6 changes: 2 additions & 4 deletions Plant/NTEF/TF_GROSUB.for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ C The statements begining with !*! are refer to APSIM source codes
REAL EXNH4
REAL EXNO3
REAL FOZ1 ! Added by JG for ozone calculation
REAL FOZ2 ! Added by JG for ozone calculation
REAL FREAR
REAL GPPES
REAL GPPSS
Expand Down Expand Up @@ -141,7 +140,6 @@ C The statements begining with !*! are refer to APSIM source codes
REAL RTDP1
REAL RTDP2
REAL SFOZ1 ! Added by JG for ozone calculation
REAL SFOZ2 ! Added by JG for ozone calculation
REAL SLA
REAL SLAP1
REAL SLAP2 ! nwheat cultivar parameter
Expand Down Expand Up @@ -783,12 +781,12 @@ C60 FORMAT(25X,F5.2,13X,F5.2,7X,F5.2)
& P5AF,P6AF,ADLAI,ADTIL,ADPHO,STEMN,MXNUP,MXNCR,WFNU,
& PNUPR,EXNO3,MNNO3,EXNH4,MNNH4,INGWT,INGNC,FREAR,
& MNNCR,GPPSS,GPPES,MXGWT,MNRTN,NOMOB,RTDP1,RTDP2,
& FOZ1,FOZ2,SFOZ1,SFOZ2
& FOZ1,SFOZ1
3100 FORMAT (A6,1X,A16,1X,10(1X,F5.1),2(1X,F5.2),3(1X,F5.1),
& 1(1X,F5.3),1(1x,F5.0),11(1X,F5.2),1(1X,F5.3),
& 1(1X,F5.2),1(1X,F5.3),5(1X,F5.2),3(1X,F5.3),
& 2(1X,F5.2),1(1X,F5.1),1(1X,F5.2),1(1X,F5.3),
& 2(1X,F5.0),1(1X,F5.2),1(1X,F5.3),2(1X,F5.2))
& 2(1X,F5.0),2(1X,F5.2))
IF (ERRNUM .NE. 0) CALL ERROR(ERRKEY,ERRNUM,FILEE,LNUM)

ELSEIF (ISECT .EQ. 0) THEN
Expand Down
16 changes: 7 additions & 9 deletions Plant/NTEF/TF_PHENOL.for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ C-----------------------------------------------------------------------
REAL FDSW2
REAL FDSW3
REAL FOZ1 ! Added by JG for ozone calculation
REAL FOZ2 ! Added by JG for ozone calculation
REAL FREAR
REAL GPPES
REAL GPPSS
Expand Down Expand Up @@ -106,7 +105,6 @@ C-----------------------------------------------------------------------
REAL RTDP1
REAL RTDP2
REAL SFOZ1 ! Added by JG for ozone calculation
REAL SFOZ2 ! Added by JG for ozone calculation
REAL SLA
REAL SLAP1
REAL SLAP2
Expand Down Expand Up @@ -536,32 +534,32 @@ C-----------------------------------------------------------------------
& P5AF,P6AF,ADLAI,ADTIL,ADPHO,STEMN,MXNUP,MXNCR,WFNU,
& PNUPR,EXNO3,MNNO3,EXNH4,MNNH4,INGWT,INGNC,FREAR,
& MNNCR,GPPSS,GPPES,MXGWT,MNRTN,NOMOB,RTDP1,RTDP2,
& FOZ1,FOZ2,SFOZ1,SFOZ2
& FOZ1,SFOZ1
3100 FORMAT (A6,1X,A16,1X,10(1X,F5.1),2(1X,F5.2),3(1X,F5.1),
& 1(1X,F5.3),1(1x,F5.0),11(1X,F5.2),1(1X,F5.3),
& 1(1X,F5.2),1(1X,F5.3),5(1X,F5.2),3(1X,F5.3),
& 2(1X,F5.2),1(1X,F5.1),1(1X,F5.2),1(1X,F5.3),
& 2(1X,F5.0),1(1X,F5.2),1(1X,F5.3),2(1X,F5.2))
& 2(1X,F5.0),2(1X,F5.2))
IF (ERRNUM .NE. 0) CALL ERROR(ERRKEY,ERRNUM,FILEE,LNUM)

IF (ECOTYP .EQ. ECONO) THEN
! Read optional cold sensitivity paramter.
! Default to TSEN = 6.0 if no value given.
! JG changed column numbers to match updated ecotype file
IF (C255(327:331) == ' ') THEN
IF (C255(315:319) == ' ') THEN
TSEN = 6.0
ELSE
READ(C255(327:331),'(F5.0)',IOSTAT=ERRNUM) TSEN
READ(C255(315:319),'(F5.0)',IOSTAT=ERRNUM) TSEN
IF (ERRNUM .NE. 0 .OR. TSEN < 1.E-6) TSEN = 6.0
ENDIF

! Read optional number of cold days paramter.
! Default to CDAY = 15.0 if no value given.
! JG changed column numbers to match updated ecotype file
IF (C255(333:337) == ' ') THEN
IF (C255(321:325) == ' ') THEN
CDAY = 15
ELSE
READ(C255(333:337),'(I5)',IOSTAT=ERRNUM) CDAY
READ(C255(321:325),'(I5)',IOSTAT=ERRNUM) CDAY
IF (ERRNUM .NE. 0 .OR. CDAY < 0) CDAY = 15
ENDIF

Expand Down Expand Up @@ -1011,7 +1009,7 @@ cbak ears that is not included in lai calculation.
!*! alternatively, could use TWILEN (DSSAT)
!*! ppfac = 1. - p1d * (20. - hrlt)**2
! nwheats_ppfac = 1. - PPSEN * (20. - DAYL)**2
!n Apsim: The parameter �twilight?is set to the angle (degrees) the geometric centre of the sun is relative to the horizon, -6 degrees for APSIM crops being Civil twilight.
!n Apsim: The parameter twilight is set to the angle (degrees) the geometric centre of the sun is relative to the horizon, -6 degrees for APSIM crops being Civil twilight.
! nwheats_ppfac = 1. - PPSEN * (20. - TWILEN)**2
! Swap 20 and TWILEN to go from long to short day response
!Added if statements to account for TWILEN being less than the critical day length of 11 h
Expand Down
Loading