1.Kuiva2014sept setup updated 2. Output and plotting modifications

setup/Kuiva2014sept_driver.dat

@@ -185,9 +185,9 @@ h10         12.5
 #
 ls10        0.
 hs10        0.
-Ts0         3.41
-Tb0         3.97
-Tbb0        4.
+Ts0         15.23
+Tb0         8.96
+Tbb0        8.96
 Tm          3.
 h_ML0       0.
 Sals0       0.

setup/Kuiva2014sept_setup.dat

@@ -162,14 +162,14 @@ deadvol 0.
 #----------------------------------------------------------------------------------------
 #
 T_profile 8
-0.    15.8 0. 0.0012  0.080   2.94E-1
-1.    15.7 0. 0.0012  0.080   2.93E-1
-3.    13.2 0. 0.0013  0.080   2.63E-1
-5.    11.2 0. 0.0016  0.082   2.63E-1
-7.    9.7  0. 0.0010  0.144   2.45E-1
-9.    7.5  0. 0.0023  0.171   2.36E-1
-11.   7.3  0. 0.1076  0.175   2.14E-1
-12.   7.2  0. 0.1513  0.173   2.07E-1
+0.    15.23 0. 0.0012  0.080   2.94E-1
+1.    15.33 0. 0.0012  0.080   2.93E-1
+3.    15.29 0. 0.0013  0.080   2.63E-1
+5.    14.92 0. 0.0016  0.082   2.63E-1
+7.    11.88 0. 0.0010  0.144   2.45E-1
+9.    9.92  0. 0.0023  0.171   2.36E-1
+11.   9.12  0. 0.1076  0.175   2.14E-1
+12.   8.96  0. 0.1513  0.173   2.07E-1
 #.
 #----------------------------------------------------------------------------------------
 #                               BOUNDARY CONDITIONS: TRIBUTARIES AND EFFLUENTS

setup/Kuivajarvi_2012-2013_setup.dat

@@ -153,7 +153,7 @@ sensflux0 100.
 momflux0  1.e-15
 soilbotflx 0.
 cuette 0
-carbon_model 2
+carbon_model 1
 #
 deadvol 0.
 #

source/model/momentum_mod.f90

@@ -2,7 +2,7 @@ MODULE MOMENTUM
 
 use NUMERICS, only : PROGONKA, KRON, MATRIXPROGONKA
 use TURB, only : CE_CANUTO, SMOMENT_GALPERIN
-use NUMERIC_PARAMS, only : vector_length, pi
+use NUMERIC_PARAMS, only : vector_length, pi, small_value
 
 use LAKE_DATATYPES, only : ireals, iintegers
 
@@ -352,7 +352,7 @@ do i=1,M
 ! Ri(i)=min(max(g/row0/(((uv(i+1)-uv(i))/
 ! & (ddz*h1))**2)*(row(i+1)-row(i))/(ddz*h1),-10.d0),10.d0)
   dudz2dvdz2 = max( ( (u1(i+1)-u1(i))/(ddz(i)*h1) )**2 + &
-  & ( (v1(i+1)-v1(i))/(ddz(i)*h1) )**2, 1.d-4)
+  & ( (v1(i+1)-v1(i))/(ddz(i)*h1) )**2, small_value)
   Ri(i) = g/row0*(row(i+1)-row(i))/(ddz(i)*h1)/dudz2dvdz2
 enddo
 

source/model/out_mod.f90

@@ -228,7 +228,7 @@ SUBROUTINE DAY_OUT(ix,iy,nx,ny,year,month,day,hour)
 
 use ARRAYS_GRID, only : dzeta_int
 use ARRAYS_WATERSTATE, only : Tw1, Sal1
-use ARRAYS_TURB, only : E1, eps1, KT
+use ARRAYS_TURB, only : E1, eps1, KT, Ri
 use ARRAYS_BATHYM, only : h1
 use ARRAYS, only : u1, v1
 use DRIVING_PARAMS, only : M
@@ -261,7 +261,7 @@ real(kind=ireals), external :: DZETA
 integer(kind=iintegers), allocatable :: day_old(:,:)
 integer(kind=iintegers) :: i ! Loop index
 integer(kind=iintegers) :: out_unit = lake_day_out_unit_min
-integer(kind=iintegers) :: nvars = 6
+integer(kind=iintegers) :: nvars = 7
 
 character :: month1*2
 character :: year1*4
@@ -293,6 +293,7 @@ var(3,ix,iy,1:M)   = E1  (1:M)
 var(4,ix,iy,1:M)   = eps1(1:M)
 var(5,ix,iy,1:M)   = KT(1:M)/cw_m_row0
 var(6,ix,iy,1:M+1) = sqrt(u1(1:M+1)**2 + v1(1:M+1)**2)
+var(7,ix,iy,1:M)   = Ri(1:M)
 
 accum_var(:,ix,iy,:) = accum_var(:,ix,iy,:) + var(:,ix,iy,:)
 tsteps(ix,iy) = tsteps(ix,iy) + 1.d0
@@ -312,8 +313,9 @@ if (day_old(ix,iy)/=day) then
   write (out_unit,*) '5 - dissipation rate, m**2/s**3'
   write (out_unit,*) '6 - kinematic heat conductance, m**2/s'
   write (out_unit,*) '7 - modulus of horizontal velocity, m/s'
+  write (out_unit,*) '8 - Richardson number, n/d'
   do i = 1, M+1 
-    write (out_unit,'(f12.6,f11.5,5e12.4)') &
+    write (out_unit,'(f12.6,f11.5,6e12.4)') &
     &  -dzeta_int(i)*h1, accum_var(1:nvars,ix,iy,i)
   enddo
   close(out_unit)

tools/plot_contour.py

@@ -28,7 +28,7 @@ nplot = input("Choose a variable to plot \n \
 
 nmod_max = 12 #The last item in the list above, from the modeled data
 
-path = '../results/IseoAugust2011/time_series/' # path to files
+path = '../results/Kuiva2014sept/time_series/' # path to files
 pathobs = os.path.expanduser('/media/victor/main/Files/main/observdata/Iseo/')
 exp = 'base'
 
@@ -36,10 +36,10 @@ exp = 'base'
 nlevplot = 20 # Number of countour levels
 
 #Year, month, ... for the 1-st entry of the time series
-ny = 2010
+ny = 2014
 mdays = 365/12
-nmonth = 1
-nday = 1
+nmonth = 9
+nday = 9
 nhour = 0
 nmin = 0
 timezone = None
@@ -47,7 +47,7 @@ timezone = None
 time_unit = 1. #Time units in input data, expressed in days
 
 # Choose for date-time format of labels on X axis
-time_label_date = False
+time_label_date = True#False
 
 if nplot >= 1 and nplot <= nmod_max:
         time0_date = dtm.datetime(ny,nmonth,nday,nhour,nmin,0,0,timezone)