Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
LAKE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Andrey Klenin
LAKE
Commits
b231e671
Commit
b231e671
authored
4 years ago
by
Daria Gladskikh
Browse files
Options
Downloads
Patches
Plain Diff
git commit -m "changes in velocities"
parent
27e262ef
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
setup/windforc_setup.dat
+1
-1
1 addition, 1 deletion
setup/windforc_setup.dat
source/model/momentum_mod.f90
+6
-3
6 additions, 3 deletions
source/model/momentum_mod.f90
source/model/turb_mod.f90
+1
-1
1 addition, 1 deletion
source/model/turb_mod.f90
with
8 additions
and
5 deletions
setup/windforc_setup.dat
+
1
−
1
View file @
b231e671
...
@@ -134,7 +134,7 @@ stabfunc 2
...
@@ -134,7 +134,7 @@ stabfunc 2
kepsbc 1
kepsbc 1
soiltype 5
soiltype 5
soil_depth 10.
soil_depth 10.
soilswitch
1
soilswitch
0
nsoilcols 5
nsoilcols 5
tricemethhydr 0.
tricemethhydr 0.
carbon_model 1
carbon_model 1
...
...
This diff is collapsed.
Click to expand it.
source/model/momentum_mod.f90
+
6
−
3
View file @
b231e671
...
@@ -171,6 +171,7 @@ real(kind=4), allocatable :: Amatrix(:,:), rhs(:) !to be passed to lapack routin
...
@@ -171,6 +171,7 @@ real(kind=4), allocatable :: Amatrix(:,:), rhs(:) !to be passed to lapack routin
real
(
kind
=
ireals
)
::
tau_ix
,
tau_iy
real
(
kind
=
ireals
)
::
tau_ix
,
tau_iy
real
(
kind
=
ireals
)
::
Lxi
,
Lxj
,
Lyi
,
Lyj
real
(
kind
=
ireals
)
::
Lxi
,
Lxj
,
Lyi
,
Lyj
real
(
kind
=
ireals
)
::
tau_grx
,
tau_gry
real
(
kind
=
ireals
)
::
tau_grx
,
tau_gry
real
(
kind
=
ireals
)
::
velx_log
,
vely_log
real
(
kind
=
ireals
)
::
time1
,
time2
,
totime
real
(
kind
=
ireals
)
::
time1
,
time2
,
totime
real
(
kind
=
ireals
)
::
scross
,
hydr_radius
,
disch
,
speedav
real
(
kind
=
ireals
)
::
scross
,
hydr_radius
,
disch
,
speedav
real
(
kind
=
ireals
),
allocatable
::
row0_
(:)
real
(
kind
=
ireals
),
allocatable
::
row0_
(:)
...
@@ -334,8 +335,10 @@ endif
...
@@ -334,8 +335,10 @@ endif
!coef2 = g*Cz_gr**(-2)*sqrt(u1(M+1)**2+v1(M+1)**2) !*0.005 !*row0
!coef2 = g*Cz_gr**(-2)*sqrt(u1(M+1)**2+v1(M+1)**2) !*0.005 !*row0
!Bottom momentum exchange coefficient from logarithmic profile
!Bottom momentum exchange coefficient from logarithmic profile
coef2
=
sqrt
(
u1
(
M
+1
)
**
2
+
v1
(
M
+1
)
**
2
)
*
kappa
**
2
/
log
(
h1
*
0.25
*
ddz
(
M
)/
z0_bot
)
**
2
velx_log
=
0.5
*
(
u1
(
M
+1
)
+
u1
(
M
))
velfrict_bot
=
sqrt
(
u1
(
M
+1
)
**
2
+
v1
(
M
+1
)
**
2
)
*
kappa
/
log
(
h1
*
0.25
*
ddz
(
M
)/
z0_bot
)
vely_log
=
0.5
*
(
v1
(
M
+1
)
+
v1
(
M
))
coef2
=
sqrt
(
velx_log
**
2
+
vely_log
**
2
)
*
kappa
**
2
/
log
(
h1
*
0.5
*
ddz
(
M
)/
z0_bot
)
**
2
velfrict_bot
=
sqrt
(
velx_log
**
2
+
vely_log
**
2
)
*
kappa
/
log
(
h1
*
0.5
*
ddz
(
M
)/
z0_bot
)
tau_gr
=
row0
*
velfrict_bot
**
2
tau_gr
=
row0
*
velfrict_bot
**
2
! Friction at the water - upper ice interface
! Friction at the water - upper ice interface
...
@@ -446,7 +449,7 @@ SELECT CASE (Turbpar%par)
...
@@ -446,7 +449,7 @@ SELECT CASE (Turbpar%par)
endif
endif
enddo
enddo
do
i
=
1
,
M
do
i
=
1
,
M
k2
(
i
)
=
0.00632
!max(CE(i)*E1(i)**2/(eps1(i) + ACCk),min_visc) + niu_wat + knum(i)
k2
(
i
)
=
0.00632
!max(CE(i)*E1(i)**2/(eps1(i) + ACCk),min_visc) + niu_wat + knum(i)
!!
end
do
end
do
! 3. Nickuradze (NICK) formulation: Rodi (1993)
! 3. Nickuradze (NICK) formulation: Rodi (1993)
...
...
This diff is collapsed.
Click to expand it.
source/model/turb_mod.f90
+
1
−
1
View file @
b231e671
...
@@ -991,7 +991,7 @@ allocate (rhotemp(1:M), rhosal(1:M))
...
@@ -991,7 +991,7 @@ allocate (rhotemp(1:M), rhosal(1:M))
endif
endif
do
i
=
1
,
M
do
i
=
1
,
M
KT
(
i
)
=
0.00632
*
cw_m_row0
!max(CEt(i)*E2(i)**2/(eps2(i) + ACCk),min_diff)*cw_m_row0 !E2, eps2
KT
(
i
)
=
0.00632
*
cw_m_row0
!max(CEt(i)*E2(i)**2/(eps2(i) + ACCk),min_diff)*cw_m_row0 !E2, eps2
! !
enddo
enddo
! Diagnostic calculation
! Diagnostic calculation
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment