Merge pull request #34 from tugraskan/1212

1212

.gitignore

@@ -61,3 +61,10 @@ src/main.f90
 ford.md
 /.vs/SWAT_PLUS_DEV
 /.vscode
+/.vs/github/config
+/.vs/github/FileContentIndex
+/.vs/github/v17
+/.vs/launch.vs.json
+/.vs/VSWorkspaceState.json
+/.vs/cmake.db
+/.vs/slnx.sqlite

src/mgt_killop.f90

@@ -35,13 +35,13 @@ subroutine mgt_killop (jj, iplant)
 
       !! add dead roots to soil residue pools
       do ly = 2, soil(j)%nly
-          soil1(j)%rsd(ly) = soil1(j)%rsd(ly) + soil(j)%ly(ly)%rtfr * pl_mass(j)%root(ipl)
-          if (bsn_cc%cswat == 2) then
-            soil1(j)%meta(ly) = soil1(j)%meta(ly) + 0.85 * soil(j)%ly(ly)%rtfr * pl_mass(j)%root(ipl)
-            soil1(j)%str(ly) = soil1(j)%str(ly) + 0.15 * soil(j)%ly(ly)%rtfr * pl_mass(j)%root(ipl)
-            soil1(j)%lig(ly) = soil1(j)%lig(ly) + 0.12 * soil(j)%ly(ly)%rtfr * pl_mass(j)%root(ipl)  ! 0.12 = 0.8 * 0.15 -> lig = 80%str
-          end if
-        end do
+        soil1(j)%rsd(ly) = soil1(j)%rsd(ly) + soil(j)%ly(ly)%rtfr * pl_mass(j)%root(ipl)
+        if (bsn_cc%cswat == 2) then
+          soil1(j)%meta(ly) = soil1(j)%meta(ly) + 0.85 * soil(j)%ly(ly)%rtfr * pl_mass(j)%root(ipl)
+          soil1(j)%str(ly) = soil1(j)%str(ly) + 0.15 * soil(j)%ly(ly)%rtfr * pl_mass(j)%root(ipl)
+          soil1(j)%lig(ly) = soil1(j)%lig(ly) + 0.12 * soil(j)%ly(ly)%rtfr * pl_mass(j)%root(ipl)  ! 0.12 = 0.8 * 0.15 -> lig = 80%str
+        end if
+      end do
 
       !! sum total community masses
       pl_mass(j)%tot_com = pl_mass(j)%tot_com - pl_mass(j)%tot(ipl)

src/mgt_newtillmix.f90

@@ -190,7 +190,7 @@ subroutine mgt_newtillmix (jj, bmix, idtill)
             !  cs_soil(jj)%ly(l)%pest(k) = cs_soil(jj)%ly(l)%pest(k) * frac_non_mixed + smix(20+k) * frac_dep(l)
             !end do
 
-      end do
+          end do
 
         if (bsn_cc%cswat == 1) then
             call mgt_tillfactor(jj,bmix,emix,dtil)

src/organic_mineral_mass_module.f90

@@ -195,8 +195,10 @@ module organic_mineral_mass_module
       !fertilizer object should be used as database input from fert.dat
       type (fertilizer_mass), dimension(:), allocatable :: fert         !dimension to number of fertilzers in database
 
+      type (organic_mass) :: org_frt  !dimension to number of manures in database
+
       !manure object should be used as database input from manure.dat
-      type (organic_mineral_mass), dimension(:), allocatable :: manure  !dimension to number of manures in database
+      type (organic_mass), dimension(:), allocatable :: manure  !dimension to number of manures in database
 
       type organic_mineral_hydrograph
         real :: flo = 0.               !! m^3          |volume of water
@@ -309,15 +311,15 @@ module organic_mineral_mass_module
 
       interface operator (+)
         module procedure pmin_add
-        end interface 
+      end interface 
 
       interface operator (*)
         module procedure nmin_mult_const
       end interface 
 
       interface operator (+)
         module procedure nmin_add
-        end interface 
+      end interface 
 
       interface operator (*)
         module procedure pmin_mult_const

src/output_landscape_init.f90

@@ -436,20 +436,20 @@ subroutine output_landscape_init
             end if
         endif
 
-          if (pco%nb_hru%a == "y") then
-            open (4553,file="hru_scf_aa.txt", recl = 1500)
-            write (4553,*)  bsn%name, prog
-            write (4553,*) hscf_hdr
-            write (4553,*) hscf_hdr_units
-            write (9000,*) "HRU                       hru_scf_aa.txt"
-              if (pco%csvout == "y") then
-                open (4557,file="hru_scf_aa.csv", recl = 1500)
-                write (4557,*)  bsn%name, prog
-                write (4557,'(*(G0.3,:,","))') hscf_hdr
-                write (4557,'(*(G0.3,:,","))') hscf_hdr_units
-                write (9000,*) "HRU                       hru_scf_aa.csv"
-              end if
-          endif
+        if (pco%nb_hru%a == "y") then
+          open (4553,file="hru_scf_aa.txt", recl = 1500)
+          write (4553,*)  bsn%name, prog
+          write (4553,*) hscf_hdr
+          write (4553,*) hscf_hdr_units
+          write (9000,*) "HRU                       hru_scf_aa.txt"
+            if (pco%csvout == "y") then
+              open (4557,file="hru_scf_aa.csv", recl = 1500)
+              write (4557,*)  bsn%name, prog
+              write (4557,'(*(G0.3,:,","))') hscf_hdr
+              write (4557,'(*(G0.3,:,","))') hscf_hdr_units
+              write (9000,*) "HRU                       hru_scf_aa.csv"
+            end if
+        endif
 
  !!!NEW SOIL TRANSFORMATIONS CARBON OUTPUT     
 

src/output_landscape_module.f90

@@ -39,12 +39,12 @@ module output_landscape_module
         real :: satex = 0.            !mm H2O        |saturation excess flow developed from high water table !rtb gwflow
         real :: satex_chan = 0.       !mm H2O        |saturation excess flow reaching main channel !rtb gwflow
         real :: delsw = 0.            !mm H2O        |change in soil water volume !rtb gwflow
-        real :: lagsurf = 0.          !mm H2O        |surface runoff in transit to channel
-        real :: laglatq = 0.          !mm H2O       |lateral flow in transit to channel
-        real :: lagsatex = 0.         !mm H2O       |saturation excess flow in transit to channel
-        real :: wet_evap = 0.         !mm H2O       |evaporation from wetland surface
-        real :: wet_out = 0.          !mm H2O       |outflow (spill) from wetland
-        real :: wet_stor = 0.         !mm H2O       |volume stored in wetland at end of time period
+        real :: lagsurf = 0.		  !mm H2O        |surface runoff in transit to channel
+        real :: laglatq = 0.          !mm H2O	     |lateral flow in transit to channel
+        real :: lagsatex = 0.         !mm H2O	     |saturation excess flow in transit to channel
+        real :: wet_evap = 0.         !mm H2O	     |evaporation from wetland surface
+        real :: wet_out = 0.          !mm H2O	     |outflow (spill) from wetland
+        real :: wet_stor = 0.         !mm H2O	     |volume stored in wetland at end of time period
       end type output_waterbal
 
       type (output_waterbal), pointer :: h