Skip to content
Snippets Groups Projects
Commit 1088f32e authored by Victor Stepanenko's avatar Victor Stepanenko
Browse files

1.Bugs fixed in k-epsilon closure (related to minimal values) 2.Constant... 

1.Bugs fixed in k-epsilon closure (related to minimal values) 2.Constant pressure gradient option added
parent ce28d9dc
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 80 additions and 44 deletions
docs/users_guide.log
+ 11
− 5
View file @ 1088f32e
This is pdfTeX, Version 3.14159265-2.6-1.40.18 (TeX Live 2017/Debian) (preloaded format=pdflatex 2020.8.10) 12 OCT 2020 09:46
This is pdfTeX, Version 3.14159265-2.6-1.40.18 (TeX Live 2017/Debian) (preloaded format=pdflatex 2020.8.10) 15 NOV 2020 22:46
entering extended mode
restricted \write18 enabled.
%&-line parsing enabled.
......@@ -328,6 +328,12 @@ Overfull \hbox (14.67734pt too wide) in alignment at lines 331--372
[]
[5]
Underfull \hbox (badness 2065) in paragraph at lines 375--376
[]|\OT1/cmr/m/n/10 Constant lon-gi-tu-di-nal pres-sure gra-di-ent, N/m$[]$, rel
-e-vant if
[]
Overfull \hbox (14.67734pt too wide) in alignment at lines 372--416
[] []
[]
......@@ -338,7 +344,7 @@ Overfull \hbox (14.67734pt too wide) in alignment at lines 416--461
[]
[7]
Overfull \hbox (14.67734pt too wide) in alignment at lines 461--465
Overfull \hbox (14.67734pt too wide) in alignment at lines 461--467
[] []
[]
......@@ -346,14 +352,14 @@ Overfull \hbox (14.67734pt too wide) in alignment at lines 461--465
Underfull \vbox (badness 10000) has occurred while \output is active []
[8]
LaTeX Font Info: Try loading font information for OMS+cmr on input line 492.
LaTeX Font Info: Try loading font information for OMS+cmr on input line 494.
(/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 492.
(Font) Font shape `OMS/cmsy/m/n' tried instead on input line 494.
[9] (./users_guide.aux) )
Here is how much of TeX's memory you used:
3926 strings out of 492982
......@@ -373,7 +379,7 @@ live/texmf-dist/fonts/type1/public/amsfonts/cm/cmsl10.pfb></usr/share/texlive/t
exmf-dist/fonts/type1/public/amsfonts/cm/cmsy10.pfb></usr/share/texlive/texmf-d
ist/fonts/type1/public/amsfonts/cm/cmsy7.pfb></usr/share/texlive/texmf-dist/fon
ts/type1/public/amsfonts/cm/cmti10.pfb>
Output written on users_guide.pdf (9 pages, 162451 bytes).
Output written on users_guide.pdf (9 pages, 163097 bytes).
PDF statistics:
74 PDF objects out of 1000 (max. 8388607)
52 compressed objects within 1 object stream
......
docs/users_guide.pdf
+ 0
− 0
View file @ 1088f32e
No preview for this file type
docs/users_guide.synctex.gz
+ 0
− 0
View file @ 1088f32e
No preview for this file type
docs/users_guide.tex
+ 3
− 1
View file @ 1088f32e
......@@ -370,7 +370,9 @@ give significant speedup \\
\hline
\emph{salsoil} & Switch for salinity transport in soil: 0 - off (zero flux at the bottom), 1 - on \\
\hline
\emph{dyn\_pgrad} & Dynamic pressure gradient: 0 -- off, 1 -- barotropic pressure gradient, 2 -- two-layer approximation for pressure gradient, 3 -- multilayer model for pressure gradient, 4 -- multilayer model for pressure gradient with automatic layer identification, 5 -- river case: pressure gradient is found from Manning's formula \\
\emph{dyn\_pgrad} & Dynamic pressure gradient: 0 -- off, 1 -- barotropic pressure gradient, 2 -- two-layer approximation for pressure gradient, 3 -- multilayer model for pressure gradient, 4 -- multilayer model for pressure gradient with automatic layer identification, 5 -- river case: pressure gradient is found from Manning's formula, 6 -- pressure gradient is given by constant value after \emph{pgrad} keyword \\
\hline
\emph{pgrad} & Constant longitudinal pressure gradient, N/m$^3$, relevant if \emph{dyn\_pgrad}=6 \\
\hline
\emph{botfric} & The law for friction at the sloping bottom: 0 - no bottom friction, 1 - linear friction, 2 - quadratic friction \\
\hline
......
setup/cuette_driver.dat
+ 7
− 2
View file @ 1088f32e
......@@ -71,6 +71,8 @@ N_LatentFlux -1
N_Ustar -1
N_surfrad -1
N_cloud -1
N_NetRad -1
N_SurfTemp -1
#
#-----------------------------------------------------------------------------------------
# TIME INTEGRATION PARAMETERS
......@@ -95,8 +97,10 @@ hour0 0.
tinteg 35
spinup_times 0
spinup_period 0
dt 10
dt 10.
call_Flake 0
cp_period 0.
control_point 0
#
#----------------------------------------------------------------------------------------
# PHYSICAL PARAMETERS
......@@ -167,7 +171,7 @@ fetch 410.
#-----------------------------------------------------------------------------------------
#
l10 0.
h10 12.5
h10 10.
#h10 3.
#select_h10 3
#1 1.2
......@@ -210,6 +214,7 @@ init_T 1
#
area_lake 638095.
cellipt 10.
lakeform 2
trib_inflow -9999.
effl_outflow 1
0. 0. 0.
......
setup/cuette_setup.dat
+ 39
− 25
View file @ 1088f32e
......@@ -127,6 +127,7 @@ c_d -999
kwe 100.
relwind 0
eos 1
lindens 0
nmeltpoint 1
Turbpar 2
stabfunc 2
......@@ -134,14 +135,22 @@ kepsbc 1
soiltype 5
soil_depth 10.
soilswitch 0
salsoil 0
saltice 0
nsoilcols 1
tricemethhydr 0.
carbon_model 1
skin 0
massflux 0
ifrad 0
ifbubble 1
sedim 0
dyn_pgrad 0
pgrad 0.
nManning 2.5E-2
horvisc 0.
backdiff 0
botfric 2
zero_model 0
thermokarst_meth_prod 0.
soil_meth_prod 1.
......@@ -159,14 +168,17 @@ deadvol 0.
#----------------------------------------------------------------------------------------
#
T_profile 8
0.2 3.410 0. 1.03E-3 1.76E-1 2.77E-1
1. 3.520 0. 1.18E-3 1.95E-1 2.81E-1
3. 3.540 0. 1.41E-3 1.80E-1 2.77E-1
5. 3.660 0. 1.72E-3 1.87E-1 2.75E-1
7. 3.540 0. 2.07E-3 1.87E-1 2.79E-1
9. 3.480 0. 1.91E-3 1.89E-1 2.73E-1
11. 3.490 0. 7.32E-3 1.99E-1 2.66E-1
12. 3.970 0. 14.88E-3 2.04E-1 2.63E-1
0.2 3.410 0. 1.03E-3 1.76E-1 2.77E-1 0. 0.
1. 3.520 0. 1.18E-3 1.95E-1 2.81E-1 0. 0.
3. 3.540 0. 1.41E-3 1.80E-1 2.77E-1 0. 0.
5. 3.660 0. 1.72E-3 1.87E-1 2.75E-1 0. 0.
7. 3.540 0. 2.07E-3 1.87E-1 2.79E-1 0. 0.
9. 3.480 0. 1.91E-3 1.89E-1 2.73E-1 0. 0.
11. 3.490 0. 7.32E-3 1.99E-1 2.66E-1 0. 0.
12. 3.970 0. 14.88E-3 2.04E-1 2.63E-1 0. 0.
T_soilprofile 2
0. 4.
10. 4.
#.
#----------------------------------------------------------------------------------------
# BOUNDARY CONDITIONS: TRIBUTARIES AND EFFLUENTS
......@@ -187,6 +199,9 @@ T_profile 8
#
#
tribheat 0
N_triblev -1
N_tribin -1
iefflloc -1
#inflowprof
#1 100. 0. 8.
#2 100. 0. 8.
......@@ -403,24 +418,23 @@ nscreen 1000
scale_output 0
accum_begin 2003060100
accum_end 2004060100
zserout -999.
rtemp 1
-999. -999. -999.
#
#ngrid_out 16
#0.2
#0.5
#1.
#1.5
#2.
#2.5
#3.
#3.5
#4.
#4.5
#5.
#6.
#7.
#8.
#10.
#12.
ngrid_out 12
0.5
1.
2.
3.
4.
5.
6.
7.
8.
9.
9.5
10.
#
ngridsoil_out 11
0.
......
source/model/driving_params_mod.f90
+ 4
− 1
View file @ 1088f32e
......@@ -25,7 +25,7 @@ type, public :: intpar
end type
integer(kind=iintegers), parameter :: numder = 42 ! Number derived-type model integer controls handled in unified manner
integer(kind=iintegers), parameter :: numder_real = 16 ! The same, but real controls
integer(kind=iintegers), parameter :: numder_real = 17 ! The same, but real controls
real(kind=ireals), parameter :: missing_value = -999.
......@@ -62,6 +62,7 @@ type(realpar), target :: c_d
type(realpar), target :: nManning
type(realpar), target :: horvisc
type(realpar), target :: zserout
type(realpar), target :: pgrad
real(kind=ireals) :: dttribupdate = missing_value
......@@ -230,6 +231,7 @@ if (firstcall) then
dertypepar_real(14)%p => nManning
dertypepar_real(15)%p => horvisc
dertypepar_real(16)%p => zserout
dertypepar_real(17)%p => pgrad
dertypepar(1)%p => stabfunc
dertypepar(2)%p => tribheat
......@@ -291,6 +293,7 @@ if (firstcall) then
nManning%name = 'nManning'
horvisc%name = 'horvisc'
zserout%name = 'zserout'
pgrad%name = 'pgrad'
stabfunc%name = 'stabfunc' ;
......
source/model/momentum_mod.f90
+ 6
− 2
View file @ 1088f32e
......@@ -27,7 +27,7 @@ use ATMOS, only : &
use DRIVING_PARAMS, only : &
& momflxpart, &
& dyn_pgrad, &
& dyn_pgrad, pgrad, &
& Turbpar, &
& stabfunc, &
& relwind, &
......@@ -1085,7 +1085,11 @@ bctop : if (cuette%par == 0 .or. cuette%par == 11) then
disch = sum(disch_tribin(:,:))
speedav = disch/scross
alphax = 180./pi*(speedav**2*nManning%par**2/(hydr_radius**4./3.) - &
& taux/(row0*h1*g))
& taux/(row0*h1*g)) !assuming small slope
endif
if (dyn_pgrad%par == 6) then
alphax = 180./pi*pgrad%par/(row0*g) !assuming small angle
endif
do i = 1, 2
......
source/model/turb_mod.f90
+ 10
− 8
View file @ 1088f32e
......@@ -189,7 +189,7 @@ real(kind=ireals) :: Esurf1(1:2), Esurf2(1:2)
real(kind=ireals) :: ceps3
real(kind=ireals) :: vdamp
real(kind=ireals) :: dE_it_max, deps_it_max
real(kind=ireals) :: E_min, E_min_lamw0, E_min_Racr, eps_min
real(kind=ireals) :: E_min, E_min_lamw0, E_min_Racr, eps_min, eps_min0
real(kind=ireals) :: Buoyancy1, dBdz0, z0, bvf2
real(kind=ireals) :: Eseiches_diss
......@@ -274,13 +274,12 @@ firstcall_if : if (firstcall) then
z0 = 1.d-2
eps_min = 1.d-12 ! The range for dissipation rate values
eps_min0 = 1.d-12 ! The range for dissipation rate values
! 10**(-11) - 10**(-6) m**2/s**3 (Wuest and Lorke, 2003)
E_min_lamw0 = sqrt(eps_min*1.E-5*lamw0*(cw_m_row0*CEt0)**(-1) ) ! This expression ensures that
E_min_lamw0 = sqrt(eps_min0*1.E-5*lamw0*(cw_m_row0*CEt0)**(-1) ) ! This expression ensures that
! eddy diffusivity in the decaying
! turbulence (E -> Emin, eps -> eps_min)
! is much less than the molecular diffusivity
dE_it_max = 1.d-11 !1.d-9
deps_it_max = 1.d-15 !1.d-12
......@@ -329,6 +328,9 @@ if (l1 > 0._ireals) then
E_min_Racr = eps_min*(maxval(ddz)*h1)**2*(CEt0*Racr*niu_wat*lamw0/cw_m_row0)**(-0.5)
!E_min = max(E_min_lamw0,E_min_Racr)
E_min = E_min_Racr
else
eps_min = eps_min0
E_min = E_min_lamw0
endif
dt05 = 0.5d0*dt
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment