new update for solution P and salts

Some refinements in soil solution P and salts, and changes related to organic nutrients.
jinyun1tang · Apr 18, 2019 · e2a3813 · e2a3813
1 parent 4040c7f
commit e2a3813
Show file tree

Hide file tree

Showing 53 changed files with 31,242 additions and 32,327 deletions.
diff --git a/f77src/blk11a.h b/f77src/blk11a.h
@@ -6,7 +6,7 @@
      6,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)
+     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)
      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)

diff --git a/f77src/blk11b.h b/f77src/blk11b.h
@@ -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
+     9,PSISO(JZ,JY,JX),PSISH(JZ,JY,JX),THETX,THETPI,DENSI
      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,THAWR(JY,JX),HTHAWR(JY,JX)
diff --git a/f77src/blk12a.h b/f77src/blk12a.h
@@ -1,20 +1,21 @@
-      COMMON/BLK12A/WSTR(JP,JY,JX),OSTR(JP,JY,JX)
-     2,RAD1(JP,JY,JX),THRM1(JP,JY,JX)
-     3,EFLXC(JP,JY,JX),SFLXC(JP,JY,JX),HFLXC(JP,JY,JX),ENGYX(JP,JY,JX)
-     4,VHCPC(JP,JY,JX),PSILT(JP,JY,JX),PSILG(JP,JY,JX),PSILO(JP,JY,JX)
-     5,RC(JP,JY,JX),RA(JP,JY,JX),EP(JP,JY,JX),EVAPC(JP,JY,JX)
-     6,UPWTR(2,JZ,JP,JY,JX),PSIRT(2,JZ,JP,JY,JX)
-     7,PSIRO(2,JZ,JP,JY,JX),PSIRG(2,JZ,JP,JY,JX),CO2A(2,JZ,JP,JY,JX)
-     8,OXYA(2,JZ,JP,JY,JX),CH4A(2,JZ,JP,JY,JX),Z2OA(2,JZ,JP,JY,JX)
-     9,ZH3A(2,JZ,JP,JY,JX),CO2P(2,JZ,JP,JY,JX),OXYP(2,JZ,JP,JY,JX)
-     1,CH4P(2,JZ,JP,JY,JX),Z2OP(2,JZ,JP,JY,JX),ZH3P(2,JZ,JP,JY,JX)
-     2,ROXYP(2,JZ,JP,JY,JX),RCOFLA(2,JZ,JP,JY,JX),ROXFLA(2,JZ,JP,JY,JX)
-     3,RCHFLA(2,JZ,JP,JY,JX),RN2FLA(2,JZ,JP,JY,JX),RNHFLA(2,JZ,JP,JY,JX)
-     4,RCODFA(2,JZ,JP,JY,JX),ROXDFA(2,JZ,JP,JY,JX),RCHDFA(2,JZ,JP,JY,JX)
-     5,RN2DFA(2,JZ,JP,JY,JX),RNHDFA(2,JZ,JP,JY,JX),RCO2S(2,JZ,JP,JY,JX)
-     6,RUPOXS(2,JZ,JP,JY,JX),RUPCHS(2,JZ,JP,JY,JX),RUPN2S(2,JZ,JP,JY,JX)
-     7,RUPN3S(2,JZ,JP,JY,JX),RUPN3B(2,JZ,JP,JY,JX),RCO2P(2,JZ,JP,JY,JX)
-     8,RUPOXP(2,JZ,JP,JY,JX),RCO2M(2,JZ,JP,JY,JX),RCO2A(2,JZ,JP,JY,JX)
-     9,UPOMC(JP,JY,JX),UPOMN(JP,JY,JX),UPOMP(JP,JY,JX),UPNH4(JP,JY,JX)
-     1,UPNO3(JP,JY,JX),UPH2P(JP,JY,JX),UPNF(JP,JY,JX)
-     2,RCO2Z(JP,JY,JX),ROXYZ(JP,JY,JX),RCH4Z(JP,JY,JX),RN2OZ(JP,JY,JX)
+      COMMON/BLK12A/WSTR(JP,JY,JX),OSTR(JP,JY,JX)
+     2,RAD1(JP,JY,JX),THRM1(JP,JY,JX)
+     3,EFLXC(JP,JY,JX),SFLXC(JP,JY,JX),HFLXC(JP,JY,JX),ENGYX(JP,JY,JX)
+     4,VHCPC(JP,JY,JX),PSILT(JP,JY,JX),PSILG(JP,JY,JX),PSILO(JP,JY,JX)
+     5,RC(JP,JY,JX),RA(JP,JY,JX),EP(JP,JY,JX),EVAPC(JP,JY,JX)
+     6,UPWTR(2,JZ,JP,JY,JX),PSIRT(2,JZ,JP,JY,JX)
+     7,PSIRO(2,JZ,JP,JY,JX),PSIRG(2,JZ,JP,JY,JX),CO2A(2,JZ,JP,JY,JX)
+     8,OXYA(2,JZ,JP,JY,JX),CH4A(2,JZ,JP,JY,JX),Z2OA(2,JZ,JP,JY,JX)
+     9,ZH3A(2,JZ,JP,JY,JX),CO2P(2,JZ,JP,JY,JX),OXYP(2,JZ,JP,JY,JX)
+     1,CH4P(2,JZ,JP,JY,JX),Z2OP(2,JZ,JP,JY,JX),ZH3P(2,JZ,JP,JY,JX)
+     2,ROXYP(2,JZ,JP,JY,JX),RCOFLA(2,JZ,JP,JY,JX),ROXFLA(2,JZ,JP,JY,JX)
+     3,RCHFLA(2,JZ,JP,JY,JX),RN2FLA(2,JZ,JP,JY,JX),RNHFLA(2,JZ,JP,JY,JX)
+     4,RCODFA(2,JZ,JP,JY,JX),ROXDFA(2,JZ,JP,JY,JX),RCHDFA(2,JZ,JP,JY,JX)
+     5,RN2DFA(2,JZ,JP,JY,JX),RNHDFA(2,JZ,JP,JY,JX),RCO2S(2,JZ,JP,JY,JX)
+     6,RUPOXS(2,JZ,JP,JY,JX),RUPCHS(2,JZ,JP,JY,JX),RUPN2S(2,JZ,JP,JY,JX)
+     7,RUPN3S(2,JZ,JP,JY,JX),RUPN3B(2,JZ,JP,JY,JX),RCO2P(2,JZ,JP,JY,JX)
+     8,RUPOXP(2,JZ,JP,JY,JX),RCO2M(2,JZ,JP,JY,JX),RCO2A(2,JZ,JP,JY,JX)
+     9,UPOMC(JP,JY,JX),UPOMN(JP,JY,JX),UPOMP(JP,JY,JX),UPNH4(JP,JY,JX)
+     1,UPNO3(JP,JY,JX),UPH2P(JP,JY,JX),UPH1P(JP,JY,JX),UPNF(JP,JY,JX)
+     2,RCO2Z(JP,JY,JX),ROXYZ(JP,JY,JX),RCH4Z(JP,JY,JX),RN2OZ(JP,JY,JX)
+
diff --git a/f77src/blk12b.h b/f77src/blk12b.h
@@ -5,11 +5,14 @@
      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)
+     8,RUPH1P(2,JZ,JP,JY,JX),RUOH1P(2,JZ,JP,JY,JX),RUCH1P(2,JZ,JP,JY,JX)
+     9,RUPH1B(2,JZ,JP,JY,JX),RUOH1B(2,JZ,JP,JY,JX),RUCH1B(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)
+     8,H2GP(2,JZ,JP,JY,JX),RH2GZ(JP,JY,JX),RUPP1P(2,JZ,JP,JY,JX)
+     9,RUPP1B(2,JZ,JP,JY,JX)
 
diff --git a/f77src/blk13a.h b/f77src/blk13a.h
@@ -1,23 +1,25 @@
-      COMMON/BLK13A/ORGC(0:JZ,JY,JX),OMC(3,7,0:5,0:JZ,JY,JX)
-     2,OMN(3,7,0:5,0:JZ,JY,JX),OMP(3,7,0:5,0:JZ,JY,JX)
-     3,ORC(2,0:4,0:JZ,JY,JX),ORN(2,0:4,0:JZ,JY,JX),ORP(2,0:4,0:JZ,JY,JX)
-     4,OQC(0:4,0:JZ,JY,JX),OQN(0:4,0:JZ,JY,JX),OQP(0:4,0:JZ,JY,JX)
-     5,OQA(0:4,0:JZ,JY,JX),OQCH(0:4,0:JZ,JY,JX),OQNH(0:4,0:JZ,JY,JX)
-     6,OQPH(0:4,0:JZ,JY,JX),OQAH(0:4,0:JZ,JY,JX),OHC(0:4,0:JZ,JY,JX)
-     7,OHN(0:4,0:JZ,JY,JX),OHP(0:4,0:JZ,JY,JX),OSC(4,0:4,0:JZ,JY,JX)
-     8,OSN(4,0:4,0:JZ,JY,JX),OSP(4,0:4,0:JZ,JY,JX),OHA(0:4,0:JZ,JY,JX)
-     9,ZNH4FA(0:JZ,JY,JX),ZNH3FA(0:JZ,JY,JX),ZNHUFA(0:JZ,JY,JX)
-     1,ZNO3FA(0:JZ,JY,JX),ZNH4FB(0:JZ,JY,JX),ZNH3FB(0:JZ,JY,JX)
-     2,ZNHUFB(0:JZ,JY,JX),ZNO3FB(0:JZ,JY,JX),ZNO2B(0:JZ,JY,JX)
-     3,ZNH4S(0:JZ,JY,JX),ZNH3S(0:JZ,JY,JX),ZNO3S(0:JZ,JY,JX)
-     4,H2PO4(0:JZ,JY,JX),ZNH4B(0:JZ,JY,JX),ZNH3B(0:JZ,JY,JX)
-     5,ZNO3B(0:JZ,JY,JX),H2POB(0:JZ,JY,JX),ZNO2S(0:JZ,JY,JX)
-     6,ZNH3G(JZ,JY,JX),Z2GG(JZ,JY,JX),Z2GS(0:JZ,JY,JX),Z2OG(JZ,JY,JX)
-     7,Z2OS(0:JZ,JY,JX),ZNH4SH(JZ,JY,JX),ZNH3SH(JZ,JY,JX)
-     8,ZNO3SH(JZ,JY,JX),H2PO4H(JZ,JY,JX),ZNH4BH(JZ,JY,JX)
-     9,ZNH3BH(JZ,JY,JX),ZNO3BH(JZ,JY,JX),H2POBH(JZ,JY,JX)
-     1,ZNO2SH(JZ,JY,JX),Z2GSH(JZ,JY,JX),Z2OSH(JZ,JY,JX),TRC0(JY,JX)
-     2,ZNO2BH(JZ,JY,JX),RC0(0:5,JY,JX),RA0(0:5,JY,JX),TRA0(JY,JX)
-     3,TOQCK(0:JZ,JY,JX),ORGN(0:JZ,JY,JX),ORGR(0:JZ,JY,JX)
-     4,ZNFNI(0:JZ,JY,JX),ZNFNG(0:JZ,JY,JX),ZNFN0(0:JZ,JY,JX)
-     5,ZNHUI(0:JZ,JY,JX),ZNHU0(0:JZ,JY,JX)
+      COMMON/BLK13A/ORGC(0:JZ,JY,JX),OMC(3,7,0:5,0:JZ,JY,JX)
+     2,OMN(3,7,0:5,0:JZ,JY,JX),OMP(3,7,0:5,0:JZ,JY,JX)
+     3,ORC(2,0:4,0:JZ,JY,JX),ORN(2,0:4,0:JZ,JY,JX),ORP(2,0:4,0:JZ,JY,JX)
+     4,OQC(0:4,0:JZ,JY,JX),OQN(0:4,0:JZ,JY,JX),OQP(0:4,0:JZ,JY,JX)
+     5,OQA(0:4,0:JZ,JY,JX),OQCH(0:4,0:JZ,JY,JX),OQNH(0:4,0:JZ,JY,JX)
+     6,OQPH(0:4,0:JZ,JY,JX),OQAH(0:4,0:JZ,JY,JX),OHC(0:4,0:JZ,JY,JX)
+     7,OHN(0:4,0:JZ,JY,JX),OHP(0:4,0:JZ,JY,JX),OSC(4,0:4,0:JZ,JY,JX)
+     8,OSN(4,0:4,0:JZ,JY,JX),OSP(4,0:4,0:JZ,JY,JX),OHA(0:4,0:JZ,JY,JX)
+     9,ZNH4FA(0:JZ,JY,JX),ZNH3FA(0:JZ,JY,JX),ZNHUFA(0:JZ,JY,JX)
+     1,ZNO3FA(0:JZ,JY,JX),ZNH4FB(0:JZ,JY,JX),ZNH3FB(0:JZ,JY,JX)
+     2,ZNHUFB(0:JZ,JY,JX),ZNO3FB(0:JZ,JY,JX),ZNO2B(0:JZ,JY,JX)
+     3,ZNH4S(0:JZ,JY,JX),ZNH3S(0:JZ,JY,JX),ZNO3S(0:JZ,JY,JX)
+     4,H2PO4(0:JZ,JY,JX),ZNH4B(0:JZ,JY,JX),ZNH3B(0:JZ,JY,JX)
+     5,ZNO3B(0:JZ,JY,JX),H2POB(0:JZ,JY,JX),ZNO2S(0:JZ,JY,JX)
+     6,ZNH3G(JZ,JY,JX),Z2GG(JZ,JY,JX),Z2GS(0:JZ,JY,JX),Z2OG(JZ,JY,JX)
+     7,Z2OS(0:JZ,JY,JX),ZNH4SH(JZ,JY,JX),ZNH3SH(JZ,JY,JX)
+     8,ZNO3SH(JZ,JY,JX),H2PO4H(JZ,JY,JX),ZNH4BH(JZ,JY,JX)
+     9,ZNH3BH(JZ,JY,JX),ZNO3BH(JZ,JY,JX),H2POBH(JZ,JY,JX)
+     1,ZNO2SH(JZ,JY,JX),Z2GSH(JZ,JY,JX),Z2OSH(JZ,JY,JX),TRC0(JY,JX)
+     2,ZNO2BH(JZ,JY,JX),RC0(0:5,JY,JX),RA0(0:5,JY,JX),TRA0(JY,JX)
+     3,TOQCK(0:JZ,JY,JX),ORGN(0:JZ,JY,JX),ORGR(0:JZ,JY,JX)
+     4,ZNFNI(0:JZ,JY,JX),ZNFNG(0:JZ,JY,JX),ZNFN0(0:JZ,JY,JX)
+     5,ZNHUI(0:JZ,JY,JX),ZNHU0(0:JZ,JY,JX),H1PO4(0:JZ,JY,JX)
+     6,H1POB(0:JZ,JY,JX),H1PO4H(JZ,JY,JX),H1POBH(JZ,JY,JX)
+
diff --git a/f77src/blk13b.h b/f77src/blk13b.h
@@ -10,16 +10,16 @@
      1,COXYS(0:JZ,JY,JX),CCO2G(0:JZ,JY,JX),CCO2S(0:JZ,JY,JX)
      2,CCH4S(0:JZ,JY,JX),RUPOXO(0:JZ,JY,JX),RCO2O(0:JZ,JY,JX)
      3,RCH4O(0:JZ,JY,JX),RH2GO(0:JZ,JY,JX),RN2G(0:JZ,JY,JX)
-     4,RN2O(0:JZ,JY,JX),CH2P4(0:JZ,JY,JX),CH2PB(0:JZ,JY,JX)
+     4,RN2O(0:JZ,JY,JX),CH2P4(0:JZ,JY,JX),CH2P4B(0:JZ,JY,JX)
      5,XCODFG(0:JZ,JY,JX),XCHDFG(0:JZ,JY,JX),XOXDFG(0:JZ,JY,JX)
      6,XNGDFG(0:JZ,JY,JX),XN2DFG(0:JZ,JY,JX),XN3DFG(0:JZ,JY,JX)
      7,XNBDFG(0:JZ,JY,JX) ,XHGDFG(0:JZ,JY,JX),XCODFS(JY,JX)
      8,XCHDFS(JY,JX),XOXDFS(JY,JX),XNGDFS(JY,JX),XN2DFS(JY,JX)
      8,XN3DFS(JY,JX),XNBDFS(JY,JX),XHGDFS(JY,JX),RCO2F(0:JZ,JY,JX)
      9,ROXYS(7,0:5,0:JZ,JY,JX),H2GS(0:JZ,JY,JX),CH2GS(0:JZ,JY,JX)
      1,RCH4L(0:JZ,JY,JX),ROXYF(0:JZ,JY,JX),ROXYL(0:JZ,JY,JX)
-     2,RCH4F(0:JZ,JY,JX)
-     3,XZHYS(0:JZ,JY,JX),CNO2B(0:JZ,JY,JX),XNO2B(0:JZ,JY,JX)
-     4,OSA(4,0:4,0:JZ,JY,JX),XN34SQ(0:JZ,JY,JX),XN34BQ(0:JZ,JY,JX)
+     2,RCH4F(0:JZ,JY,JX),CH1P4(0:JZ,JY,JX),CH1P4B(0:JZ,JY,JX)
+     3,CNO2B(0:JZ,JY,JX),XNO2B(0:JZ,JY,JX)
+     4,OSA(4,0:4,0:JZ,JY,JX)
      5,ROQCS(7,0:4,0:JZ,JY,JX),ROQAS(7,0:4,0:JZ,JY,JX)
 
diff --git a/f77src/blk13c.h b/f77src/blk13c.h
@@ -15,13 +15,13 @@
      6,XNGDFR(JY,JX),XN2DFR(JY,JX),XN3DFR(JY,JX),XHGDFR(JY,JX)
      7,XCOBBL(JZ,JY,JX),XCHBBL(JZ,JY,JX),XOXBBL(JZ,JY,JX)
      8,XNGBBL(JZ,JY,JX),XN2BBL(JZ,JY,JX),XN3BBL(JZ,JY,JX)
-     9,XNBBBL(JZ,JY,JX),XHGBBL(JZ,JY,JX)
+     9,XNBBBL(JZ,JY,JX),XHGBBL(JZ,JY,JX),XH1PS(0:JZ,JY,JX)
      1,RVMX4(7,0:5,0:JZ,JY,JX),RVMX3(7,0:5,0:JZ,JY,JX)
      2,RVMX2(7,0:5,0:JZ,JY,JX),RVMB4(7,0:5,0:JZ,JY,JX)
      3,RVMB3(7,0:5,0:JZ,JY,JX),RVMB2(7,0:5,0:JZ,JY,JX)
      4,RVMX1(7,0:5,0:JZ,JY,JX),CFOMC(2,JZ,JY,JX)
-     5,EPOC(0:JZ,JY,JX),EHUM(0:JZ,JY,JX)
+     5,EPOC(0:JZ,JY,JX),EHUM(0:JZ,JY,JX),XH1BS(0:JZ,JY,JX)
      6,H2GSH(JZ,JY,JX),RVMXC(0:JZ,JY,JX),RVMBC(0:JZ,JY,JX)
      7,RINHB(7,0:5,0:JZ,JY,JX),RINOB(7,0:5,0:JZ,JY,JX)
-     8,RIPOB(7,0:5,0:JZ,JY,JX)
-
+     8,RIPBO(7,0:5,0:JZ,JY,JX),RIPO1(7,0:5,0:JZ,JY,JX)
+     9,RIPB1(7,0:5,0:JZ,JY,JX),RIPO1R(7,0:5,JY,JX),XZHYS(0:JZ,JY,JX)
diff --git a/f77src/blk15a.h b/f77src/blk15a.h
@@ -1,22 +1,23 @@
-      COMMON/BLK15A/QR(2,JV,JH),HQR(2,JV,JH),QS(2,JV,JH),QW(2,JV,JH)
-     2,QI(2,JV,JH),HQS(2,JV,JH),FLW(3,JD,JV,JH)
-     2,FLWH(3,JD,JV,JH),HFLW(3,JD,JV,JH),XCOFLS(3,0:JD,JV,JH)
-     3,XCHFLS(3,0:JD,JV,JH),XOXFLS(3,0:JD,JV,JH),XNGFLS(3,0:JD,JV,JH)
-     4,XN2FLS(3,0:JD,JV,JH),XHGFLS(3,0:JD,JV,JH),XN4FLW(3,0:JD,JV,JH)
-     5,XN3FLW(3,0:JD,JV,JH),XNOFLW(3,0:JD,JV,JH),XH2PFS(3,0:JD,JV,JH)
-     6,XNXFLS(3,0:JD,JV,JH),XN4FLB(3,JD,JV,JH),XN3FLB(3,JD,JV,JH)
-     7,XNOFLB(3,JD,JV,JH),XH2BFB(3,JD,JV,JH),XNXFLB(3,JD,JV,JH)
-     8,XOCFLS(0:4,3,0:JD,JV,JH),XONFLS(0:4,3,0:JD,JV,JH)
-     9,XCHFLG(3,0:JD,JV,JH),XOAFLS(0:4,3,0:JD,JV,JH),XCOFLG(3,JD,JV,JH)
-     1,XOPFLS(0:4,3,0:JD,JV,JH),XOXFLG(3,JD,JV,JH),XNGFLG(3,JD,JV,JH)
-     2,XHGFLG(3,JD,JV,JH),XN2FLG(3,JD,JV,JH),XN3FLG(3,JD,JV,JH)
-     3,XCOQRS(2,JV,JH),XCHQRS(2,JV,JH),XOXQRS(2,JV,JH),XNGQRS(2,JV,JH)
-     4,XN2QRS(2,JV,JH),XHGQRS(2,JV,JH),XN4QRW(2,JV,JH),XN3QRW(2,JV,JH)
-     5,XNOQRW(2,JV,JH),XNXQRS(2,JV,JH),XP4QRW(2,JV,JH)
-     3,XCOQSS(2,JV,JH),XCHQSS(2,JV,JH),XOXQSS(2,JV,JH),XNGQSS(2,JV,JH)
-     4,XN2QSS(2,JV,JH),XN4QSS(2,JV,JH),XN3QSS(2,JV,JH)
-     5,XNOQSS(2,JV,JH),XP4QSS(2,JV,JH)
-     6,XOCQRS(0:4,2,JV,JH),XONQRS(0:4,2,JV,JH),XOPQRS(0:4,2,JV,JH)
-     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)
-
+      COMMON/BLK15A/QR(2,JV,JH),HQR(2,JV,JH),QS(2,JV,JH),QW(2,JV,JH)
+     2,QI(2,JV,JH),HQS(2,JV,JH),FLW(3,JD,JV,JH)
+     2,FLWH(3,JD,JV,JH),HFLW(3,JD,JV,JH),XCOFLS(3,0:JD,JV,JH)
+     3,XCHFLS(3,0:JD,JV,JH),XOXFLS(3,0:JD,JV,JH),XNGFLS(3,0:JD,JV,JH)
+     4,XN2FLS(3,0:JD,JV,JH),XHGFLS(3,0:JD,JV,JH),XN4FLW(3,0:JD,JV,JH)
+     5,XN3FLW(3,0:JD,JV,JH),XNOFLW(3,0:JD,JV,JH),XH2PFS(3,0:JD,JV,JH)
+     6,XNXFLS(3,0:JD,JV,JH),XN4FLB(3,JD,JV,JH),XN3FLB(3,JD,JV,JH)
+     7,XNOFLB(3,JD,JV,JH),XH2BFB(3,JD,JV,JH),XNXFLB(3,JD,JV,JH)
+     8,XOCFLS(0:4,3,0:JD,JV,JH),XONFLS(0:4,3,0:JD,JV,JH)
+     9,XCHFLG(3,0:JD,JV,JH),XOAFLS(0:4,3,0:JD,JV,JH),XCOFLG(3,JD,JV,JH)
+     1,XOPFLS(0:4,3,0:JD,JV,JH),XOXFLG(3,JD,JV,JH),XNGFLG(3,JD,JV,JH)
+     2,XHGFLG(3,JD,JV,JH),XN2FLG(3,JD,JV,JH),XN3FLG(3,JD,JV,JH)
+     3,XCOQRS(2,JV,JH),XCHQRS(2,JV,JH),XOXQRS(2,JV,JH),XNGQRS(2,JV,JH)
+     4,XN2QRS(2,JV,JH),XHGQRS(2,JV,JH),XN4QRW(2,JV,JH),XN3QRW(2,JV,JH)
+     5,XNOQRW(2,JV,JH),XNXQRS(2,JV,JH),XP4QRW(2,JV,JH),XP1QRW(2,JV,JH)
+     3,XCOQSS(2,JV,JH),XCHQSS(2,JV,JH),XOXQSS(2,JV,JH),XNGQSS(2,JV,JH)
+     4,XN2QSS(2,JV,JH),XN4QSS(2,JV,JH),XN3QSS(2,JV,JH)
+     5,XNOQSS(2,JV,JH),XP4QSS(2,JV,JH),XP1QSS(2,JV,JH)
+     6,XOCQRS(0:4,2,JV,JH),XONQRS(0:4,2,JV,JH),XOPQRS(0:4,2,JV,JH)
+     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)
+
diff --git a/f77src/blk15b.h b/f77src/blk15b.h
@@ -6,3 +6,4 @@
      6,XNXFHB(3,0:JD,JV,JH),XH2BHB(3,JD,JV,JH),XOCFHS(0:4,3,JD,JV,JH)
      7,XONFHS(0:4,3,JD,JV,JH),XOPFHS(0:4,3,JD,JV,JH)
      8,XOAFHS(0:4,3,JD,JV,JH),FLWX(3,JD,JV,JH)
+     9,XH1PHS(3,JD,JV,JH),XH1BHB(3,JD,JV,JH)
diff --git a/f77src/blk16.h b/f77src/blk16.h
@@ -16,4 +16,5 @@
      7,UPO4F(JY,JX),UDRAIN(JY,JX),ZDRAIN(JY,JX),PDRAIN(JY,JX)
      8,UCOP(JY,JX),USEDOU(JY,JX),PPT(JY,JX),UDICQ(JY,JX),UDICD(JY,JX)
      9,UDINQ(JY,JX),UDIND(JY,JX),UDIPQ(JY,JX),UDIPD(JY,JX),HVOLO(JY,JX)
-     1,WTSTGT(JY,JX),TFERTN,TFERTP,TION,TIONIN,TIONOU,TSEDSO,TSEDOU
+     1,WTSTGT(JY,JX),TION,TIONIN,TIONOU,TSEDSO,TSEDOU
+     2,TLH2G,H2GIN,H2GOU
diff --git a/f77src/blk18a.h b/f77src/blk18a.h
@@ -14,4 +14,4 @@
      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,TUPH1P(JZ,JY,JX),TUPH1B(JZ,JY,JX)
diff --git a/f77src/blk18b.h b/f77src/blk18b.h
@@ -10,5 +10,6 @@
      1,THGFLA(JZ,JY,JX),TLH2GP(JZ,JY,JX),TRN(JY,JX)
      2,TLE(JY,JX),TSH(JY,JX),TGH(JY,JX),TGPP(JY,JX),TRAU(JY,JX)
      3,TNPP(JY,JX),THRE(JY,JX),XHVSTC(JY,JX),XHVSTN(JY,JX)
-     4,XHVSTP(JY,JX),IFLGT(JY,JX)
+     4,XHVSTP(JY,JX),RP14X(0:JZ,JY,JX),RP14Y(0:JZ,JY,JX)
+     5,RP1BX(0:JZ,JY,JX),RP1BY(0:JZ,JY,JX),IFLGT(JY,JX)
 
diff --git a/f77src/blk19a.h b/f77src/blk19a.h
@@ -1,21 +1,23 @@
-      COMMON/BLK19A/ZAL(0:JZ,JY,JX),ZFE(0:JZ,JY,JX),ZHY(0:JZ,JY,JX)
-     2,ZCA(0:JZ,JY,JX),ZMG(0:JZ,JY,JX),ZNA(0:JZ,JY,JX),ZKA(0:JZ,JY,JX)
-     3,ZOH(0:JZ,JY,JX),ZSO4(0:JZ,JY,JX),ZCL(0:JZ,JY,JX),ZCO3(0:JZ,JY,JX)
-     4,ZHCO3(0:JZ,JY,JX),ZALOH1(0:JZ,JY,JX),ZALOH2(0:JZ,JY,JX)
-     5,ZALOH3(0:JZ,JY,JX),ZALOH4(0:JZ,JY,JX),ZALS(0:JZ,JY,JX)
-     6,ZFEOH1(0:JZ,JY,JX),ZFEOH2(0:JZ,JY,JX),ZFEOH3(0:JZ,JY,JX)
-     7,ZFEOH4(0:JZ,JY,JX),ZFES(0:JZ,JY,JX),ZCAO(0:JZ,JY,JX)
-     8,ZCAC(0:JZ,JY,JX),ZCAH(0:JZ,JY,JX),ZCAS(0:JZ,JY,JX)
-     9,ZMGO(0:JZ,JY,JX),ZMGC(0:JZ,JY,JX),ZMGH(0:JZ,JY,JX)
-     1,ZMGS(0:JZ,JY,JX),ZNAC(0:JZ,JY,JX)
-     1,ZNAS(0:JZ,JY,JX),ZKAS(0:JZ,JY,JX),H0PO4(0:JZ,JY,JX)
-     2,H1PO4(0:JZ,JY,JX),H3PO4(0:JZ,JY,JX),ZFE1P(0:JZ,JY,JX)
-     3,ZFE2P(0:JZ,JY,JX),ZCA0P(0:JZ,JY,JX),ZCA1P(0:JZ,JY,JX)
-     4,ZCA2P(0:JZ,JY,JX),ZMG1P(0:JZ,JY,JX),H0POB(JZ,JY,JX)
-     5,H1POB(JZ,JY,JX),H3POB(JZ,JY,JX),ZFE1PB(JZ,JY,JX)
-     6,ZFE2PB(JZ,JY,JX),ZCA0PB(JZ,JY,JX),ZCA1PB(JZ,JY,JX)
-     7,ZCA2PB(JZ,JY,JX),ZMG1PB(JZ,JY,JX),XN4(0:JZ,JY,JX),XNB(0:JZ,JY,JX)
-     8,XHY(JZ,JY,JX),XAL(JZ,JY,JX),XCA(JZ,JY,JX),XMG(JZ,JY,JX)
-     9,XNA(JZ,JY,JX),XKA(JZ,JY,JX),XHC(JZ,JY,JX),XALO2(JZ,JY,JX)
-     1,XOH0(0:JZ,JY,JX),XOH1(0:JZ,JY,JX),XOH2(0:JZ,JY,JX)
-     2,XH1P(0:JZ,JY,JX),XH2P(0:JZ,JY,JX),XOH0B(0:JZ,JY,JX)
+      COMMON/BLK19A/ZAL(0:JZ,JY,JX),ZFE(0:JZ,JY,JX),ZHY(0:JZ,JY,JX)
+     2,ZCA(0:JZ,JY,JX),ZMG(0:JZ,JY,JX),ZNA(0:JZ,JY,JX),ZKA(0:JZ,JY,JX)
+     3,ZOH(0:JZ,JY,JX),ZSO4(0:JZ,JY,JX),ZCL(0:JZ,JY,JX),ZCO3(0:JZ,JY,JX)
+     4,ZHCO3(0:JZ,JY,JX),ZALOH1(0:JZ,JY,JX),ZALOH2(0:JZ,JY,JX)
+     5,ZALOH3(0:JZ,JY,JX),ZALOH4(0:JZ,JY,JX),ZALS(0:JZ,JY,JX)
+     6,ZFEOH1(0:JZ,JY,JX),ZFEOH2(0:JZ,JY,JX),ZFEOH3(0:JZ,JY,JX)
+     7,ZFEOH4(0:JZ,JY,JX),ZFES(0:JZ,JY,JX),ZCAO(0:JZ,JY,JX)
+     8,ZCAC(0:JZ,JY,JX),ZCAH(0:JZ,JY,JX),ZCAS(0:JZ,JY,JX)
+     9,ZMGO(0:JZ,JY,JX),ZMGC(0:JZ,JY,JX),ZMGH(0:JZ,JY,JX)
+     1,ZMGS(0:JZ,JY,JX),ZNAC(0:JZ,JY,JX)
+     1,ZNAS(0:JZ,JY,JX),ZKAS(0:JZ,JY,JX),H0PO4(0:JZ,JY,JX)
+     2,H3PO4(0:JZ,JY,JX),ZFE1P(0:JZ,JY,JX)
+     3,ZFE2P(0:JZ,JY,JX),ZCA0P(0:JZ,JY,JX),ZCA1P(0:JZ,JY,JX)
+     4,ZCA2P(0:JZ,JY,JX),ZMG1P(0:JZ,JY,JX),H0POB(JZ,JY,JX)
+     5,H3POB(JZ,JY,JX),ZFE1PB(JZ,JY,JX),ZFE2PB(JZ,JY,JX)
+     6,ZCA0PB(JZ,JY,JX),ZCA1PB(JZ,JY,JX),ZCA2PB(JZ,JY,JX)
+     7,ZMG1PB(JZ,JY,JX),XN4(0:JZ,JY,JX),XNB(0:JZ,JY,JX)
+     8,XHY(JZ,JY,JX),XAL(JZ,JY,JX),XCA(JZ,JY,JX),XMG(JZ,JY,JX)
+     9,XNA(JZ,JY,JX),XKA(JZ,JY,JX),XHC(JZ,JY,JX),XALO2(JZ,JY,JX)
+     1,XOH0(0:JZ,JY,JX),XOH1(0:JZ,JY,JX),XOH2(0:JZ,JY,JX)
+     2,XH1P(0:JZ,JY,JX),XH2P(0:JZ,JY,JX),XOH0B(0:JZ,JY,JX)
+     3,XFE(JZ,JY,JX),XFEO2(JZ,JY,JX)
+
diff --git a/f77src/blk19c.h b/f77src/blk19c.h
@@ -1,8 +1,9 @@
-      COMMON/BLK19C/ZMGOH(JZ,JY,JX),ZMGCH(JZ,JY,JX),ZMGHH(JZ,JY,JX)
-     2,ZMGSH(JZ,JY,JX),ZNACH(JZ,JY,JX),ZNASH(JZ,JY,JX),ZKASH(JZ,JY,JX)
-     3,H0PO4H(JZ,JY,JX),H1PO4H(JZ,JY,JX),H3PO4H(JZ,JY,JX)
-     4,ZFE1PH(JZ,JY,JX),ZFE2PH(JZ,JY,JX),ZCA0PH(JZ,JY,JX)
-     5,ZCA1PH(JZ,JY,JX),ZCA2PH(JZ,JY,JX),ZMG1PH(JZ,JY,JX)
-     6,H0POBH(JZ,JY,JX),H1POBH(JZ,JY,JX),H3POBH(JZ,JY,JX)
-     7,ZFE1BH(JZ,JY,JX),ZFE2BH(JZ,JY,JX),ZCA0BH(JZ,JY,JX)
-     8,ZCA1BH(JZ,JY,JX),ZCA2BH(JZ,JY,JX),ZMG1BH(JZ,JY,JX)
+      COMMON/BLK19C/ZMGOH(JZ,JY,JX),ZMGCH(JZ,JY,JX),ZMGHH(JZ,JY,JX)
+     2,ZMGSH(JZ,JY,JX),ZNACH(JZ,JY,JX),ZNASH(JZ,JY,JX),ZKASH(JZ,JY,JX)
+     3,H0PO4H(JZ,JY,JX),H3PO4H(JZ,JY,JX)
+     4,ZFE1PH(JZ,JY,JX),ZFE2PH(JZ,JY,JX),ZCA0PH(JZ,JY,JX)
+     5,ZCA1PH(JZ,JY,JX),ZCA2PH(JZ,JY,JX),ZMG1PH(JZ,JY,JX)
+     6,H0POBH(JZ,JY,JX),H3POBH(JZ,JY,JX)
+     7,ZFE1BH(JZ,JY,JX),ZFE2BH(JZ,JY,JX),ZCA0BH(JZ,JY,JX)
+     8,ZCA1BH(JZ,JY,JX),ZCA2BH(JZ,JY,JX),ZMG1BH(JZ,JY,JX)
+
diff --git a/f77src/blk19d.h b/f77src/blk19d.h
@@ -7,6 +7,6 @@
      7,ZFEH2W(JY,JX),ZFEH3W(JY,JX),ZFEH4W(JY,JX),ZFESW(JY,JX)
      8,ZCAOW(JY,JX),ZCACW(JY,JX),ZCAHW(JY,JX),ZCASW(JY,JX),ZMGOW(JY,JX)
      9,ZMGCW(JY,JX),ZMGHW(JY,JX),ZMGSW(JY,JX),ZNACW(JY,JX),ZNASW(JY,JX)
-     1,ZKASW(JY,JX),H0PO4W(JY,JX),H1PO4W(JY,JX),H3PO4W(JY,JX)
+     1,ZKASW(JY,JX),H0PO4W(JY,JX),H3PO4W(JY,JX)
      2,ZFE1PW(JY,JX),ZFE2PW(JY,JX),ZCA0PW(JY,JX),ZCA1PW(JY,JX)
-     3,ZCA2PW(JY,JX),ZMG1PW(JY,JX),H2GW(JY,JX)
+     3,ZCA2PW(JY,JX),ZMG1PW(JY,JX),H2GW(JY,JX),Z1PW(JY,JX)
diff --git a/f77src/blk20a.h b/f77src/blk20a.h
@@ -6,7 +6,7 @@
      6,XQRFE3(2,JV,JH),XQRFE4(2,JV,JH),XQRFES(2,JV,JH),XQRCAO(2,JV,JH)
      7,XQRCAC(2,JV,JH),XQRCAH(2,JV,JH),XQRCAS(2,JV,JH),XQRMGO(2,JV,JH)
      8,XQRMGC(2,JV,JH),XQRMGH(2,JV,JH),XQRMGS(2,JV,JH),XQRNAC(2,JV,JH)
-     9,XQRNAS(2,JV,JH),XQRKAS(2,JV,JH),XQRH0P(2,JV,JH),XQRH1P(2,JV,JH)
+     9,XQRNAS(2,JV,JH),XQRKAS(2,JV,JH),XQRH0P(2,JV,JH)
      1,XQRH3P(2,JV,JH),XQRF1P(2,JV,JH),XQRF2P(2,JV,JH),XQRC0P(2,JV,JH)
      2,XQRC1P(2,JV,JH),XQRC2P(2,JV,JH),XQRM1P(2,JV,JH),XQRH0B(2,JV,JH)
      3,XQRH1B(2,JV,JH),XQRH3B(2,JV,JH),XQRF1B(2,JV,JH),XQRF2B(2,JV,JH)

diff --git a/f77src/blk20b.h b/f77src/blk20b.h
@@ -10,9 +10,9 @@
      9,XCASFS(3,0:JD,JV,JH),XMGOFS(3,0:JD,JV,JH),XMGCFS(3,0:JD,JV,JH)
      1,XMGHFS(3,0:JD,JV,JH),XMGSFS(3,0:JD,JV,JH),XNACFS(3,0:JD,JV,JH)
      2,XNASFS(3,0:JD,JV,JH),XKASFS(3,0:JD,JV,JH),XH0PFS(3,0:JD,JV,JH)
-     3,XH1PFS(3,0:JD,JV,JH),XH3PFS(3,0:JD,JV,JH),XF1PFS(3,0:JD,JV,JH)
+     3,XH3PFS(3,0:JD,JV,JH),XF1PFS(3,0:JD,JV,JH)
      4,XF2PFS(3,0:JD,JV,JH),XC0PFS(3,0:JD,JV,JH),XC1PFS(3,0:JD,JV,JH)
      5,XC2PFS(3,0:JD,JV,JH),XM1PFS(3,0:JD,JV,JH),XH0BFB(3,0:JD,JV,JH)
-     6,XH1BFB(3,0:JD,JV,JH),XH3BFB(3,0:JD,JV,JH),XF1BFB(3,0:JD,JV,JH)
+     6,XH3BFB(3,0:JD,JV,JH),XF1BFB(3,0:JD,JV,JH)
      7,XF2BFB(3,0:JD,JV,JH),XC0BFB(3,0:JD,JV,JH),XC1BFB(3,0:JD,JV,JH)
      8,XC2BFB(3,0:JD,JV,JH),XM1BFB(3,0:JD,JV,JH)
diff --git a/f77src/blk20c.h b/f77src/blk20c.h
@@ -10,9 +10,9 @@
      9,XCASHS(3,JD,JV,JH),XMGOHS(3,JD,JV,JH),XMGCHS(3,JD,JV,JH)
      1,XMGHHS(3,JD,JV,JH),XMGSHS(3,JD,JV,JH),XNACHS(3,JD,JV,JH)
      2,XNASHS(3,JD,JV,JH),XKASHS(3,JD,JV,JH),XH0PHS(3,JD,JV,JH)
-     3,XH1PHS(3,JD,JV,JH),XH3PHS(3,JD,JV,JH),XF1PHS(3,JD,JV,JH)
+     3,XH3PHS(3,JD,JV,JH),XF1PHS(3,JD,JV,JH)
      4,XF2PHS(3,JD,JV,JH),XC0PHS(3,JD,JV,JH),XC1PHS(3,JD,JV,JH)
      5,XC2PHS(3,JD,JV,JH),XM1PHS(3,JD,JV,JH),XH0BHB(3,JD,JV,JH)
-     6,XH1BHB(3,JD,JV,JH),XH3BHB(3,JD,JV,JH),XF1BHB(3,JD,JV,JH)
+     6,XH3BHB(3,JD,JV,JH),XF1BHB(3,JD,JV,JH)
      7,XF2BHB(3,JD,JV,JH),XC0BHB(3,JD,JV,JH),XC1BHB(3,JD,JV,JH)
      8,XC2BHB(3,JD,JV,JH),XM1BHB(3,JD,JV,JH)
diff --git a/f77src/blk20d.h b/f77src/blk20d.h
@@ -16,3 +16,4 @@
      7,XCAHXS(JZ,JY,JX),XCASXS(JZ,JY,JX),XMGOXS(JZ,JY,JX)
      8,XMGCXS(JZ,JY,JX),XMGHXS(JZ,JY,JX),XMGSXS(JZ,JY,JX)
      9,XNACXS(JZ,JY,JX),XNASXS(JZ,JY,JX),XKASXS(JZ,JY,JX)
+     1,XH1PXS(JZ,JY,JX),XH1BXB(JZ,JY,JX)