Merge rev591_vanilla

Conflicts:
	src/allocate_parms.f

Author: mlt

src/etact.f

@@ -128,7 +128,7 @@ subroutine etact
 !! method is used to calculate surface runoff. The curve number methods
 !! take canopy effects into account in the equations. For either of the
 !! CN methods, canstor will always equal zero.
-      pet = pet - canstor(j)
+      pet = pet - canev
       if (pet < 0.) then
         canstor(j) = -pet
         canev = pet_day

src/harvestop.f

@@ -419,7 +419,7 @@ subroutine harvestop
         if (laiday(j) < alai_min(idplt(j))) then   !Sue
           laiday(j) = alai_min(idplt(j))
         end if
-        if (phuacc(j) < .999) phuacc(j) = phuacc(j) * (1. - ff3)  
+        phuacc(j) = phuacc(j) * (1. - ff3)  
         rwt(j) = .4 - .2 * phuacc(j)        
       else
         bio_ms(j) = 0.

src/main.f

@@ -54,11 +54,11 @@ program main
 
       use parm
       implicit none
-      prog = "SWAT Feb 21 2013    VER 2012/Rev 588"
+      prog = "SWAT Apr 12 2013    VER 2012/Rev 591"
 
       write (*,1000)
  1000 format(1x,"               SWAT2012               ",/,             &
-     &          "               Rev. 588               ",/,             &
+     &          "               Rev. 591               ",/,             &
      &          "      Soil & Water Assessment Tool    ",/,             &
      &          "               PC Version             ",/,             &
      &          " Program reading from file.cio . . . executing",/)

src/newtillmix.f

@@ -7,7 +7,7 @@ subroutine newtillmix(jj,bmix)
 !!    Mixing was extended to all layers
 !!    A subroutine to simulate stimulation of organic matter decomposition was added
 !!    March 2009: testing has been minimal and further adjustments are expected
-!!    use with caution and report anomalous results to akemanian@brc.tamus.edu and jeff.arnold@ars.usda.edu
+!!    use with caution 
 
 !!    ~ ~ ~ INCOMING VARIABLES ~ ~ ~
 !!    name          |units         |definition

src/pmeas.f

@@ -302,4 +302,4 @@ subroutine pmeas
  5300 format (9x,a1)
  5400 format (10x,"ERROR: Precipitation data dates do not match for",   &
      &       " simulation year: ",i4," and julian date: ",i3)
-      end
+      end

src/readsub.f

@@ -378,13 +378,14 @@ subroutine readsub
 !!      endif
       
 !!    set default values
-!!    set default values
-      if (re(ihru) <= 0.) re(ihru) = re_bsn
-	if (sdrain(ihru) <= 0.) sdrain(ihru) = sdrain_bsn
-	if (drain_co(ihru) <= 0.) drain_co(ihru) = drain_co_bsn
-	if (pc(ihru) <= 0.) pc(ihru) = pc_bsn
-	if (latksatf(ihru) <= 0.) latksatf(ihru) = latksatf_bsn	
-	if (sstmaxd(ihru) <= 0.) sstmaxd(ihru) = sstmaxd_bsn	
+      do ihru = jj, hrutot(i)
+        if (re(ihru) <= 0.) re(ihru) = re_bsn
+	  if (sdrain(ihru) <= 0.) sdrain(ihru) = sdrain_bsn
+	  if (drain_co(ihru) <= 0.) drain_co(ihru) = drain_co_bsn
+	  if (pc(ihru) <= 0.) pc(ihru) = pc_bsn
+        if (latksatf(ihru) <= 0.) latksatf(ihru) = latksatf_bsn	
+	  if (sstmaxd(ihru) <= 0.) sstmaxd(ihru) = sstmaxd_bsn
+      end do
       !     estimate drainage area for urban on-line bmps in square km
       !subdr_km(i) = subdr_km(i) + sub_km(i)
 

src/res.f

@@ -155,11 +155,6 @@ subroutine res
             resflwo = res_out(jres,i_mo,curyr)
           !! This will override the measured outflow! This is just a check 
           !! should really calibrate inflow or check res volumes
-            ndespill = ndtargr(nres)
-            if (ndespill <= 0.) ndespill = 10.
-            if (res_vol(jres) > res_evol(jres)) then
-              resflwo = resflwo+(res_vol(jres)-res_evol(jres))/ndespill
-            endif
 
           case (2)                   !! controlled outflow-target release
             targ = 0.
@@ -208,6 +203,12 @@ subroutine res
             if (resflwo < oflowmn_fps(jres)) resflwo = oflowmn_fps(jres)
 
         end select
+          
+            ndespill = ndtargr(nres)
+            if (ndespill <= 0.) ndespill = 10.
+            if (res_vol(jres) > res_evol(jres)) then
+              resflwo = resflwo+(res_vol(jres)-res_evol(jres))/ndespill
+            endif
 
 !! if reservoir volume is zero
       if (res_vol(jres) < 0.001) then

src/writeaa.f

@@ -349,7 +349,7 @@ subroutine writeaa
       aairr = aairr / yrs
       do j = 1, nhru
         do nicr = 1, mcrhru(j)
-          if (ncrops(nicr,j) > 0) then
+          if (ncrops(nicr,j) > 0) then            
             yldn(nicr,j) = yldkg(nicr,j) /  ncrops(nicr,j)
             bio_aahv(nicr,j) = bio_hv(nicr,j) / ncrops(nicr,j)  
           else