nsoilcols control added to setup file

docs/users_guide.tex

@@ -294,6 +294,8 @@ give significant speedup \\
 \hline
 \emph{ns} & Number of layers in soil \\
 \hline
+\emph{nsoilcols} & Number of soil columns (1 - single soil column contacting with the lowest numerical layer (of water or deep ice) only, $>$ 1 - additional soil columns at the bottom slope, contacting with all numerical layers of water, ice and deep ice; morphometry information is necessary in driver file, if \emph{nsoilcols} $>$ 1) \\
+\hline
 \emph{Mice} & Number of layers in bottom ice \\
 \hline
 \emph{d\_surf} & Grid zooming parameter at the surface, n/d \\

setup/Valkea-Kotinen2006_setup.dat

@@ -120,7 +120,7 @@ d_bot  1.E-2
 #----------------------------------------------------------------------------------------
 #
 varalb   0
-PBLpar   4
+PBLpar   1
 waveenh  0
 momflxpart 0
 c_d      -999
@@ -134,6 +134,7 @@ kepsbc   1
 soiltype 5
 soil_depth  10.
 soilswitch  1
+nsoilcols 4
 tricemethhydr 0.
 skin     0
 massflux 0

source/model/init.f90

@@ -15,6 +15,8 @@
  integer(4) :: i !Loop index
  SAVE
 
+ nsoilcols = nsoilcols_%par
+
  allocate (dz_full(1:M), z_full(1:M+1), z_half (1:M), &
  & zsoilcols(1:nsoilcols+1,1:nx,1:ny))
  allocate (ddz(1:M), ddz2(1:M-1), ddz05(0:M), ddz052(2:M-1), ddz054(2:M-1))

source/model/lake_modules.f90

@@ -293,8 +293,8 @@ type, public :: intpar
   character(len=30) :: name
 end type
 
-integer(4), parameter :: numder = 32 ! Number derived-type parameterized handled in unified manner
-integer(4), parameter :: numder_real = 13
+integer(4), parameter :: numder = 33 ! Number derived-type model integer controls  handled in unified manner
+integer(4), parameter :: numder_real = 13 ! The same, but real controls
 
 real(8), parameter :: missing_value = -999.
 
@@ -386,6 +386,7 @@ type(intpar) :: outflpar
 type(intpar) :: ngrid_out
 type(intpar) :: ngridsoil_out
 type(intpar) :: zero_model
+type(intpar) :: nsoilcols_
 
 type(intpar) :: omp
 type(intpar) :: eos
@@ -440,6 +441,7 @@ type(intpar) :: nmeltpoint
 equivalence (dertypepar(30) , eos)
 equivalence (dertypepar(31) , nmeltpoint)
 equivalence (dertypepar(32) , momflxpart)
+equivalence (dertypepar(33) , nsoilcols_)
 
 
 integer(4) :: M ; logical :: ok_M = .false.
@@ -527,6 +529,7 @@ if (firstcall) then
   turb_out%name = 'turb_out' ; 
   scale_output%name = 'scale_output' ; 
   zero_model%name = 'zero_model' ; 
+  nsoilcols_%name = 'nsoilcols' ;
 
   omp%name = 'omp' ; 
   eos%name = 'eos';
@@ -654,7 +657,7 @@ else
   n2 = i - 1
 endif
 
-if (line(n1:n1) /= '#') then
+lineread: if (line(n1:n1) /= '#') then
 
   casecheck = .true.
   do j = 1, numder_real
@@ -832,7 +835,7 @@ if (line(n1:n1) /= '#') then
 
   endif chk
 
-      endif
+endif lineread
 
 END SUBROUTINE READPAR
 
@@ -880,7 +883,7 @@ if (line(n1:n1) /= '#') then
  integer(4), parameter :: water_oxygen_indic = 9
  integer(4), parameter :: water_carbdi_indic = 10
 
-      integer(4), parameter :: nsoilcols = 4 ! Number of soil columns per one lake
+ integer(4), save :: nsoilcols ! Number of soil columns per one lake
 
  integer(4) snow,ice,water,deepice,nstep 
  real(8) time, Erad, dep_av
@@ -1143,49 +1146,6 @@ if (line(n1:n1) /= '#') then
  END MODULE TURB_CONST
 
 
-!      MODULE ASSIM_VAR
-!      use DRIVING_PARAMS
-!      integer n_modvar, n_obsvar, size_mod, size_obs, ntim
-!      
-!      real(8), allocatable:: y_obs(:,:), x_mod(:,:), b_mod(:,:), &
-!      & r_obs(:,:), h_obs(:,:), covar(:,:,:,:), c_diff(:,:,:), &
-!      & RpHBHT(:,:), dep_obs(:,:),y_obs_mean(:),x_mod_mean(:), &
-!      & delta(:)
-!
-!      SAVE
-!     
-!      contains
-!      subroutine alloc_assim_var
-!      n_modvar = 1
-!      n_obsvar = 1
-!      size_mod = (M+1)*n_modvar
-!      size_obs = (M+1)*n_obsvar
-!      
-!      allocate (y_obs(1:ntim, 1:size_obs), &
-!      &          x_mod(1:ntim, 1:size_mod), &
-!      &          dep_obs(1:ntim, 1:size_obs))
-!      allocate (r_obs(1:size_obs, 1:size_obs), &
-!      &          RpHBHT(1:size_obs,1:size_obs), &
-!      &          b_mod(1:size_mod, 1:size_mod), &
-!      &          h_obs(1:size_obs, 1:size_mod))
-!      allocate (c_diff(1:M+1,1:n_obsvar,1:n_obsvar))
-!      allocate (covar(1:M+1, 1:M+1, 1:n_obsvar, 1:n_obsvar))
-!      allocate (y_obs_mean(1:size_obs), &
-!      &          x_mod_mean(1:size_mod), &
-!      &          delta     (1:size_obs))
-!      
-!      y_obs=0.
-!      x_mod=0.
-!      r_obs=0.
-!      b_mod=0. 
-!      h_obs=0.
-!      c_diff=0.
-!      covar=0.
-!      end subroutine alloc_assim_var
-!      
-!      END MODULE ASSIM_VAR
-
-
 MODULE EVOLUTION_VARIABLES
 
 real(8), allocatable, private :: l1_2d(:,:)