1.river experiment setup modified 2.bugs fixed

docs/users_guide.blg

@@ -2,7 +2,7 @@ This is 8-bit Big BibTeX version 0.99d
 Implementation:  C for Unix
 Release version: 3.71 (18 mar 2013)
 
-Error: cannot open CS file: ../bilbio/utf8cyrillic.csf
+The 8-bit codepage and sorting file: 88591lat.csf
 The top-level auxiliary file: users_guide.aux
 I found no \citation commands---while reading file users_guide.aux
 I found no \bibdata command---while reading file users_guide.aux
@@ -11,8 +11,8 @@ I found no \bibstyle command---while reading file users_guide.aux
 Here's how much of BibTeX's memory you used:
  Cites:                 0 out of 750
  Fields:                0 out of 5000
- Hash table:        10001 out of 10000
- Strings:              81 out of 10000
+ Hash table:        35308 out of 35307
+ Strings:              81 out of 35307
  Free string pool:    479 out of 65000
  Wizard functions:      0 out of 3000
 (There were 3 error messages)

docs/users_guide.log

-This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2019.1.26)  22 SEP 2019 20:16
+This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2019.1.26)  5 APR 2020 14:22
 entering extended mode
  restricted \write18 enabled.
  %&-line parsing enabled.
@@ -310,26 +310,26 @@ Overfull \hbox (14.67734pt too wide) in alignment at lines 222--267
  []
 
 [3]
-Overfull \hbox (14.67734pt too wide) in alignment at lines 267--275
+Overfull \hbox (14.67734pt too wide) in alignment at lines 267--277
  [] [] 
  []
 
 [4]
-Overfull \hbox (14.67734pt too wide) in alignment at lines 281--329
+Overfull \hbox (14.67734pt too wide) in alignment at lines 283--331
  [] [] 
  []
 
 
-Underfull \vbox (badness 10000) detected at line 329
+Underfull \vbox (badness 10000) detected at line 331
  []
 
 
-Overfull \hbox (14.67734pt too wide) in alignment at lines 329--370
+Overfull \hbox (14.67734pt too wide) in alignment at lines 331--372
  [] [] 
  []
 
 [5]
-Overfull \hbox (14.67734pt too wide) in alignment at lines 370--414
+Overfull \hbox (14.67734pt too wide) in alignment at lines 372--416
  [] [] 
  []
 
@@ -337,18 +337,18 @@ Overfull \hbox (14.67734pt too wide) in alignment at lines 370--414
 Missing character: There is no  in font cmr10!
 Missing character: There is no  in font cmr10!
 
-Overfull \hbox (14.67734pt too wide) in alignment at lines 414--459
+Overfull \hbox (14.67734pt too wide) in alignment at lines 416--461
  [] [] 
  []
 
 [7] [8]
-LaTeX Font Info:    Try loading font information for OMS+cmr on input line 486.
+LaTeX Font Info:    Try loading font information for OMS+cmr on input line 488.
 
  (/usr/share/texlive/texmf-dist/tex/latex/base/omscmr.fd
 File: omscmr.fd 2014/09/29 v2.5h Standard LaTeX font definitions
 )
 LaTeX Font Info:    Font shape `OMS/cmr/m/n' in size <10> not available
-(Font)              Font shape `OMS/cmsy/m/n' tried instead on input line 486.
+(Font)              Font shape `OMS/cmsy/m/n' tried instead on input line 488.
  [9]
 (./users_guide.aux) ) 
 Here is how much of TeX's memory you used:
@@ -369,7 +369,7 @@ texmf-dist/fonts/type1/public/amsfonts/cm/cmsl10.pfb></usr/share/texlive/texmf-
 dist/fonts/type1/public/amsfonts/cm/cmsy10.pfb></usr/share/texlive/texmf-dist/f
 onts/type1/public/amsfonts/cm/cmsy7.pfb></usr/share/texlive/texmf-dist/fonts/ty
 pe1/public/amsfonts/cm/cmti10.pfb>
-Output written on users_guide.pdf (9 pages, 162146 bytes).
+Output written on users_guide.pdf (9 pages, 162683 bytes).
 PDF statistics:
  74 PDF objects out of 1000 (max. 8388607)
  52 compressed objects within 1 object stream

docs/users_guide.tex

@@ -160,6 +160,8 @@ in the relevant column of datafile, relevant if input file is ASCII (forc\_forma
 \hline
 \emph{N\_cloud} & The number of coloumn with total cloudiness, fraction \\
 \hline
+\emph{N\_SurfTemp} & The number of coloumn with water surface temperature, K; if not -1, then the surface temperature is used as Dirichlet boundary condition for temperature equation \\
+\hline
 \multicolumn{2}{|c|}{\large{The parameters of time integration}} \\
 \hline
 \emph{year0} & Julian year of initial moment of integration \\

setup/river_driver.dat

@@ -52,7 +52,7 @@ interval    0.5
 rad         1
 #
 N_header_lines  1
-N_coloumns      8
+N_coloumns      10
 #
 N_Year          -1
 N_Month         -1
@@ -66,6 +66,7 @@ N_Pres          3
 N_SWdown        6
 N_LWdown        7
 N_Precip        8
+N_SurfTemp      10
 N_NetRad        -1
 N_SensFlux      -1
 N_LatentFlux    -1

source/model/lake.f90

@@ -535,7 +535,11 @@ precip = precip1
 Sflux0 = Sflux01*(roa0/row0)
 outpath = outpath1
 cloud = cloud1
-SurfTemp = SurfTemp1
+if (SurfTemp1 /= missing_value) then
+  SurfTemp = SurfTemp1 - Kelvin0
+else
+  SurfTemp = missing_value
+endif
 
 hw_input = hw1
 xlew_input = xlew1

source/model/lake_modules.f90

@@ -222,7 +222,7 @@ snmeltwat = 0. ! The fraction of snowmelt transferred to water through cracks in
 
 icetopfr = 1. ! The switch for freezing of water at the ice top
 
-z0_bot = 1.d-3 ! Roughness parameter of bottom surface, m
+z0_bot = 2.d-4 ! Roughness parameter of bottom surface, m
 clin_bot  = 4.E-3 !7.d-5 !7.d-2 !5.d-3 !  Linear friction coefficient at the sloping bottom
 cquad_bot = 8.E-2 !7.E-2 !7.d-5 !7.d-2 !5.d-3 ! Quadratic friction coefficient at the sloping bottom
 

source/model/vertadv_mod.f90

@@ -14,6 +14,7 @@ use ARRAYS_WATERSTATE, only : waterstate_type
 use NUMERICS,          only : SMOOTHER_CONSERV
 use DZETA_MOD,         only : VARMEAN
 use METH_OXYG_CONSTANTS, only : molm3tomgl_o2
+use DRIVING_PARAMS, only : carbon_model
 
 implicit none
 !Input/output variables
@@ -30,6 +31,7 @@ integer(kind=iintegers) :: i
 real   (kind=ireals)    :: dz(0:M+1), x, xx
 logical :: log1, log2
 
+
 ! Updating variables due to vertical advection
 call VERTICAL_ADVECTION(wst%Tw1 )
 call VERTICAL_ADVECTION(wst%Sal1)
@@ -37,11 +39,13 @@ call VERTICAL_ADVECTION(wst%u1  )
 call VERTICAL_ADVECTION(wst%v1  )
 call VERTICAL_ADVECTION(gas%oxyg  (:,1))
 call VERTICAL_ADVECTION(gas%qwater(:,1))
+if (carbon_model%par == 2) then
   call VERTICAL_ADVECTION(gas%DIC   (:,1)) 
   call VERTICAL_ADVECTION(gas%DOC   (:,1))!autochtonous DOC
   call VERTICAL_ADVECTION(gas%DOC   (:,2))!allochtonous DOC
   call VERTICAL_ADVECTION(gas%POCL       )
   call VERTICAL_ADVECTION(gas%POCD       )
+endif
 call VERTICAL_ADVECTION(gas%phosph     )
 
 !! Conservative filtering