Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
G
getm
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Knut Klingbeil
getm
Commits
3901528a
Commit
3901528a
authored
Mar 19, 2012
by
Karsten Bolding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed trailing blanks
parent
93119d2a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
18 additions
and
18 deletions
+18
-18
src/3d/bdy_3d.F90
src/3d/bdy_3d.F90
+1
-1
src/3d/dynamic_allocations_3d.h
src/3d/dynamic_allocations_3d.h
+1
-1
src/3d/physical_mixing.F90
src/3d/physical_mixing.F90
+5
-5
src/3d/uv_advect_3d.F90
src/3d/uv_advect_3d.F90
+7
-7
src/3d/variables_3d.F90
src/3d/variables_3d.F90
+2
-2
src/domain/domain.F90
src/domain/domain.F90
+1
-1
src/ncdf/init_mean_ncdf.F90
src/ncdf/init_mean_ncdf.F90
+1
-1
No files found.
src/3d/bdy_3d.F90
View file @
3901528a
...
...
@@ -454,7 +454,7 @@
#endif
#ifdef _FABM_
if
(
allocated
(
fabm_pel
)
)
then
fabm_pel
(
i
,
j
,:,:)
=
fabm_pel
(
i
,
j
+1
,:,:)
fabm_pel
(
i
,
j
,:,:)
=
fabm_pel
(
i
,
j
+1
,:,:)
fabm_ben
(
i
,
j
,:)
=
fabm_ben
(
i
,
j
+1
,:)
end
if
#endif
...
...
src/3d/dynamic_allocations_3d.h
View file @
3901528a
...
...
@@ -50,7 +50,7 @@
allocate
(
ipg_v
(
I3DFIELD
),
stat
=
rc
)
!
3
D
field
for
ipg_v
if
(
rc
/=
0
)
stop
'
init_3d
:
Error
allocating
memory
(
ipg_v
)
'
#endif
#ifdef STRUCTURE_FRICTION
...
...
src/3d/physical_mixing.F90
View file @
3901528a
...
...
@@ -10,7 +10,7 @@
! !DESCRIPTION:
!
! Here, the physical tracer variance decay for the tracer $F$,
! ${ D}^{\mbox{\scriptsize phys}}\left(\langle F \rangle^2 \right)$,
! ${ D}^{\mbox{\scriptsize phys}}\left(\langle F \rangle^2 \right)$,
! due to horizontal and vertical
! mixing is calculated as proposed in \cite{BURCHARDea08b}:
! \begin{equation}
...
...
@@ -59,7 +59,7 @@
do
j
=
jmin
,
jmax
do
i
=
imin
-1
,
imax
if
(
au
(
i
,
j
)
.gt.
0
)
then
aux
(
i
,
j
,
k
)
=
_
TWO_
*
AH
*
((
F
(
i
+1
,
j
,
k
)
-
F
(
i
,
j
,
k
))/
DXU
)
**
2
aux
(
i
,
j
,
k
)
=
_
TWO_
*
AH
*
((
F
(
i
+1
,
j
,
k
)
-
F
(
i
,
j
,
k
))/
DXU
)
**
2
else
aux
(
i
,
j
,
k
)
=
_
ZERO_
end
if
...
...
@@ -69,7 +69,7 @@
do
k
=
1
,
kmax
do
j
=
jmin
,
jmax
do
i
=
imin
,
imax
pm3d
(
i
,
j
,
k
)
=
pm3d
(
i
,
j
,
k
)
+
_
HALF_
*
(
aux
(
i
,
j
,
k
)
+
aux
(
i
-1
,
j
,
k
))
pm3d
(
i
,
j
,
k
)
=
pm3d
(
i
,
j
,
k
)
+
_
HALF_
*
(
aux
(
i
,
j
,
k
)
+
aux
(
i
-1
,
j
,
k
))
end
do
end
do
end
do
...
...
@@ -78,7 +78,7 @@
do
j
=
jmin
-1
,
jmax
do
i
=
imin
,
imax
if
(
av
(
i
,
j
)
.gt.
0
)
then
aux
(
i
,
j
,
k
)
=
_
TWO_
*
AH
*
((
F
(
i
,
j
+1
,
k
)
-
F
(
i
,
j
,
k
))/
DYV
)
**
2
aux
(
i
,
j
,
k
)
=
_
TWO_
*
AH
*
((
F
(
i
,
j
+1
,
k
)
-
F
(
i
,
j
,
k
))/
DYV
)
**
2
else
aux
(
i
,
j
,
k
)
=
_
ZERO_
end
if
...
...
@@ -88,7 +88,7 @@
do
k
=
1
,
kmax
do
j
=
jmin
,
jmax
do
i
=
imin
,
imax
pm3d
(
i
,
j
,
k
)
=
pm3d
(
i
,
j
,
k
)
+
_
HALF_
*
(
aux
(
i
,
j
,
k
)
+
aux
(
i
,
j
-1
,
k
))
pm3d
(
i
,
j
,
k
)
=
pm3d
(
i
,
j
,
k
)
+
_
HALF_
*
(
aux
(
i
,
j
,
k
)
+
aux
(
i
,
j
-1
,
k
))
end
do
end
do
end
do
...
...
src/3d/uv_advect_3d.F90
View file @
3901528a
...
...
@@ -247,7 +247,7 @@
! advective fluxes resulting from the continuity equation
! (\ref{ContiLayerInt}). Continuity will
! still be retained due to the linearity of the continuity equation.
!
!
! \paragraph{Numerical dissipation.}\label{uvadvect-dissipation}
!
! For the directional split method, numerical dissipation is calculated
...
...
@@ -388,15 +388,15 @@
call
toc
(
TIM_UVADV3DH
)
if
(
do_numerical_analyses
)
then
do
k
=
1
,
kmax
! calculate square of u-velocity before advection step
do
k
=
1
,
kmax
! calculate square of u-velocity before advection step
do
j
=
jmin
-
HALO
,
jmax
+
HALO
do
i
=
imin
-
HALO
,
imax
+
HALO
vel2
(
i
,
j
,
k
)
=
uuEx
(
i
,
j
,
k
)
**
2
vel2
(
i
,
j
,
k
)
=
uuEx
(
i
,
j
,
k
)
**
2
end
do
end
do
end
do
vel2o
=
vel2
end
if
end
if
call
do_advection_3d
(
dt
,
uuEx
,
uadv
,
vadv
,
wadv
,
huadv
,
hvadv
,
hoadv
,
hnadv
,&
dxuadv
,
dxvadv
,
dyuadv
,
dyvadv
,
area_inv
,
&
...
...
@@ -430,7 +430,7 @@
end
do
end
do
end
if
!$OMP PARALLEL DEFAULT(SHARED) PRIVATE(i,j,k)
...
...
@@ -505,10 +505,10 @@
call
toc
(
TIM_UVADV3DH
)
if
(
do_numerical_analyses
)
then
do
k
=
1
,
kmax
! calculate square of v-velocity before advection step
do
k
=
1
,
kmax
! calculate square of v-velocity before advection step
do
j
=
jmin
-
HALO
,
jmax
+
HALO
do
i
=
imin
-
HALO
,
imax
+
HALO
vel2
(
i
,
j
,
k
)
=
vvEx
(
i
,
j
,
k
)
**
2
vel2
(
i
,
j
,
k
)
=
vvEx
(
i
,
j
,
k
)
**
2
end
do
end
do
end
do
...
...
src/3d/variables_3d.F90
View file @
3901528a
...
...
@@ -189,9 +189,9 @@
uu
=
_
ZERO_
;
vv
=
_
ZERO_
;
ww
=
_
ZERO_
#ifdef _MOMENTUM_TERMS_
tdv_u
=
_
ZERO_
;
adv_u
=
_
ZERO_
;
vsd_u
=
_
ZERO_
;
hsd_u
=
_
ZERO_
cor_u
=
_
ZERO_
;
epg_u
=
_
ZERO_
;
ipg_u
=
_
ZERO_
cor_u
=
_
ZERO_
;
epg_u
=
_
ZERO_
;
ipg_u
=
_
ZERO_
tdv_v
=
_
ZERO_
;
adv_v
=
_
ZERO_
;
vsd_v
=
_
ZERO_
;
hsd_v
=
_
ZERO_
cor_v
=
_
ZERO_
;
epg_v
=
_
ZERO_
;
ipg_v
=
_
ZERO_
cor_v
=
_
ZERO_
;
epg_v
=
_
ZERO_
;
ipg_v
=
_
ZERO_
#endif
ssen
=
_
ZERO_
;
ssun
=
_
ZERO_
;
ssvn
=
_
ZERO_
rru
=
_
ZERO_
;
rrv
=
_
ZERO_
...
...
src/domain/domain.F90
View file @
3901528a
...
...
@@ -179,7 +179,7 @@
read
(
NAMLST
,
domain
)
if
(
crit_depth
.lt.
2.5
*
min_depth
)
then
stop
'crit_depth must be larger than 2.5 time min_depth'
stop
'crit_depth must be larger than 2.5 time min_depth'
end
if
#ifndef STATIC
...
...
src/ncdf/init_mean_ncdf.F90
View file @
3901528a
...
...
@@ -274,7 +274,7 @@
if
(
allocated
(
fabm_pel
))
then
allocate
(
fabmmean_ids
(
size
(
model
%
info
%
state_variables
)),
stat
=
err
)
if
(
err
/
=
0
)
stop
'init_mean_ncdf(): Error allocating memory (fabmmean_ids)'
do
n
=
1
,
size
(
model
%
info
%
state_variables
)
err
=
nf90_def_var
(
ncid
,
model
%
info
%
state_variables
(
n
)
%
name
,
NCDF_FLOAT_PRECISION
,
f4_dims
,
fabmmean_ids
(
n
))
if
(
err
.NE.
NF90_NOERR
)
go to
10
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment