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
af5e236a
Commit
af5e236a
authored
Jun 07, 2007
by
kbk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
iimin,iimax,jjmin,jjmax -> imin,imax,jmin,jmax
parent
360d4cd2
Changes
69
Hide whitespace changes
Inline
Side-by-side
Showing
69 changed files
with
762 additions
and
740 deletions
+762
-740
include/cppdefs.h
include/cppdefs.h
+2
-5
src/3d/adaptive_coordinates.F90
src/3d/adaptive_coordinates.F90
+32
-32
src/3d/advection_3d.F90
src/3d/advection_3d.F90
+8
-9
src/3d/bdy_3d.F90
src/3d/bdy_3d.F90
+8
-9
src/3d/bottom_friction_3d.F90
src/3d/bottom_friction_3d.F90
+10
-10
src/3d/check_h.F90
src/3d/check_h.F90
+12
-12
src/3d/coordinates.F90
src/3d/coordinates.F90
+2
-2
src/3d/eqstate.F90
src/3d/eqstate.F90
+7
-7
src/3d/fct_2dh_adv.F90
src/3d/fct_2dh_adv.F90
+20
-21
src/3d/general_coordinates.F90
src/3d/general_coordinates.F90
+16
-16
src/3d/getm_bio.F90
src/3d/getm_bio.F90
+12
-9
src/3d/gotm.F90
src/3d/gotm.F90
+6
-6
src/3d/hcc_check.F90
src/3d/hcc_check.F90
+4
-5
src/3d/hybrid_coordinates.F90
src/3d/hybrid_coordinates.F90
+2
-2
src/3d/internal_pressure.F90
src/3d/internal_pressure.F90
+7
-7
src/3d/ip_blumberg_mellor.F90
src/3d/ip_blumberg_mellor.F90
+7
-7
src/3d/ip_blumberg_mellor_lin.F90
src/3d/ip_blumberg_mellor_lin.F90
+7
-7
src/3d/ip_chu_fan.F90
src/3d/ip_chu_fan.F90
+7
-7
src/3d/ip_song_wright.F90
src/3d/ip_song_wright.F90
+7
-7
src/3d/ip_z_interpol.F90
src/3d/ip_z_interpol.F90
+7
-7
src/3d/m3d.F90
src/3d/m3d.F90
+3
-3
src/3d/rivers.F90
src/3d/rivers.F90
+4
-4
src/3d/salinity.F90
src/3d/salinity.F90
+29
-31
src/3d/sigma_coordinates.F90
src/3d/sigma_coordinates.F90
+14
-14
src/3d/slow_advection.F90
src/3d/slow_advection.F90
+20
-20
src/3d/slow_bottom_friction.F90
src/3d/slow_bottom_friction.F90
+18
-18
src/3d/slow_diffusion.F90
src/3d/slow_diffusion.F90
+27
-27
src/3d/slow_terms.F90
src/3d/slow_terms.F90
+18
-18
src/3d/spm.F90
src/3d/spm.F90
+28
-29
src/3d/ss_nn.F90
src/3d/ss_nn.F90
+6
-6
src/3d/start_macro.F90
src/3d/start_macro.F90
+8
-8
src/3d/stresses_3d.F90
src/3d/stresses_3d.F90
+6
-6
src/3d/temperature.F90
src/3d/temperature.F90
+17
-19
src/3d/u_split_adv.F90
src/3d/u_split_adv.F90
+8
-9
src/3d/upstream_2dh_adv.F90
src/3d/upstream_2dh_adv.F90
+10
-11
src/3d/upstream_adv.F90
src/3d/upstream_adv.F90
+16
-17
src/3d/uu_momentum_3d.F90
src/3d/uu_momentum_3d.F90
+8
-10
src/3d/uv_advect_3d.F90
src/3d/uv_advect_3d.F90
+37
-37
src/3d/uv_diffusion_3d.F90
src/3d/uv_diffusion_3d.F90
+19
-19
src/3d/v_split_adv.F90
src/3d/v_split_adv.F90
+8
-9
src/3d/variables_3d.F90
src/3d/variables_3d.F90
+4
-4
src/3d/vv_momentum_3d.F90
src/3d/vv_momentum_3d.F90
+8
-10
src/3d/w_split_adv.F90
src/3d/w_split_adv.F90
+8
-9
src/3d/w_split_it_adv.F90
src/3d/w_split_it_adv.F90
+6
-7
src/3d/ww_momentum_3d.F90
src/3d/ww_momentum_3d.F90
+7
-7
src/domain/dynamic_declarations_domain.h
src/domain/dynamic_declarations_domain.h
+0
-1
src/domain/mirror_bdy_3d.F90
src/domain/mirror_bdy_3d.F90
+5
-2
src/domain/part_domain.F90
src/domain/part_domain.F90
+2
-7
src/futils/c2x.F90
src/futils/c2x.F90
+22
-19
src/futils/check_3d_fields.F90
src/futils/check_3d_fields.F90
+9
-8
src/futils/cnv_3d.F90
src/futils/cnv_3d.F90
+11
-7
src/futils/halo_mpi.F90
src/futils/halo_mpi.F90
+7
-4
src/futils/halo_zones.F90
src/futils/halo_zones.F90
+8
-5
src/futils/kbk_interpol.F90
src/futils/kbk_interpol.F90
+10
-8
src/futils/to_3d_uu.F90
src/futils/to_3d_uu.F90
+9
-7
src/futils/to_3d_vel.F90
src/futils/to_3d_vel.F90
+10
-8
src/futils/to_3d_vv.F90
src/futils/to_3d_vv.F90
+9
-7
src/futils/tow.F90
src/futils/tow.F90
+13
-11
src/futils/ver_interpol.F90
src/futils/ver_interpol.F90
+9
-7
src/getm/initialise.F90
src/getm/initialise.F90
+5
-3
src/input/get_field.F90
src/input/get_field.F90
+5
-2
src/meteo/meteo.F90
src/meteo/meteo.F90
+7
-5
src/ncdf/get_field_ncdf.F90
src/ncdf/get_field_ncdf.F90
+10
-7
src/ncdf/read_field_ncdf.F90
src/ncdf/read_field_ncdf.F90
+12
-10
src/ncdf/save_3d_ncdf.F90
src/ncdf/save_3d_ncdf.F90
+42
-45
src/ncdf/save_mean_ncdf.F90
src/ncdf/save_mean_ncdf.F90
+17
-15
src/output/calc_mean_fields.F90
src/output/calc_mean_fields.F90
+11
-9
src/output/diagnose.F90
src/output/diagnose.F90
+4
-1
src/output/nesting.F90
src/output/nesting.F90
+5
-3
No files found.
include/cppdefs.h
View file @
af5e236a
...
...
@@ -119,13 +119,10 @@
!
Here
the
memory
-
allocation
is
defined
#define E2DFIELD imin-HALO:imax+HALO,jmin-HALO:jmax+HALO
#define I2DFIELD i
imin-HALO:iimax+HALO,jjmin-HALO:j
jmax+HALO
#define I3DFIELD i
imin-HALO:iimax+HALO,jjmin-HALO:j
jmax+HALO,0:kmax
#define I2DFIELD i
min-HALO:imax+HALO,jmin-HALO:
jmax+HALO
#define I3DFIELD i
min-HALO:imax+HALO,jmin-HALO:
jmax+HALO,0:kmax
!
These
defines
the
do
loops
for
the
real
inner
points
..
!
that
is
the
points
that
are
independent
of
neighbours
.
#define DO_EILOOP DO i=imin,imax
#define DO_EJLOOP DO j=jmin,jmax
#define DO_IILOOP DO i=iimin,iimax
#define DO_IJLOOP DO j=jjmin,jjmax
src/3d/adaptive_coordinates.F90
View file @
af5e236a
!$Id: adaptive_coordinates.F90,v 1.
3 2007-04-16 11:05:34
kbk Exp $
!$Id: adaptive_coordinates.F90,v 1.
4 2007-06-07 10:25:19
kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
...
...
@@ -13,7 +13,7 @@
! For Richard to do
!
! !USES:
use
domain
,
only
:
ga
,
i
imin
,
iimax
,
jjmin
,
j
jmax
,
kmax
,
H
,
HU
,
HV
,
az
,
au
,
av
use
domain
,
only
:
ga
,
i
min
,
imax
,
jmin
,
jmax
,
kmax
,
H
,
HU
,
HV
,
az
,
au
,
av
use
variables_3d
,
only
:
dt
,
kmin
,
kumin
,
kvmin
,
ho
,
hn
,
huo
,
hvo
,
hun
,
hvn
use
variables_3d
,
only
:
sseo
,
ssen
,
ssuo
,
ssun
,
ssvo
,
ssvn
use
variables_3d
,
only
:
kmin_pmz
,
kumin_pmz
,
kvmin_pmz
...
...
@@ -123,20 +123,20 @@ STDERR 'adaptive_coordinates()'
kmaxm1
=
_
ONE_
/
float
(
kmax
)
! Dirty way to read initial distribution (as equidistant sigma coordinates):
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
ho
(
i
,
j
,:)
=
(
sseo
(
i
,
j
)
+
H
(
i
,
j
))
*
kmaxm1
hn
(
i
,
j
,:)
=
(
ssen
(
i
,
j
)
+
H
(
i
,
j
))
*
kmaxm1
end
do
end
do
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
-1
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
-1
,
imax
huo
(
i
,
j
,:)
=
(
ssuo
(
i
,
j
)
+
HU
(
i
,
j
))
*
kmaxm1
hun
(
i
,
j
,:)
=
(
ssun
(
i
,
j
)
+
HU
(
i
,
j
))
*
kmaxm1
end
do
end
do
do
j
=
j
jmin
-1
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
-1
,
jmax
do
i
=
i
min
,
imax
hvo
(
i
,
j
,:)
=
(
ssvo
(
i
,
j
)
+
HV
(
i
,
j
))
*
kmaxm1
hvn
(
i
,
j
,:)
=
(
ssvn
(
i
,
j
)
+
HV
(
i
,
j
))
*
kmaxm1
end
do
...
...
@@ -154,8 +154,8 @@ STDERR 'adaptive_coordinates()'
ho
=
hn
! Lagrangian and thickness filtering step
do
k
=
1
,
kmax
do
j
=
j
jmin
+1
,
j
jmax
-1
do
i
=
i
imin
+1
,
i
imax
-1
do
j
=
j
min
+1
,
jmax
-1
do
i
=
i
min
+1
,
imax
-1
hn
(
i
,
j
,
k
)
=
ho
(
i
,
j
,
k
)
&
-
((
uu
(
i
,
j
,
k
)
*
DYU
-
uu
(
i
-1
,
j
,
k
)
*
DYUIM1
)
&
+
(
vv
(
i
,
j
,
k
)
*
DXV
-
vv
(
i
,
j
-1
,
k
)
*
DXVJM1
))
&
...
...
@@ -184,15 +184,15 @@ STDERR 'adaptive_coordinates()'
! For problem zones (boundaries, thin layers), put zero 'horizontal diffusion'
do
k
=
1
,
kmax
-1
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
(
au
(
i
,
j
)
.eq.
1
)
work2
(
i
,
j
,
k
)
=
_
ONE_
end
do
end
do
end
do
do
k
=
2
,
kmax
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
+1
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
+1
,
imax
if
((
zpos
(
i
,
j
,
k
)
-
zpos
(
i
,
j
,
k
-1
))
.lt.
depthmin
)
then
work2
(
i
,
j
,
k
)
=
0
work2
(
i
,
j
,
k
-1
)
=
0
...
...
@@ -203,15 +203,15 @@ STDERR 'adaptive_coordinates()'
end
do
end
do
do
k
=
1
,
kmax
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
(
av
(
i
,
j
)
.eq.
1
)
work3
(
i
,
j
,
k
)
=
_
ONE_
end
do
end
do
end
do
do
k
=
2
,
kmax
do
j
=
j
jmin
+1
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
+1
,
jmax
do
i
=
i
min
,
imax
if
((
zpos
(
i
,
j
,
k
)
-
zpos
(
i
,
j
,
k
-1
))
.lt.
depthmin
)
then
work3
(
i
,
j
,
k
)
=
0
work3
(
i
,
j
,
k
-1
)
=
0
...
...
@@ -226,12 +226,12 @@ STDERR 'adaptive_coordinates()'
! Dirty BC
zposo
=
zpos
do
k
=
1
,
kmax
-1
do
j
=
j
jmin
+1
,
j
jmax
-1
do
i
=
i
imin
+1
,
i
imax
-1
do
j
=
j
min
+1
,
jmax
-1
do
i
=
i
min
+1
,
imax
-1
rm
=
0
im
=
0
do
iii
=
max
(
i
imin
,
i
-
iw
),
min
(
i
imax
,
i
+
iw
)
do
jjj
=
max
(
j
jmin
,
j
-
iw
),
min
(
j
jmax
,
j
+
iw
)
do
iii
=
max
(
i
min
,
i
-
iw
),
min
(
imax
,
i
+
iw
)
do
jjj
=
max
(
j
min
,
j
-
iw
),
min
(
jmax
,
j
+
iw
)
rm
=
rm
+
az
(
iii
,
jjj
)
*
(
rho
(
iii
,
jjj
,
k
+1
)
+
rho
(
iii
,
jjj
,
k
))
im
=
im
+
az
(
iii
,
jjj
)
end
do
...
...
@@ -252,8 +252,8 @@ STDERR 'adaptive_coordinates()'
end
do
! Local consistency
do
k
=
1
,
kmax
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
((
zpos
(
i
,
j
,
k
)
-
zpos
(
i
,
j
,
k
-1
))
.lt.
depthmin
)
then
zpos
(
i
,
j
,
k
)
=
zpos
(
i
,
j
,
k
-1
)
+
depthmin
endif
...
...
@@ -269,8 +269,8 @@ STDERR 'adaptive_coordinates()'
call
htoz
(
hn
,
zpos
)
dtgrid
=
dt
/
float
(
split
)
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
(
az
(
i
,
j
)
.eq.
1
)
then
NNloc
=
NN
(
i
,
j
,:)
SSloc
=
SS
(
i
,
j
,:)
...
...
@@ -348,24 +348,24 @@ STDERR 'adaptive_coordinates()'
! uu
huo
=
hun
do
k
=
1
,
kmax
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
-1
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
-1
hun
(
i
,
j
,
k
)
=
0.5
*
(
hn
(
i
,
j
,
k
)
+
hn
(
i
+1
,
j
,
k
))
end
do
end
do
end
do
! maybe not allowed in i
i
max....
! maybe not allowed in imax....
call
hcheck
(
hun
,
ssun
,
hu
)
! vv
hvo
=
hvn
do
k
=
1
,
kmax
do
j
=
j
jmin
,
j
jmax
-1
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
-1
do
i
=
i
min
,
imax
hvn
(
i
,
j
,
k
)
=
0.5
*
(
hn
(
i
,
j
,
k
)
+
hn
(
i
,
j
+1
,
k
))
end
do
end
do
end
do
! maybe not allowed in j
j
max....
! maybe not allowed in jmax....
call
hcheck
(
hvn
,
ssvn
,
hv
)
#ifdef DEBUG
...
...
src/3d/advection_3d.F90
View file @
af5e236a
...
...
@@ -31,8 +31,7 @@
! \end{enumerate}
!
! !USES:
use
domain
,
only
:
imin
,
imax
,
jmin
,
jmax
use
domain
,
only
:
iimin
,
iimax
,
jjmin
,
jjmax
,
kmax
use
domain
,
only
:
imin
,
imax
,
jmin
,
jmax
,
kmax
use
halo_zones
,
only
:
update_3d_halo
,
wait_halo
,
D_TAG
IMPLICIT
NONE
!
...
...
@@ -272,14 +271,14 @@
call
u_split_adv
(
dt
,
f
,
uu
,
hun
,
delxu
,
delyu
,
area_inv
,
au
,
a2
,&
hor_adv
,
az
,
AH
)
call
update_3d_halo
(
f
,
f
,
az
,&
i
imin
,
jjmin
,
iimax
,
j
jmax
,
kmax
,
D_TAG
)
i
min
,
jmin
,
imax
,
jmax
,
kmax
,
D_TAG
)
call
wait_halo
(
D_TAG
)
#ifndef SLICE_MODEL
call
v_split_adv
(
dt
,
f
,
vv
,
hvn
,
delxv
,
delyv
,
area_inv
,
av
,
a2
,&
hor_adv
,
az
,
AH
)
call
update_3d_halo
(
f
,
f
,
az
,&
i
imin
,
jjmin
,
iimax
,
j
jmax
,
kmax
,
D_TAG
)
i
min
,
jmin
,
imax
,
jmax
,
kmax
,
D_TAG
)
call
wait_halo
(
D_TAG
)
#endif
...
...
@@ -294,14 +293,14 @@
call
u_split_adv
(
dt
,
f
,
uu
,
hun
,
delxu
,
delyu
,
area_inv
,
au
,
a1
,&
hor_adv
,
az
,
AH
)
call
update_3d_halo
(
f
,
f
,
az
,
&
i
imin
,
jjmin
,
iimax
,
j
jmax
,
kmax
,
D_TAG
)
i
min
,
jmin
,
imax
,
jmax
,
kmax
,
D_TAG
)
call
wait_halo
(
D_TAG
)
#ifndef SLICE_MODEL
call
v_split_adv
(
dt
,
f
,
vv
,
hvn
,
delxv
,
delyv
,
area_inv
,
av
,
a1
,&
hor_adv
,
az
,
AH
)
call
update_3d_halo
(
f
,
f
,
az
,
&
i
imin
,
jjmin
,
iimax
,
j
jmax
,
kmax
,
D_TAG
)
i
min
,
jmin
,
imax
,
jmax
,
kmax
,
D_TAG
)
call
wait_halo
(
D_TAG
)
#endif
...
...
@@ -312,7 +311,7 @@
call
w_split_adv
(
dt
,
f
,
ww
,
az
,
a2
,
ver_adv
)
#endif
call
update_3d_halo
(
f
,
f
,
az
,
&
i
imin
,
jjmin
,
iimax
,
j
jmax
,
kmax
,
D_TAG
)
i
min
,
jmin
,
imax
,
jmax
,
kmax
,
D_TAG
)
call
wait_halo
(
D_TAG
)
end
if
...
...
@@ -320,14 +319,14 @@
call
v_split_adv
(
dt
,
f
,
vv
,
hvn
,
delxv
,
delyv
,
area_inv
,
av
,
a1
,&
hor_adv
,
az
,
AH
)
call
update_3d_halo
(
f
,
f
,
az
,
&
i
imin
,
jjmin
,
iimax
,
j
jmax
,
kmax
,
D_TAG
)
i
min
,
jmin
,
imax
,
jmax
,
kmax
,
D_TAG
)
call
wait_halo
(
D_TAG
)
#endif
call
u_split_adv
(
dt
,
f
,
uu
,
hun
,
delxu
,
delyu
,
area_inv
,
au
,
a1
,&
hor_adv
,
az
,
AH
)
call
update_3d_halo
(
f
,
f
,
az
,
&
i
imin
,
jjmin
,
iimax
,
j
jmax
,
kmax
,
D_TAG
)
i
min
,
jmin
,
imax
,
jmax
,
kmax
,
D_TAG
)
call
wait_halo
(
D_TAG
)
case
(
2
)
...
...
src/3d/bdy_3d.F90
View file @
af5e236a
!$Id: bdy_3d.F90,v 1.1
1 2006-08-25 09:00
:19 kbk Exp $
!$Id: bdy_3d.F90,v 1.1
2 2007-06-07 10:25
:19 kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
...
...
@@ -15,8 +15,7 @@
!
! !USES:
use
halo_zones
,
only
:
H_TAG
,
U_TAG
,
V_TAG
use
domain
,
only
:
imin
,
jmin
,
imax
,
jmax
,
H
,
az
,
au
,
av
use
domain
,
only
:
iimin
,
jjmin
,
iimax
,
jjmax
,
kmax
use
domain
,
only
:
imin
,
jmin
,
imax
,
jmax
,
kmax
,
H
,
az
,
au
,
av
use
domain
,
only
:
nsbv
,
NWB
,
NNB
,
NEB
,
NSB
,
bdy_index
use
domain
,
only
:
wi
,
wfj
,
wlj
,
nj
,
nfi
,
nli
,
ei
,
efj
,
elj
,
sj
,
sfi
,
sli
use
variables_3d
...
...
@@ -131,17 +130,17 @@
case
(
1
)
! Lateral zero-gradient boundary condition (north & south)
do
k
=
1
,
kmax
do
i
=
i
imin
,
i
imax
if
(
au
(
i
,
j
jmin
)
.eq.
3
)
field
(
i
,
jjmin
,
k
)
=
field
(
i
,
j
jmin
+1
,
k
)
if
(
au
(
i
,
j
jmax
)
.eq.
3
)
field
(
i
,
jjmax
,
k
)
=
field
(
i
,
j
jmax
-1
,
k
)
do
i
=
i
min
,
imax
if
(
au
(
i
,
j
min
)
.eq.
3
)
field
(
i
,
jmin
,
k
)
=
field
(
i
,
jmin
+1
,
k
)
if
(
au
(
i
,
j
max
)
.eq.
3
)
field
(
i
,
jmax
,
k
)
=
field
(
i
,
jmax
-1
,
k
)
end
do
end
do
case
(
2
)
! Lateral zero-gradient boundary conditions (west & east)
do
k
=
1
,
kmax
do
j
=
j
jmin
,
j
jmax
if
(
av
(
i
imin
,
j
)
.eq.
3
)
field
(
iimin
,
j
,
k
)
=
field
(
i
imin
+1
,
j
,
k
)
if
(
av
(
i
imax
,
j
)
.eq.
3
)
field
(
iimax
,
j
,
k
)
=
field
(
i
imax
-1
,
j
,
k
)
do
j
=
j
min
,
jmax
if
(
av
(
i
min
,
j
)
.eq.
3
)
field
(
imin
,
j
,
k
)
=
field
(
imin
+1
,
j
,
k
)
if
(
av
(
i
max
,
j
)
.eq.
3
)
field
(
imax
,
j
,
k
)
=
field
(
imax
-1
,
j
,
k
)
end
do
end
do
case
default
...
...
src/3d/bottom_friction_3d.F90
View file @
af5e236a
!$Id: bottom_friction_3d.F90,v 1.
9 2006-03-01 15:54:08
kbk Exp $
!$Id: bottom_friction_3d.F90,v 1.
10 2007-06-07 10:25:19
kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
...
...
@@ -46,7 +46,7 @@
!
! !USES:
use
parameters
,
only
:
kappa
,
avmmol
use
domain
,
only
:
i
imin
,
iimax
,
jjmin
,
j
jmax
,
kmax
,
au
,
av
,
min_depth
use
domain
,
only
:
i
min
,
imax
,
jmin
,
jmax
,
kmax
,
au
,
av
,
min_depth
use
variables_2d
,
only
:
zub
,
zvb
,
zub0
,
zvb0
use
variables_3d
,
only
:
kumin
,
kvmin
,
uu
,
vv
,
huo
,
hun
,
hvo
,
hvn
,
rru
,
rrv
IMPLICIT
NONE
...
...
@@ -87,8 +87,8 @@
end
if
#endif
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
(
au
(
i
,
j
)
.ge.
1
)
then
kk
=
kumin
(
i
,
j
)
uuloc
(
i
,
j
)
=
uu
(
i
,
j
,
kk
)/(
huo
(
i
,
j
,
kk
))
...
...
@@ -110,8 +110,8 @@
end
do
end
do
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
(
av
(
i
,
j
)
.ge.
1
)
then
kk
=
kvmin
(
i
,
j
)
#if 0
...
...
@@ -134,8 +134,8 @@
end
do
#if 1
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
(
au
(
i
,
j
)
.ge.
1
)
then
hh
=
max
(
min_depth
/
kmax
,
hun
(
i
,
j
,
kumin
(
i
,
j
)))
r
=
(
zub
(
i
,
j
)
+0.5
*
hh
)/
zub
(
i
,
j
)
...
...
@@ -151,8 +151,8 @@
#endif
#if 1
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
(
av
(
i
,
j
)
.ge.
1
)
then
hh
=
max
(
min_depth
/
kmax
,
hvn
(
i
,
j
,
kvmin
(
i
,
j
)))
r
=
(
zvb
(
i
,
j
)
+0.5
*
hh
)/
zvb
(
i
,
j
)
...
...
src/3d/check_h.F90
View file @
af5e236a
...
...
@@ -5,13 +5,13 @@
! !DESCRIPTION:
!
! !USES:
use
domain
,
only
:
i
imin
,
iimax
,
jjmin
,
j
jmax
,
kmax
,
H
use
domain
,
only
:
i
min
,
imax
,
jmin
,
jmax
,
kmax
,
H
IMPLICIT
NONE
REALTYPE
::
zpos
(
I3DFIELD
),
hn
(
I3DFIELD
),
depthmin
integer
::
i
,
j
,
k
do
k
=
1
,
kmax
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
hn
(
i
,
j
,
k
)
=
zpos
(
i
,
j
,
k
)
-
zpos
(
i
,
j
,
k
-1
)
hn
(
i
,
j
,
k
)
=
max
(
hn
(
i
,
j
,
k
),
depthmin
)
enddo
...
...
@@ -26,13 +26,13 @@
! !DESCRIPTION:
!
! !USES:
use
domain
,
only
:
i
imin
,
iimax
,
jjmin
,
j
jmax
,
kmax
,
H
use
domain
,
only
:
i
min
,
imax
,
jmin
,
jmax
,
kmax
,
H
IMPLICIT
NONE
REALTYPE
::
zpos
(
I3DFIELD
),
hn
(
I3DFIELD
),
depthmin
integer
::
i
,
j
,
k
! write(6,*) 'htoz',i
imax,hn(iimax/2,2,kmax/2),H(i
imax/2,2)
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
! write(6,*) 'htoz',i
max,hn(imax/2,2,kmax/2),H(
imax/2,2)
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
zpos
(
i
,
j
,
0
)
=-
H
(
i
,
j
)
do
k
=
1
,
kmax
zpos
(
i
,
j
,
k
)
=
zpos
(
i
,
j
,
k
-1
)
+
hn
(
i
,
j
,
k
)
...
...
@@ -47,15 +47,15 @@
! !DESCRIPTION:
!
! !USES:
use
domain
,
only
:
i
imin
,
iimax
,
jjmin
,
j
jmax
,
kmax
use
domain
,
only
:
i
min
,
imax
,
jmin
,
jmax
,
kmax
IMPLICIT
NONE
REALTYPE
::
ssen
(
I2DFIELD
),
hn
(
I3DFIELD
)
REALTYPE
::
h
(
I2DFIELD
),
HH
,
depthmin
integer
::
i
,
j
,
k
! Final check of layer thicnkess thoug not necessary if zpos treated correctly
! write(6,*) 'Inside',hn(i
i
max/2,2,kmax/2)
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
! write(6,*) 'Inside',hn(imax/2,2,kmax/2)
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
HH
=
0.
do
k
=
1
,
kmax
HH
=
HH
+
hn
(
i
,
j
,
k
)
...
...
@@ -65,7 +65,7 @@
end
do
end
do
end
do
! write(6,*) 'Inside after',hn(i
i
max/2,2,kmax/2)
! write(6,*) 'Inside after',hn(imax/2,2,kmax/2)
return
end
...
...
src/3d/coordinates.F90
View file @
af5e236a
!$Id: coordinates.F90,v 1.1
3 2007-03-30 13:10:59 hb
Exp $
!$Id: coordinates.F90,v 1.1
4 2007-06-07 10:25:19 kbk
Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
...
...
@@ -127,7 +127,7 @@ STDERR 'coordinates(): adaptive_coordinates not coded yet'
end
if
! first
#ifdef SLICE_MODEL
do
i
=
i
imin
,
i
imax
do
i
=
i
min
,
imax
do
k
=
kvmin
(
i
,
2
),
kmax
hvo
(
i
,
1
,
k
)
=
hvo
(
i
,
2
,
k
)
hvo
(
i
,
3
,
k
)
=
hvo
(
i
,
2
,
k
)
...
...
src/3d/eqstate.F90
View file @
af5e236a
!$Id: eqstate.F90,v 1.
9 2007-02-23 12:20:36
kbk Exp $
!$Id: eqstate.F90,v 1.
10 2007-06-07 10:25:19
kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
...
...
@@ -103,7 +103,7 @@
! Here, the equation of state is calculated for every 3D grid point.
!
! !USES:
use
domain
,
only
:
i
imin
,
iimax
,
jjmin
,
j
jmax
,
kmax
,
az
use
domain
,
only
:
i
min
,
imax
,
jmin
,
jmax
,
kmax
,
az
use
variables_3d
,
only
:
T
,
S
,
rho
,
buoy
IMPLICIT
NONE
!
...
...
@@ -130,22 +130,22 @@
#define BUOYANCY
select
case
(
eqstate_method
)
case
(
1
)
forall
(
i
=
i
imin
-1
:
iimax
+1
,
j
=
jjmin
-1
:
j
jmax
+1
,
az
(
i
,
j
)
.gt.
0
)
&
forall
(
i
=
i
min
-1
:
imax
+1
,
j
=
jmin
-1
:
jmax
+1
,
az
(
i
,
j
)
.gt.
0
)
&
rho
(
i
,
j
,
1
:
kmax
)
=
rho_0
+
&
dtr0
*
(
T
(
i
,
j
,
1
:
kmax
)
-
T0
)
+
dsr0
*
(
S
(
i
,
j
,
1
:
kmax
)
-
S0
)
#ifdef HAIDVOGEL_TEST
forall
(
i
=
i
imin
-1
:
iimax
+1
,
j
=
jjmin
-1
:
j
jmax
+1
,
az
(
i
,
j
)
.gt.
0
)
&
forall
(
i
=
i
min
-1
:
imax
+1
,
j
=
jmin
-1
:
jmax
+1
,
az
(
i
,
j
)
.gt.
0
)
&
rho
(
i
,
j
,
1
:
kmax
)
=
1000.
+
S
(
i
,
j
,
1
:
kmax
)
#endif
#ifdef CONSTANCE_TEST
forall
(
i
=
i
imin
-1
:
iimax
+1
,
j
=
jjmin
-1
:
j
jmax
+1
,
az
(
i
,
j
)
.gt.
0
)
&
forall
(
i
=
i
min
-1
:
imax
+1
,
j
=
jmin
-1
:
jmax
+1
,
az
(
i
,
j
)
.gt.
0
)
&
rho
(
i
,
j
,
1
:
kmax
)
=
1000.
+
*
dtr0
*
(
T
(
i
,
j
,
1
:
kmax
)
-
T0
)
#endif
case
(
2
)
do
k
=
1
,
kmax
do
j
=
j
jmin
-1
,
j
jmax
+1
do
i
=
i
imin
-1
,
i
imax
+1
do
j
=
j
min
-1
,
jmax
+1
do
i
=
i
min
-1
,
imax
+1
if
(
az
(
i
,
j
)
.gt.
0
)
then
T1
=
T
(
i
,
j
,
k
)
T2
=
T1
*
T1
...
...
src/3d/fct_2dh_adv.F90
View file @
af5e236a
!$Id: fct_2dh_adv.F90,v 1.
5 2006-03-01 16:03:32
kbk Exp $
!$Id: fct_2dh_adv.F90,v 1.
6 2007-06-07 10:25:19
kbk Exp $
#include "cppdefs.h"
!-----------------------------------------------------------------------
!BOP
...
...
@@ -25,8 +25,7 @@
! one-dimensional directioal-split schemes might compute negative intermediate
!
! !USES:
use
domain
,
only
:
imin
,
imax
,
jmin
,
jmax
use
domain
,
only
:
iimin
,
iimax
,
jjmin
,
jjmax
,
kmax
use
domain
,
only
:
imin
,
imax
,
jmin
,
jmax
,
kmax
use
advection_3d
,
only
:
hi
,
hio
IMPLICIT
NONE
!
...
...
@@ -105,8 +104,8 @@
flx
=
_
ZERO_
do
k
=
1
,
kmax
! Calculating u-interface low-order fluxes !
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
-1
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
-1
,
imax
if
(
uu
(
i
,
j
,
k
)
.gt.
_
ZERO_
)
then
flx
(
i
,
j
,
k
)
=
uu
(
i
,
j
,
k
)
*
f
(
i
,
j
,
k
)
else
...
...
@@ -118,8 +117,8 @@
fly
=
_
ZERO_
do
k
=
1
,
kmax
! Calculating v-interface low-order fluxes !
do
j
=
j
jmin
-1
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
-1
,
jmax
do
i
=
i
min
,
imax
if
(
vv
(
i
,
j
,
k
)
.gt.
_
ZERO_
)
then
fly
(
i
,
j
,
k
)
=
vv
(
i
,
j
,
k
)
*
f
(
i
,
j
,
k
)
else
...
...
@@ -131,8 +130,8 @@
fhx
=
_
ZERO_
do
k
=
1
,
kmax
! Calculating u-interface high-order fluxes !
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
-1
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
-1
,
imax
uuu
=
uu
(
i
,
j
,
k
)/
hun
(
i
,
j
,
k
)
*
dt
/
delxu
(
i
,
j
)
vvv
=
0.25
*
(
vv
(
i
,
j
-1
,
k
)/
hvn
(
i
,
j
-1
,
k
)
&
+
vv
(
i
,
j
,
k
)/
hvn
(
i
,
j
,
k
)
&
...
...
@@ -198,8 +197,8 @@
fhy
=
_
ZERO_
do
k
=
1
,
kmax
! Calculating v-interface high-order fluxes !
do
j
=
j
jmin
-1
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
-1
,
jmax
do
i
=
i
min
,
imax
uuu
=
vv
(
i
,
j
,
k
)
*
dt
/
delyv
(
i
,
j
)
vvv
=
0.25
*
(
&
uu
(
i
-1
,
j
,
k
)/
hun
(
i
-1
,
j
,
k
)
&
...
...
@@ -267,8 +266,8 @@
! Calculate intermediate low resolution solution fi
do
k
=
1
,
kmax
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
(
az
(
i
,
j
)
.eq.
1
)
then
hio
(
i
,
j
,
k
)
=
hi
(
i
,
j
,
k
)
hi
(
i
,
j
,
k
)
=
hio
(
i
,
j
,
k
)
&
...
...
@@ -286,8 +285,8 @@
! Calculating and applying the flux limiter
do
k
=
1
,
kmax
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
(
az
(
i
,
j
)
.eq.
1
)
then
cmin
(
i
,
j
,
k
)
=
10000.
cmax
(
i
,
j
,
k
)
=
-10000.
...
...
@@ -331,8 +330,8 @@
! Limiters for the u-fluxes (fac)
do
k
=
1
,
kmax
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
-1
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
-1
,
imax
if
(
fhx
(
i
,
j
,
k
)
-
flx
(
i
,
j
,
k
)
.ge.
0.
)
then
fac
=
min
(
rm
(
i
,
j
,
k
),
rp
(
i
+1
,
j
,
k
))
else
...
...
@@ -348,8 +347,8 @@
! Limiters for the v-fluxes (fac)
do
k
=
1
,
kmax
do
j
=
j
jmin
-1
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
-1
,
jmax
do
i
=
i
min
,
imax
if
(
fhy
(
i
,
j
,
k
)
-
fly
(
i
,
j
,
k
)
.ge.
0.
)
then
fac
=
min
(
rm
(
i
,
j
,
k
),
rp
(
i
,
j
+1
,
k
))
else
...
...
@@ -366,8 +365,8 @@
! Doing the full advection in one step
do
k
=
1
,
kmax
do
j
=
j
jmin
,
j
jmax
do
i
=
i
imin
,
i
imax
do
j
=
j
min
,
jmax
do
i
=
i
min
,
imax
if
(
az
(
i
,
j
)
.eq.
1
)
then
! CAUTION: hi(i,j,k) already calculated above