Merge pull request #6 from jinyun1tang/jrgrant

incoporate pond
jinyun1tang · Feb 12, 2020 · 4fef583 · 4fef583
2 parents d93938f + b945eb7
commit 4fef583
Show file tree

Hide file tree

Showing 89 changed files with 4,968 additions and 3,210 deletions.
diff --git a/f77src/BLOCKDATA001.f b/f77src/BLOCKDATA001.f
diff --git a/f77src/blk10.h b/f77src/blk10.h
diff --git a/f77src/blk11a.h b/f77src/blk11a.h
@@ -1,20 +1,20 @@
-      COMMON/BLK11A/TCS(0:JZ,JY,JX)
+      COMMON/BLK11A/BARE(JY,JX),CVRD(JY,JX),TCS(0:JZ,JY,JX)
      2,TKS(0:JZ,JY,JX),TCW(JY,JX),TKW(JY,JX),RAC(JY,JX)
-     3,TSMX(0:JZ,JY,JX),TSMN(0:JZ,JY,JX),VHCP(JZ,JY,JX),VHCPW(JY,JX)
-     4,VHCPR(JY,JX),VOLW(0:JZ,JY,JX),VOLI(0:JZ,JY,JX),VOLP(0:JZ,JY,JX)
+     3,TSMX(0:JZ,JY,JX),TSMN(0:JZ,JY,JX),VHCP(0:JZ,JY,JX),VHCPW(JY,JX)
+     4,VOLW(0:JZ,JY,JX),VOLI(0:JZ,JY,JX),VOLP(0:JZ,JY,JX)
      5,VOLWH(JZ,JY,JX),VOLT(0:JZ,JY,JX),VOLR(JY,JX),VOLWG(JY,JX)
-     6,TVOLWC(JY,JX),VOLSS(JY,JX),VOLWS(JY,JX),VOLIS(JY,JX)
+     6,TVOLG(JY,JX),TVOLWC(JY,JX),VOLSS(JY,JX),VOLWS(JY,JX),VOLIS(JY,JX)
      7,VOLS(JY,JX),THETW(0:JZ,JY,JX),THETI(0:JZ,JY,JX),THETP(0:JZ,JY,JX)
      8,PSISM(0:JZ,JY,JX),PSIST(JZ,JY,JX),RSCS(JZ,JY,JX),VOLA(0:JZ,JY,JX)
      9,VOLAH(JZ,JY,JX),CNDH(JZ,JY,JX),CNDU(JZ,JY,JX),VOLWD(JY,JX)
-     1,VHCM(JZ,JY,JX),VOLWX(0:JZ,JY,JX),STC(JZ,JY,JX)
+     1,VHCM(0:JZ,JY,JX),VOLWX(0:JZ,JY,JX),STC(JZ,JY,JX)
      2,DTC(JZ,JY,JX),HCND(3,100,JZ,JY,JX),FINH(JZ,JY,JX),FLWV(JZ,JY,JX)
      3,THAW(3,JZ,JY,JX),HTHAW(3,JZ,JY,JX),HTHAWW(JY,JX)
      4,THAWH(3,JZ,JY,JX),VOLIH(JZ,JY,JX),FLWSI(JY,JX),HFLWSI(JY,JX)
      5,TFLWW(JY,JX),TFLWS(JY,JX),TFLWI(JY,JX),THFLWW(JY,JX),FLWR(JY,JX)
      6,HFLWR(JY,JX),TFLWC(JY,JX),THRMG(JY,JX),HEATI(JY,JX),HEATE(JY,JX)
      7,HEATS(JY,JX),HEATV(JY,JX),HEATH(JY,JX),TEVAPG(JY,JX)
-     8,HYST(JZ,JY,JX),VHCPWX(JY,JX),VHCPRX(JY,JX),CGSGL(JZ,JY,JX)
-     9,CLSGL(0:JZ,JY,JX),OGSGL(JZ,JY,JX),OLSGL(0:JZ,JY,JX)
-     1,ZGSGL(JZ,JY,JX),CHSGL(JZ,JY,JX),CQSGL(0:JZ,JY,JX),VOLWRX(JY,JX)
-
+     8,HYST(JZ,JY,JX),VHCPWX(JY,JX),VHCPRX(JY,JX),VHCPNX(JY,JX)
+     9,CGSGL(JZ,JY,JX),CLSGL(0:JZ,JY,JX),OGSGL(JZ,JY,JX)
+     1,OLSGL(0:JZ,JY,JX),ZGSGL(JZ,JY,JX),CHSGL(JZ,JY,JX)
+     2,CQSGL(0:JZ,JY,JX),VOLWRX(JY,JX)
diff --git a/f77src/blk11b.h b/f77src/blk11b.h
diff --git a/f77src/blk12a.h b/f77src/blk12a.h
diff --git a/f77src/blk12b.h b/f77src/blk12b.h
diff --git a/f77src/blk13a.h b/f77src/blk13a.h
diff --git a/f77src/blk13b.h b/f77src/blk13b.h
diff --git a/f77src/blk13c.h b/f77src/blk13c.h
diff --git a/f77src/blk13d.h b/f77src/blk13d.h
diff --git a/f77src/blk14.h b/f77src/blk14.h
diff --git a/f77src/blk15a.h b/f77src/blk15a.h
@@ -20,4 +20,4 @@
      7,XOAQRS(0:4,2,JV,JH),FLQRQ(JY,JX),FLQRI(JY,JX)
      8,FLQGQ(JY,JX),FLQGI(JY,JX),FLQRM(JY,JX),FLQGM(JY,JX)
      9,XH1PFS(3,0:JD,JV,JH),XH1BFB(3,0:JD,JV,JH)
-
+     1,FLWNU(JY,JX),FLWXNU(JY,JX),FLWHNU(JY,JX),HFLWNU(JY,JX)
diff --git a/f77src/blk15b.h b/f77src/blk15b.h
diff --git a/f77src/blk16.h b/f77src/blk16.h
diff --git a/f77src/blk17.h b/f77src/blk17.h
diff --git a/f77src/blk18a.h b/f77src/blk18a.h
diff --git a/f77src/blk18b.h b/f77src/blk18b.h
diff --git a/f77src/blk19a.h b/f77src/blk19a.h
diff --git a/f77src/blk19b.h b/f77src/blk19b.h
diff --git a/f77src/blk19c.h b/f77src/blk19c.h
diff --git a/f77src/blk19d.h b/f77src/blk19d.h
diff --git a/f77src/blk1cp.h b/f77src/blk1cp.h
diff --git a/f77src/blk1cr.h b/f77src/blk1cr.h
diff --git a/f77src/blk1g.h b/f77src/blk1g.h
diff --git a/f77src/blk1n.h b/f77src/blk1n.h
diff --git a/f77src/blk1p.h b/f77src/blk1p.h
diff --git a/f77src/blk1s.h b/f77src/blk1s.h
diff --git a/f77src/blk1u.h b/f77src/blk1u.h
diff --git a/f77src/blk20a.h b/f77src/blk20a.h
diff --git a/f77src/blk20b.h b/f77src/blk20b.h
diff --git a/f77src/blk20c.h b/f77src/blk20c.h
diff --git a/f77src/blk20d.h b/f77src/blk20d.h
diff --git a/f77src/blk20e.h b/f77src/blk20e.h
diff --git a/f77src/blk20f.h b/f77src/blk20f.h
diff --git a/f77src/blk21a.h b/f77src/blk21a.h
diff --git a/f77src/blk21b.h b/f77src/blk21b.h
diff --git a/f77src/blk22a.h b/f77src/blk22a.h
diff --git a/f77src/blk22b.h b/f77src/blk22b.h
diff --git a/f77src/blk22c.h b/f77src/blk22c.h
diff --git a/f77src/blk2a.h b/f77src/blk2a.h
diff --git a/f77src/blk2b.h b/f77src/blk2b.h
diff --git a/f77src/blk2c.h b/f77src/blk2c.h
@@ -1,7 +1,7 @@
       COMMON/BLK2C/CCOQ(JY,JX),CCHQ(JY,JX),COXQ(JY,JX),CNNQ(JY,JX)
      2,CN2Q(JY,JX),COCU(0:4,JZ,JY,JX),CONU(0:4,JZ,JY,JX)
      3,COAU(0:4,JZ,JY,JX),CN4U(JZ,JY,JX),CN3U(JZ,JY,JX),CNOU(JZ,JY,JX)
-     4,CPOU(JZ,JY,JX),CNZU(JZ,JY,JX),CALU(JZ,JY,JX),CFEU(JZ,JY,JX)
+     4,CH2PU(JZ,JY,JX),CNZU(JZ,JY,JX),CALU(JZ,JY,JX),CFEU(JZ,JY,JX)
      5,CHYU(JZ,JY,JX),CCAU(JZ,JY,JX),CMGU(JZ,JY,JX),CNAU(JZ,JY,JX)
      6,CKAU(JZ,JY,JX),COHU(JZ,JY,JX),CSOU(JZ,JY,JX),CCLU(JZ,JY,JX)
      7,CC3U(JZ,JY,JX),CHCU(JZ,JY,JX),CAL1U(JZ,JY,JX),CAL2U(JZ,JY,JX)

diff --git a/f77src/blk3.h b/f77src/blk3.h
diff --git a/f77src/blk5.h b/f77src/blk5.h
diff --git a/f77src/blk6.h b/f77src/blk6.h
diff --git a/f77src/blk8a.h b/f77src/blk8a.h
@@ -3,7 +3,7 @@
      2,BKDS(JZ,JY,JX),FC(JZ,JY,JX),WP(JZ,JY,JX),SCNV(JZ,JY,JX)
      3,SCNH(JZ,JY,JX),CSAND(JZ,JY,JX),CSILT(JZ,JY,JX),CCLAY(JZ,JY,JX)
      4,FHOL(JZ,JY,JX),PHOL(JZ,JY,JX),DHOL(JZ,JY,JX),HRAD(JZ,JY,JX) 
-     5,PH(0:JZ,JY,JX),CEC(JZ,JY,JX),AEC(JZ,JY,JX)
+     5,BKDX(JZ,JY,JX),PH(0:JZ,JY,JX),CEC(JZ,JY,JX),AEC(JZ,JY,JX)
      6,CORGC(0:JZ,JY,JX),CORGR(JZ,JY,JX),CORGN(JZ,JY,JX),CORGP(JZ,JY,JX)
      7,CNH4(JZ,JY,JX),CNO3(JZ,JY,JX),CPO4(JZ,JY,JX),CAL(JZ,JY,JX)
      8,CFE(JZ,JY,JX),CCA(JZ,JY,JX),CMG(JZ,JY,JX),CNA(JZ,JY,JX)
@@ -14,6 +14,6 @@
      4,GKCN(JZ,JY,JX),GKCK(JZ,JY,JX),THW(JZ,JY,JX),THI(JZ,JY,JX)
      5,RSC(0:2,0:JZ,JY,JX),RSN(0:2,0:JZ,JY,JX),RSP(0:2,0:JZ,JY,JX)
      6,CNOFC(4,0:2),CPOFC(4,0:2),DETS(JY,JX),COHS(JY,JX),CER(JY,JX)
-     7,XER(JY,JX),SLOPE(3,JY,JX),NU(JY,JX),NJ(JY,JX),NK(JY,JX),NL(JV,JH)
-     8,ISOILR(JY,JX),NW(JY,JX),NHOL(JZ,JY,JX) 
-
+     7,XER(JY,JX),SLOPE(3,JY,JX),CDPTHI(JY,JX),NU(JY,JX),NUI(JY,JX)
+     8,NJ(JY,JX),NK(JY,JX),NL(JV,JH),ISOILR(JY,JX),NW(JY,JX)
+     9,NHOL(JZ,JY,JX),NUM(JY,JX)
diff --git a/f77src/blk8b.h b/f77src/blk8b.h
@@ -3,9 +3,10 @@
      3,WPL(JZ,JY,JX),PSD(JZ,JY,JX),FCD(JZ,JY,JX),ZD50(JY,JX)
      4,VOLX(0:JZ,JY,JX),BKVL(0:JZ,JY,JX),SRP(JZ,JY,JX),FORGC,FVLWB,FCH4F
      5,CNRH(0:4),CPRH(0:4),DIST(3,JD,JV,JH),XDPTH(3,JZ,JY,JX)
-     6,YDPTH(JZ,JY,JX),POROQ(0:JZ,JY,JX),TFND(0:JZ,JY,JX),VOLXA(JY,JX)
+     6,POROQ(0:JZ,JY,JX),TFND(0:JZ,JY,JX),VOLXA(JY,JX)
      7,PSIMS(JY,JX),PSIMX(JY,JX),PSIMN(JY,JX),PSISD(JY,JX),PSIMD(JY,JX)
      8,SAND(JZ,JY,JX),SILT(JZ,JY,JX),CLAY(JZ,JY,JX),CDPTHZ(0:JZ,JY,JX)
      9,DPTHZ(JZ,JY,JX),AREA(3,0:JZ,JY,JX),DISP(3,JD,JV,JH),OXKM,PSIHY
-     1,OMCI(3,0:4),OMCF(7),OMCA(7)
-     2,IUTYP(JY,JX),IXTYP(2,JY,JX),IYTYP(0:2,366,JY,JX)
+     1,VOLXI(0:JZ,JY,JX),DLYRI(3,0:JZ,JY,JX),OMCI(3,0:4),OMCF(7),OMCA(7)
+     2,VOLAI(0:JZ,JY,JX),IUTYP(JY,JX),IXTYP(2,JY,JX)
+     3,IYTYP(0:2,366,JY,JX)
diff --git a/f77src/blk9a.h b/f77src/blk9a.h
@@ -4,7 +4,7 @@
      4,CHL4(JP,JY,JX),XRNI(JP,JY,JX),XRLA(JP,JY,JX),CTC(JP,JY,JX)
      5,FCO2(JP,JY,JX),WDLF(JP,JY,JX),PB(JP,JY,JX),SLA1(JP,JY,JX)
      6,SSL1(JP,JY,JX),SNL1(JP,JY,JX),VRNL(JC,JP,JY,JX),HTC(JP,JY,JX)
-     7,FNOD(JP,JY,JX),DMLF(JP,JY,JX),DMSHE(JP,JY,JX)
+     7,SSTX(JP,JY,JX),FNOD(JP,JY,JX),DMLF(JP,JY,JX),DMSHE(JP,JY,JX)
      8,DMSTK(JP,JY,JX),DMRSV(JP,JY,JX),DMHSK(JP,JY,JX),DMEAR(JP,JY,JX)
      9,DMGR(JP,JY,JX),DMRT(JP,JY,JX),DMND(JP,JY,JX),RSMX(JP,JY,JX)
      1,RCMX(JP,JY,JX),RSMH(JP,JY,JX),CNLF(JP,JY,JX),CNSHE(JP,JY,JX)

diff --git a/f77src/blk9b.h b/f77src/blk9b.h
diff --git a/f77src/blk9c.h b/f77src/blk9c.h
diff --git a/f77src/blkc.h b/f77src/blkc.h
@@ -1,13 +1,14 @@
-      COMMON/BLKC/DRAD(12),DTMPX(12),DTMPN(12),DHUM(12),DPREC(12)
-     2,DIRRI(12),DWIND(12),DCO2E(12),DCN4R(12),DCNOR(12),TDIRI(JY,JX,12)
-     3,TDTPX(JY,JX,12),TDTPN(JY,JX,12),TDRAD(JY,JX,12),TDHUM(JY,JX,12)
-     4,TDPRC(JY,JX,12),TDWND(JY,JX,12),TDCO2(JY,JX,12),TDCN4(JY,JX,12)
-     5,TDCNO(JY,JX,12),TAREA,XDIM,XCORP(JY,JX),ZERO,ZEROS(JY,JX)
-     6,ZEROP(JP,JY,JX),ZEROQ(JP,JY,JX),ZEROL(JP,JY,JX)
-     7,XNPH,XNPT,XNPG,XNPD,ALAT(JY,JX),DOY,DYLM(JY,JX)
-     8,IFLGS(JY,JX),IFNHB(JY,JX),IFNOB(JY,JX),IFPOB(JY,JX)
-     9,IWTHR(2),IDAYR,IYRC,IYRR,NYR,ITERM,IFIN,ISALT(JV,JH)
-     1,IERSN(JY,JX),NCN(JY,JX),NPX,NPY,NPH,NPT,NPG,IGO,ICLM,IMNG,IFLGW 
-     2,JOUT,IOUT,KOUT,IOLD,ILAST,IRUN,IBEGIN,ISTART,IEND
-     3,ISOIL(0:4,JZ,JY,JX),LYRX,LYRC,LSG(JZ,JY,JX),NP(JY,JX)
-     4,NP0(JY,JX),IFLGI(JP,JY,JX),IFLGC(JP,JY,JX),IETYP(JY,JX)
+      COMMON/BLKC/DRAD(12),DTMPX(12),DTMPN(12),DHUM(12),DPREC(12)
+     2,DIRRI(12),DWIND(12),DCO2E(12),DCN4R(12),DCNOR(12),TDIRI(JY,JX,12)
+     3,TDTPX(JY,JX,12),TDTPN(JY,JX,12),TDRAD(JY,JX,12),TDHUM(JY,JX,12)
+     4,TDPRC(JY,JX,12),TDWND(JY,JX,12),TDCO2(JY,JX,12),TDCN4(JY,JX,12)
+     5,TDCNO(JY,JX,12),TAREA,XDIM,XCORP(JY,JX),ZERO,ZERO2,ZEROS(JY,JX)
+     6,ZEROP(JP,JY,JX),ZEROQ(JP,JY,JX),ZEROL(JP,JY,JX),XH(3,0:JZ,JY,JX)
+     7,XHS(JY,JX),XNPH,XNPT,XNPG,XNPR,XNPD,ALAT(JY,JX),DOY,DYLM(JY,JX)
+     8,ZEROS2(JY,JX)
+     8,IFLGS(JY,JX),IFNHB(JY,JX),IFNOB(JY,JX),IFPOB(JY,JX)
+     9,IWTHR(2),IDAYR,IYRC,IYRR,NYR,ITERM,IFIN,ISALT(JV,JH)
+     1,IERSN(JY,JX),NCN(JY,JX),NPX,NPY,NPH,NPT,NPG,IGO,ICLM,IMNG,IFLGW
+     2,NPR,JOUT,IOUT,KOUT,IOLD,ILAST,IRUN,IBEGIN,ISTART,IEND
+     3,ISOIL(0:4,JZ,JY,JX),LYRX,LYRC,LSG(JZ,JY,JX),NP(JY,JX)
+     4,NP0(JY,JX),IFLGI(JP,JY,JX),IFLGC(JP,JY,JX),IETYP(JY,JX)
diff --git a/f77src/blktest.h b/f77src/blktest.h
diff --git a/f77src/day.f b/f77src/day.f
diff --git a/f77src/erosion.f b/f77src/erosion.f
diff --git a/f77src/exec.f b/f77src/exec.f
diff --git a/f77src/extract.f b/f77src/extract.f
diff --git a/f77src/filec.h b/f77src/filec.h
diff --git a/f77src/fouts.f b/f77src/fouts.f
@@ -397,7 +397,7 @@ SUBROUTINE fouts(NT,NE,NAX,NDX,NTX,NEX,NF,NFX,NHW,NHE,NVN,NVS)
       IF(L.EQ.45)HEAD(M)='PSI_11'
       IF(L.EQ.46)HEAD(M)='PSI_12'
       IF(L.EQ.47)HEAD(M)='PSI_15'
-      IF(L.EQ.48)HEAD(M)='PSI_LITTER'
+      IF(L.EQ.48)HEAD(M)='SURF_ELEV'
       IF(L.EQ.49)HEAD(M)='ACTV_LYR'
       IF(L.EQ.50)HEAD(M)='WTR_TBL'
       ENDIF