Skip to content

Commit

Permalink
code update from robert
Browse files Browse the repository at this point in the history 
This includes update for organic N&P uptake
and some update in snow and crops.
  • Loading branch information
@jinyun1tang
jinyun1tang committed Apr 18, 2019
1 parent 75c9458 commit 4040c7f
Show file tree
Hide file tree
Showing 32 changed files with 31,920 additions and 31,905 deletions.
2 changes: 1 addition & 1 deletion f77src/blk10.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
4,HYSM(60,JZ,JY,JX),FILM(60,0:JZ,JY,JX),QRV(60,2,JV,JH)
5,VOLGM(60,JY,JX),DFGS(60,0:JZ,JY,JX),ROXSK(60,0:JZ,JY,JX)
6,FLWRM(60,JY,JX),FLPM(60,JZ,JY,JX),FINHM(60,JZ,JY,JX)
7,THETPM(60,0:JZ,JY,JX)
7,THETPM(60,0:JZ,JY,JX),TORT(60,0:JZ,JY,JX),TORTH(60,JZ,JY,JX)
4 changes: 2 additions & 2 deletions f77src/blk11b.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
6,SCO2L(0:JZ,JY,JX),SOXYL(0:JZ,JY,JX),SCH4L(0:JZ,JY,JX)
7,SN2OL(0:JZ,JY,JX),SN2GL(0:JZ,JY,JX),SNH3L(0:JZ,JY,JX)
8,SH2GL(0:JZ,JY,JX),PSISE(0:JZ,JY,JX),PSISA(JZ,JY,JX)
9,PSISO(JZ,JY,JX),PSISH(JZ,JY,JX),THETX,TORTH(JZ,JY,JX)
9,PSISO(JZ,JY,JX),PSISH(JZ,JY,JX),THETX
1,THETY(0:JZ,JY,JX),FCR(JY,JX),VOLQ(0:JZ,JY,JX)
2,TFNQ(0:JZ,JY,JX),HGSGL(JZ,JY,JX),HLSGL(0:JZ,JY,JX)
3,TORT(0:JZ,JY,JX),THAWR(JY,JX),HTHAWR(JY,JX)
3,THAWR(JY,JX),HTHAWR(JY,JX)
29 changes: 15 additions & 14 deletions f77src/blk12b.h
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
COMMON/BLK12B/RUPNH4(2,JZ,JP,JY,JX),RUPNHB(2,JZ,JP,JY,JX)
2,RUPNO3(2,JZ,JP,JY,JX),RUPNOB(2,JZ,JP,JY,JX),RUPH2P(2,JZ,JP,JY,JX)
3,RUPH2B(2,JZ,JP,JY,JX),RUONH4(2,JZ,JP,JY,JX),RUONHB(2,JZ,JP,JY,JX)
4,RUONO3(2,JZ,JP,JY,JX),RUONOB(2,JZ,JP,JY,JX),RUOH2P(2,JZ,JP,JY,JX)
5,RUOH2B(2,JZ,JP,JY,JX),RUCNH4(2,JZ,JP,JY,JX),RUCNHB(2,JZ,JP,JY,JX)
6,RUCNO3(2,JZ,JP,JY,JX),RUCNOB(2,JZ,JP,JY,JX),RUCH2P(2,JZ,JP,JY,JX)
7,RUCH2B(2,JZ,JP,JY,JX),RUPNF(JZ,JP,JY,JX),RUPHGS(2,JZ,JP,JY,JX)
1,VOLWP(JP,JY,JX),RCO2N(2,JZ,JP,JY,JX),RDFOMC(2,JZ,JP,JY,JX)
2,RDFOMN(2,JZ,JP,JY,JX),RDFOMP(2,JZ,JP,JY,JX),WFR(2,JZ,JP,JY,JX)
4,RUNNHP(2,JZ,JP,JY,JX),RUNNOP(2,JZ,JP,JY,JX),RUPPOP(2,JZ,JP,JY,JX)
5,RUNNBP(2,JZ,JP,JY,JX),RUNNXP(2,JZ,JP,JY,JX),RUPPBP(2,JZ,JP,JY,JX)
6,RNH3Z(JP,JY,JX),RNH3B(JC,JP,JY,JX)
7,RHGFLA(2,JZ,JP,JY,JX),RHGDFA(2,JZ,JP,JY,JX),H2GA(2,JZ,JP,JY,JX)
8,H2GP(2,JZ,JP,JY,JX),RH2GZ(JP,JY,JX)
COMMON/BLK12B/RUPNH4(2,JZ,JP,JY,JX),RUPNHB(2,JZ,JP,JY,JX)
2,RUPNO3(2,JZ,JP,JY,JX),RUPNOB(2,JZ,JP,JY,JX),RUPH2P(2,JZ,JP,JY,JX)
3,RUPH2B(2,JZ,JP,JY,JX),RUONH4(2,JZ,JP,JY,JX),RUONHB(2,JZ,JP,JY,JX)
4,RUONO3(2,JZ,JP,JY,JX),RUONOB(2,JZ,JP,JY,JX),RUOH2P(2,JZ,JP,JY,JX)
5,RUOH2B(2,JZ,JP,JY,JX),RUCNH4(2,JZ,JP,JY,JX),RUCNHB(2,JZ,JP,JY,JX)
6,RUCNO3(2,JZ,JP,JY,JX),RUCNOB(2,JZ,JP,JY,JX),RUCH2P(2,JZ,JP,JY,JX)
7,RUCH2B(2,JZ,JP,JY,JX),RUPNF(JZ,JP,JY,JX),RUPHGS(2,JZ,JP,JY,JX)
1,VOLWP(JP,JY,JX),RCO2N(2,JZ,JP,JY,JX),RDFOMC(2,0:4,JZ,JP,JY,JX)
2,RDFOMN(2,0:4,JZ,JP,JY,JX),RDFOMP(2,0:4,JZ,JP,JY,JX)
4,RUNNHP(2,JZ,JP,JY,JX),RUNNOP(2,JZ,JP,JY,JX),RUPPOP(2,JZ,JP,JY,JX)
5,RUNNBP(2,JZ,JP,JY,JX),RUNNXP(2,JZ,JP,JY,JX),RUPPBP(2,JZ,JP,JY,JX)
6,RNH3Z(JP,JY,JX),RNH3B(JC,JP,JY,JX),WFR(2,JZ,JP,JY,JX)
7,RHGFLA(2,JZ,JP,JY,JX),RHGDFA(2,JZ,JP,JY,JX),H2GA(2,JZ,JP,JY,JX)
8,H2GP(2,JZ,JP,JY,JX),RH2GZ(JP,JY,JX)

1 change: 1 addition & 0 deletions f77src/blk13d.h
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
COMMON/BLK13D/COQC(0:4,0:JZ,JY,JX),COQA(0:4,0:JZ,JY,JX)
2,FOSRH(0:4,0:JZ,JY,JX)
33 changes: 17 additions & 16 deletions f77src/blk18a.h
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
COMMON/BLK18/ARLFC(JY,JX),ARSTC(JY,JX),TEVAPP(JY,JX),TEVAPC(JY,JX)
2,TENGYC(JY,JX),THFLXC(JY,JX),TUPWTR(0:JZ,JY,JX),TUPHT(0:JZ,JY,JX)
3,TVOLWP(JY,JX),TCOFLA(JZ,JY,JX),TOXFLA(JZ,JY,JX),TCHFLA(JZ,JY,JX)
4,TN2FLA(JZ,JY,JX),TNHFLA(JZ,JY,JX),TLCO2P(JZ,JY,JX),GPP(JY,JX)
5,TLOXYP(JZ,JY,JX),TLCH4P(JZ,JY,JX),TLN2OP(JZ,JY,JX),RECO(JY,JX)
6,TLNH3P(JZ,JY,JX),TCO2S(JZ,JY,JX),TUPOXS(JZ,JY,JX)
7,TUPCHS(JZ,JY,JX),TUPN2S(JZ,JY,JX),TUPN3S(JZ,JY,JX)
8,TUPNH4(JZ,JY,JX),TUPNO3(JZ,JY,JX),TUPH2P(JZ,JY,JX)
9,TUPN3B(JZ,JY,JX),TUPNHB(JZ,JY,JX),TUPNOB(JZ,JY,JX)
1,TUPH2B(JZ,JY,JX),TUPNF(JZ,JY,JX),CSNT(4,0:1,0:JZ,JY,JX)
2,ZSNT(4,0:1,0:JZ,JY,JX),PSNT(4,0:1,0:JZ,JY,JX),TDFOMC(0:JZ,JY,JX)
3,TDFOMN(0:JZ,JY,JX),TDFOMP(0:JZ,JY,JX),TCO2Z(JY,JX),TOXYZ(JY,JX)
4,TCH4Z(JY,JX),TN2OZ(JY,JX),TNH3Z(JY,JX),RTDNT(JZ,JY,JX)
5,TCO2P(JZ,JY,JX),TUPOXP(JZ,JY,JX),THRMC(JY,JX),TCNET(JY,JX)
6,ZCSNC(JY,JX),ZZSNC(JY,JX),ZPSNC(JY,JX),WGLFT(JC,JY,JX)
7,ARLFT(JC,JY,JX),ARSTT(JC,JY,JX),ARLSS(JY,JX)
COMMON/BLK18/ARLFC(JY,JX),ARSTC(JY,JX),TEVAPP(JY,JX),TEVAPC(JY,JX)
2,TENGYC(JY,JX),THFLXC(JY,JX),TUPWTR(0:JZ,JY,JX),TUPHT(0:JZ,JY,JX)
3,TVOLWP(JY,JX),TCOFLA(JZ,JY,JX),TOXFLA(JZ,JY,JX),TCHFLA(JZ,JY,JX)
4,TN2FLA(JZ,JY,JX),TNHFLA(JZ,JY,JX),TLCO2P(JZ,JY,JX),GPP(JY,JX)
5,TLOXYP(JZ,JY,JX),TLCH4P(JZ,JY,JX),TLN2OP(JZ,JY,JX),RECO(JY,JX)
6,TLNH3P(JZ,JY,JX),TCO2S(JZ,JY,JX),TUPOXS(JZ,JY,JX)
7,TUPCHS(JZ,JY,JX),TUPN2S(JZ,JY,JX),TUPN3S(JZ,JY,JX)
8,TUPNH4(JZ,JY,JX),TUPNO3(JZ,JY,JX),TUPH2P(JZ,JY,JX)
9,TUPN3B(JZ,JY,JX),TUPNHB(JZ,JY,JX),TUPNOB(JZ,JY,JX)
1,TUPH2B(JZ,JY,JX),TUPNF(JZ,JY,JX),CSNT(4,0:1,0:JZ,JY,JX)
2,ZSNT(4,0:1,0:JZ,JY,JX),PSNT(4,0:1,0:JZ,JY,JX)
3,TDFOMC(0:4,JZ,JY,JX),TDFOMN(0:4,JZ,JY,JX),TDFOMP(0:4,JZ,JY,JX)
4,TCO2Z(JY,JX),TOXYZ(JY,JX),TCH4Z(JY,JX),TN2OZ(JY,JX),TNH3Z(JY,JX)
5,TCO2P(JZ,JY,JX),TUPOXP(JZ,JY,JX),THRMC(JY,JX),TCNET(JY,JX)
6,ZCSNC(JY,JX),ZZSNC(JY,JX),ZPSNC(JY,JX),WGLFT(JC,JY,JX)
7,ARLFT(JC,JY,JX),ARSTT(JC,JY,JX),ARLSS(JY,JX),RTDNT(JZ,JY,JX)

6 changes: 3 additions & 3 deletions f77src/blk2a.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
4,VPA(JY,JX),VPK(JY,JX),DYLN(JY,JX),DYLX(JY,JX),ALTZ(JY,JX)
5,PRECU(JY,JX),PRECR(JY,JX),PRECW(JY,JX),PRECI(JY,JX)
6,PRECQ(JY,JX),PRECA(JY,JX),GSIN(JY,JX),GCOS(JY,JX),GAZI(JY,JX)
7,OMEGAG(4,JY,JX),SL(JY,JX),ASP(JY,JX),ZS(JY,JX),ZD(JY,JX)
7,OMEGAG(4,JY,JX),SL(2,JY,JX),ASP(JY,JX),ZS(JY,JX),ZD(JY,JX)
8,ZR(JY,JX),ZM(JY,JX),Z0(JY,JX),ALT(JY,JX)
9,RAB(JY,JX),RIB(JY,JX),THS(JY,JX),DTBLI(JY,JX),TRAD(JY,JX)
1,TAMX(JY,JX),TAMN(JY,JX),HUDX(JY,JX),HUDN(JY,JX),TWIND(JY,JX)
2,TRAI(JY,JX),THSX(JY,JX),OFFSET(JY,JX),DHI(20),DVI(20),DH(JY,JX)
2,TRAI(JY,JX),THSX(JY,JX),OFFSET(JY,JX),DH(JY,JX)
3,DV(JY,JX),PRECD(JY,JX),PRECB(JY,JX),DDRGI(JY,JX)
4,FERT(20,366,JY,JX),FDPTH(366,JY,JX),RRIG(24,366,JY,JX)
5,WDPTH(366,JY,JX),DCORP(366,JY,JX),CO2EI(JY,JX),CCO2EI(JY,JX)
Expand All @@ -23,7 +23,7 @@
5,RCHQS(JY,JX),RCHQW(JY,JX),RCHGD(JY,JX),DTBLG(JY,JX)
6,DPTHA(JY,JX),ROWN(JY,JX),ROWO(JY,JX),ROWP(JY,JX),ROWI(366,JY,JX)
7,FIRRA(JY,JX),CIRRA(JY,JX),DIRRA(2,JY,JX),XWTHR(24,366)
8,XTILL(JY,JX),DTBLZ(JY,JX),TLEX(JY,JX),TSHX(JY,JX),TLEC(JY,JX)
8,DTBLZ(JY,JX),TLEX(JY,JX),TSHX(JY,JX),TLEC(JY,JX)
9,TSHC(JY,JX),DPTHSK(JY,JX),TKSD(JY,JX),TCNDG
1,DDRG(JY,JX),ATCAI(JY,JX),RAD(JY,JX),RAP(JY,JX)
2,IPRC(JY,JX),ITILL(366,JY,JX),IIRRA(4,JY,JX),IRCHG(2,2,JY,JX)
Expand Down
85 changes: 20 additions & 65 deletions f77src/day.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,96 +248,51 @@ SUBROUTINE day(I,NHW,NHE,NVN,NVS)
C
DO 9995 NX=NHW,NHE
DO 9990 NY=NVN,NVS
IF(XTILL(NY,NX).GT.0.0.AND.ITILL(I,NY,NX).EQ.0)THEN
ITILL(I,NY,NX)=19
DCORP(I,NY,NX)=0.05
ENDIF
IF(ITILL(I,NY,NX).EQ.0.OR.ITILL(I,NY,NX).GT.20)THEN
CORP=0.0
ELSE
IF(ITILL(I,NY,NX).EQ.1)THEN
CORP=0.90
ZS(NY,NX)=0.04
ENDIF
IF(ITILL(I,NY,NX).EQ.2)THEN
CORP=0.50
ZS(NY,NX)=0.02
ENDIF
IF(ITILL(I,NY,NX).EQ.3)THEN
CORP=0.75
ZS(NY,NX)=0.03
ENDIF
IF(ITILL(I,NY,NX).EQ.4)THEN
IF(ITILL(I,NY,NX).EQ.1.OR.ITILL(I,NY,NX).EQ.11)THEN
CORP=0.10
ZS(NY,NX)=0.01
ENDIF
IF(ITILL(I,NY,NX).EQ.5)THEN
CORP=0.60
ZS(NY,NX)=0.02
ENDIF
IF(ITILL(I,NY,NX).EQ.6)THEN
CORP=0.42
ZS(NY,NX)=0.04
ENDIF
IF(ITILL(I,NY,NX).EQ.7)THEN
CORP=0.33
ZS(NY,NX)=0.04
ENDIF
IF(ITILL(I,NY,NX).EQ.8)THEN
CORP=0.75
ZS(NY,NX)=0.02
ENDIF
IF(ITILL(I,NY,NX).EQ.9)THEN
CORP=0.30
ZS(NY,NX)=0.01
ENDIF
IF(ITILL(I,NY,NX).EQ.10)THEN
IF(ITILL(I,NY,NX).EQ.2.OR.ITILL(I,NY,NX).EQ.12)THEN
CORP=0.20
ZS(NY,NX)=0.04
ENDIF
IF(ITILL(I,NY,NX).EQ.11)THEN
IF(ITILL(I,NY,NX).EQ.3.OR.ITILL(I,NY,NX).EQ.13)THEN
CORP=0.30
ZS(NY,NX)=0.04
ENDIF
IF(ITILL(I,NY,NX).EQ.12)THEN
CORP=0.05
ZS(NY,NX)=0.04
ENDIF
IF(ITILL(I,NY,NX).EQ.13)THEN
CORP=0.10
IF(ITILL(I,NY,NX).EQ.4.OR.ITILL(I,NY,NX).EQ.14)THEN
CORP=0.40
ZS(NY,NX)=0.04
ENDIF
IF(ITILL(I,NY,NX).EQ.14)THEN
CORP=0.05
ZS(NY,NX)=0.04
IF(ITILL(I,NY,NX).EQ.5.OR.ITILL(I,NY,NX).EQ.15)THEN
CORP=0.50
ZS(NY,NX)=0.02
ENDIF
IF(ITILL(I,NY,NX).EQ.15)THEN
CORP=0.25
IF(ITILL(I,NY,NX).EQ.6.OR.ITILL(I,NY,NX).EQ.16)THEN
CORP=0.60
ZS(NY,NX)=0.04
ENDIF
IF(ITILL(I,NY,NX).EQ.16)THEN
CORP=0.15
IF(ITILL(I,NY,NX).EQ.7.OR.ITILL(I,NY,NX).EQ.17)THEN
CORP=0.70
ZS(NY,NX)=0.04
ENDIF
IF(ITILL(I,NY,NX).EQ.17)THEN
CORP=0.05
ZS(NY,NX)=0.04
IF(ITILL(I,NY,NX).EQ.8.OR.ITILL(I,NY,NX).EQ.18)THEN
CORP=0.80
ZS(NY,NX)=0.02
ENDIF
IF(ITILL(I,NY,NX).EQ.18)THEN
CORP=0.10
IF(ITILL(I,NY,NX).EQ.9.OR.ITILL(I,NY,NX).EQ.19)THEN
CORP=0.90
ZS(NY,NX)=0.01
ENDIF
IF(ITILL(I,NY,NX).EQ.19)THEN
CORP=XTILL(NY,NX)
ZS(NY,NX)=0.02
XTILL(NY,NX)=0.0
ENDIF
IF(ITILL(I,NY,NX).EQ.20)THEN
IF(ITILL(I,NY,NX).EQ.10.OR.ITILL(I,NY,NX).EQ.20)THEN
CORP=1.00
ZS(NY,NX)=0.01
ZS(NY,NX)=0.02
ENDIF
ENDIF
XCORP(NY,NX)=AMAX1(1.0E-03,1.0-CORP)
XCORP(NY,NX)=AMAX1(1.0E-06,1.0-CORP)
C
C AUTOMATIC IRRIGATION IF SELECTED
C
Expand Down
8 changes: 5 additions & 3 deletions f77src/extract.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,11 @@ SUBROUTINE extract(I,J,NHW,NHE,NVN,NVS)
C
C TOTAL ROOT C,N,P EXUDATION
C
TDFOMC(L,NY,NX)=TDFOMC(L,NY,NX)-RDFOMC(N,L,NZ,NY,NX)
TDFOMN(L,NY,NX)=TDFOMN(L,NY,NX)-RDFOMN(N,L,NZ,NY,NX)
TDFOMP(L,NY,NX)=TDFOMP(L,NY,NX)-RDFOMP(N,L,NZ,NY,NX)
DO 195 K=0,4
TDFOMC(K,L,NY,NX)=TDFOMC(K,L,NY,NX)-RDFOMC(N,K,L,NZ,NY,NX)
TDFOMN(K,L,NY,NX)=TDFOMN(K,L,NY,NX)-RDFOMN(N,K,L,NZ,NY,NX)
TDFOMP(K,L,NY,NX)=TDFOMP(K,L,NY,NX)-RDFOMP(N,K,L,NZ,NY,NX)
195 CONTINUE
C
C TOTAL ROOT O2, NH4, NO3, PO4 UPTAKE CONTRIBUTES TO
C TOTAL ROOT + MICROBIAL UPTAKE USED TO CALCULATE
Expand Down
2 changes: 1 addition & 1 deletion f77src/foutp.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ SUBROUTINE foutp(NT,NE,NAX,NDX,NTX,NEX,NF,NFX,NHW,NHE,NVN,NVS)
9995 CONTINUE
LUN=N+20
C OPEN(LUN,FILE=OUTP(N-20),STATUS='UNKNOWN')
OPEN(LUN,FILE=trim(outdir)//OUTP(N-20),STATUS='UNKNOWN')
OPEN(LUN,FILE=trim(outdir)//OUTP(N-20),STATUS='UNKNOWN')
C
C WRITE HEADINGS TO OUTPUT FILES
C
Expand Down
2 changes: 1 addition & 1 deletion f77src/fouts.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ SUBROUTINE fouts(NT,NE,NAX,NDX,NTX,NEX,NF,NFX,NHW,NHE,NVN,NVS)
CLOSE(15)
LUN=N+10
C OPEN(LUN,FILE=OUTS(N-20),STATUS='UNKNOWN')
OPEN(LUN,FILE=trim(outdir)//OUTS(N-20),STATUS='UNKNOWN')
OPEN(LUN,FILE=trim(outdir)//OUTS(N-20),STATUS='UNKNOWN')
C
C WRITE HEADINGS TO OUTPUT FILES
C
Expand Down
Loading

0 comments on commit 4040c7f

Please sign in to comment.