Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
GOSI9esm
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Consortium Members
UKMO
GOSI
GOSI9esm
Commits
4d9c6d81
Commit
4d9c6d81
authored
2 years ago
by
Clément Bricaud
Browse files
Options
Downloads
Patches
Plain Diff
remove wrong top limit condition on tke for cavities in gls
parent
9caeca09
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/OCE/ZDF/zdfgls.F90
+0
-35
0 additions, 35 deletions
src/OCE/ZDF/zdfgls.F90
with
0 additions
and
35 deletions
src/OCE/ZDF/zdfgls.F90
+
0
−
35
View file @
4d9c6d81
...
@@ -447,24 +447,6 @@ CONTAINS
...
@@ -447,24 +447,6 @@ CONTAINS
en
(
ji
,
jj
,
ibot
)
=
z_en
;
en
(
ji
,
jj
,
ibotm1
)
=
z_en
en
(
ji
,
jj
,
ibot
)
=
z_en
;
en
(
ji
,
jj
,
ibotm1
)
=
z_en
END_2D
END_2D
!
!
! NOTE: ctl_stop with ln_isfcav when using GLS
IF
(
ln_isfcav
)
THEN
! top boundary (ocean cavity)
DO_2D
(
0
,
0
,
0
,
0
)
itop
=
mikt
(
ji
,
jj
)
! k top w-point
itopp1
=
mikt
(
ji
,
jj
)
+
1
! k+1 1st w-point below the top one
! ! mask at the ocean surface points
z_en
=
MAX
(
rc02r
*
ustar2_top
(
ji
,
jj
),
rn_emin
)
*
(
1._wp
-
tmask
(
ji
,
jj
,
1
)
)
!
!!gm TO BE VERIFIED !!!
! Dirichlet condition applied at:
! top level (itop) & Just below it (itopp1)
zd_lw
(
ji
,
jj
,
itop
)
=
0._wp
;
zd_lw
(
ji
,
jj
,
itopp1
)
=
0._wp
zd_up
(
ji
,
jj
,
itop
)
=
0._wp
;
zd_up
(
ji
,
jj
,
itopp1
)
=
0._wp
zdiag
(
ji
,
jj
,
itop
)
=
1._wp
;
zdiag
(
ji
,
jj
,
itopp1
)
=
1._wp
en
(
ji
,
jj
,
itop
)
=
z_en
;
en
(
ji
,
jj
,
itopp1
)
=
z_en
END_2D
ENDIF
!
CASE
(
1
)
! Neumman boundary condition
CASE
(
1
)
! Neumman boundary condition
!
!
DO_2D
(
0
,
0
,
0
,
0
)
DO_2D
(
0
,
0
,
0
,
0
)
...
@@ -481,23 +463,6 @@ CONTAINS
...
@@ -481,23 +463,6 @@ CONTAINS
zd_up
(
ji
,
jj
,
ibot
)
=
0._wp
;
zd_up
(
ji
,
jj
,
ibotm1
)
=
0._wp
zd_up
(
ji
,
jj
,
ibot
)
=
0._wp
;
zd_up
(
ji
,
jj
,
ibotm1
)
=
0._wp
en
(
ji
,
jj
,
ibot
)
=
z_en
en
(
ji
,
jj
,
ibot
)
=
z_en
END_2D
END_2D
! NOTE: ctl_stop with ln_isfcav when using GLS
IF
(
ln_isfcav
)
THEN
! top boundary (ocean cavity)
DO_2D
(
0
,
0
,
0
,
0
)
itop
=
mikt
(
ji
,
jj
)
! k top w-point
itopp1
=
mikt
(
ji
,
jj
)
+
1
! k+1 1st w-point below the top one
! ! mask at the ocean surface points
z_en
=
MAX
(
rc02r
*
ustar2_top
(
ji
,
jj
),
rn_emin
)
*
(
1._wp
-
tmask
(
ji
,
jj
,
1
)
)
!
! Bottom level Dirichlet condition:
! Bottom level (ibot) & Just above it (ibotm1)
! Dirichlet ! Neumann
zd_lw
(
ji
,
jj
,
itop
)
=
0._wp
! ! Remove zd_up from zdiag
zdiag
(
ji
,
jj
,
itop
)
=
1._wp
;
zdiag
(
ji
,
jj
,
itopp1
)
=
zdiag
(
ji
,
jj
,
itopp1
)
+
zd_up
(
ji
,
jj
,
itopp1
)
zd_up
(
ji
,
jj
,
itop
)
=
0._wp
;
zd_up
(
ji
,
jj
,
itopp1
)
=
0._wp
en
(
ji
,
jj
,
itop
)
=
z_en
END_2D
ENDIF
!
!
END
SELECT
END
SELECT
...
...
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