Update to 2012Rev535

Author: crazyzlj

VERSIONS

@@ -1,3 +1,3 @@
-VERSION_MAJOR 2009
-VERSION_MINOR 528
+VERSION_MAJOR 2012
+VERSION_MINOR 535
 VERSION_PATCH

src/allocate_parms.f

@@ -976,8 +976,6 @@ subroutine allocate_parms
       allocate (hrupest(mhru))
       allocate (hvstiadj(mhru))
       allocate (iafrttyp(mhru))
-      !! burns 3/5/09
-      allocate (i_burn(mhru))
       allocate (icont(20,mhru))
       allocate (icfrt(mhru))
       allocate (icpst(mhru))

src/anfert.f

@@ -285,17 +285,19 @@ subroutine anfert
          wshd_fminp = wshd_fminp + dwfert * tfp * hru_dafr(j)
          wshd_forgp = wshd_forgp + dwfert * forgp(ifrt) * hru_dafr(j)
         end if
-
-      endif
-      
-      if (imgt == 1) then
+        
+        if (imgt == 1) then
               write (143, 1000) subnum(j), hruno(j), iyr, i_mo, iida, 
      *        "         ",
      *        "AUTOFERT", phubase(j), phuacc(j), sol_sw(j),bio_ms(j), 
      *        sol_rsd(1,j),sol_sumno3(j),sol_sumsolp(j), dwfert,
-     *        fertno3, fertnh3, fertorgn, fertsolp, fertorgp
-      end if
-1000  format (a5,1x,a7,3i6,2a15,7f10.2,20x,f10.2,10x,5f10.2) 
+     *        fertno3, fertnh3, fertorgn, fertsolp, fertorgp            
+        end if
+      
+      endif
+      
+
+1000  format (a5,1x,a4,3i6,2a15,7f10.2,20x,f10.2,10x,5f10.2) 
 
       return
       end subroutine

src/apply.f

@@ -104,7 +104,7 @@ subroutine apply
            exit
          endif
        else
-          if (pst_dep(npest(j),j) > sol_z((nly-1),j) .and.                &     
+          if (pst_dep(npest(j),j) > sol_z((nly-1),j) .and.              &
      &                 pst_dep(npest(j),j) < sol_z(nly,j)) then
              sol_pst(k,j,nly) = sol_pst(k,j,nly) + xx
            exit

src/autoirr.f

@@ -194,7 +194,7 @@ subroutine autoirr
 
 !! changed format below     
 !!1000  format (a5,1x,a7,3i6,2a15,7f10.2,10x,f10.2,70x,f10.2) 
-1000  format (a5,1x,a7,3i6,2a15,7f10.2,10x,f10.2,70x,i10,10x,i10) 
+1000  format (a5,1x,a4,3i6,2a15,7f10.2,10x,f10.2,70x,i10,10x,i10) 
 
       return
       end

src/burnop.f

@@ -8,7 +8,6 @@ subroutine burnop
 !!    ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
 !!    ibrn        |none          |counter in readmgt 
 !!    iburn(:     |julian date   |date of burning  
-!!    i_burn      |none          |counter that tracks curent burn operation  
 !!    burn_frlb   |none          |fraction of biomass and residue that burn(input in
 !!                               |management file) range (0 - 1.0)                         
 !!    nro         |none          |sequence number of year in rotation
@@ -36,8 +35,6 @@ subroutine burnop
       sol_fon(1,j) = sol_fon(1,j) * xx
       sol_aorgn(1,j) = sol_aorgn(1,j) * xx
       sol_orgn(1,j) = sol_orgn(1,j) * xx
-  !     sol_fop - remains after burn
-      i_burn(j) = i_burn(j) + 1      
-
+   
       return
       end

src/confert.f

@@ -259,6 +259,6 @@ subroutine confert
         ncf(j) = ncf(j) + 1
       end if
 
-1000  format (a5,1x,a7,3i6,2a15,7f10.2,20x,f10.2)
+1000  format (a5,1x,a4,3i6,2a15,7f10.2,20x,f10.2)
       return
       end

src/dormant.f

@@ -148,9 +148,9 @@ subroutine dormant
             plantp(j) = (1. - bm_dieoff(idplt(j))) *                    &
      &         plantp(j)
             strsw(j) = 1.
-            laiday(j) = alai_min(idplt(j))
-            phuacc(j) = 0.
-            ncrops(icr(j),j) = ncrops(icr(j),j) + 1
+!            laiday(j) = alai_min(idplt(j))
+!            phuacc(j) = 0.
+!            ncrops(icr(j),j) = ncrops(icr(j),j) + 1
 
           !! beginning of cool season annual dormant period
           case (2, 5)
@@ -181,6 +181,7 @@ subroutine dormant
             !! end of cool season annual dormant period
             case (2, 5)
               idorm(j) = 0
+              phuacc(j) = 0.
 
             end select
 
@@ -193,6 +194,6 @@ subroutine dormant
 
         end if
 
-1000  format (a5,1x,a7,3i6,2a15,7f10.2)
+1000  format (a5,1x,a4,3i6,2a15,7f10.2)
       return
       end

src/filtw.f

@@ -127,6 +127,11 @@ subroutine filtw
       sedminps(j) = sedminps(j) * (1. - trapeff(j))
       surqsolp(j) = surqsolp(j) * (1. - trapeff(j))
       sedyld(j) = sedyld(j) * (1. - trapeff(j))
+      sanyld(j) = sanyld(j) * (1. - trapeff(j))
+      silyld(j) = silyld(j) * (1. - trapeff(j))
+      clayld(j) = clayld(j) * (1. - trapeff(j))
+      sagyld(j) = sagyld(j) * (1. - trapeff(j))
+      lagyld(j) = lagyld(j) * (1. - trapeff(j))
       if (hrupest(j) == 1) then
         do k = 1, npmx
           pst_surq(k,j) = pst_surq(k,j) * (1. - trapeff(j))

src/headout.f

@@ -66,16 +66,11 @@ subroutine headout
       if (ipdvas(1) > 0) then
         if (icalen == 0) write (28,1020) (heds(ipdvas(j)), j = 1, itots) !!custom printout
         if (icalen == 1) write (28,1021) (heds(ipdvas(j)), j = 1, itots) !!custom printout
-1021  format (//'LULC  HRU          GIS  SUB  MGT MO DA   YR',          &
-     &'   AREAkm2', 76(a10))	   
 	else
         if (icalen == 0) write (28,1020) (heds(j), j = 1, mhruo)         !!default printout
-	  if (icalen == 1) write (28,1021) (heds(j), j = 1, mhruo)         !!default printout
-	  
+	  if (icalen == 1) write (28,1021) (heds(j), j = 1, mhruo)         !!default printout	  
       endif
 
-
-
 !! write headings to HRU output file (output2.hru)
       if (isproj == 1) then
         write (21,1000)prog, values(2), values(3), values(1), values(5), &
@@ -231,16 +226,18 @@ subroutine headout
       return
  1000 format ('1',/t5,a80,t105,2(i2,'/'),i4,5x,2(i2,':'),i2)
  1010 format (/(t5,20a4))
- 1020 format (//'LULC  HRU          GIS  SUB  MGT  MON','   AREAkm2',
-     * 76(a10))
+ 1020 format (//'LULC  HRU       GIS  SUB  MGT  MON','   AREAkm2',
+     * 76(a10),"    GISnum")
+ 1021  format (//'LULC  HRU       GIS  SUB  MGT MO DA   YR',            &
+     &'   AREAkm2', 76(a10))	   
  1030 format (//6x,' SUB      GIS  MON   AREAkm2',22(a10))
  1040 format (//7x,'RCH      GIS   MON     AREAkm2',56a12)
  1041 format (//7x,'RCH      GIS   DAY   DET     AREAkm2',45a12)    
  1050 format (//6x,'     RES  MON',41a12)
  1060 format (//6x,'RCH GIS  MON',26a12)
  2000 format (a12,12x,i4,4x,i4)
  3000 format ("Pesticide loadings to main channel by HRU",/)
- 3001 format ("Pesticide #",250(13x,i3,1x))
+ 3001 format ("Pesticide #",250(18x,i3,1x))
  3002 format ("Pesticide name:      ",250(a16,1x))
- 3003 format (2x,'HRU YEAR MON',7x,125(a26,8x))
+ 3003 format (4x,'GISnum YEAR MON',7x,125(a26,8x))
       end