Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
ocean-mixing
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
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
inmcm-mirror
ocean-mixing
Commits
4769263c
Commit
4769263c
authored
6 months ago
by
Ramil Ahtamyanov
Browse files
Options
Downloads
Patches
Plain Diff
move neutral_mld & u_dynH to richnum_mode if statement
parent
fbd5b633
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
obl_inmom.f90
+6
-7
6 additions, 7 deletions
obl_inmom.f90
with
6 additions
and
7 deletions
obl_inmom.f90
+
6
−
7
View file @
4769263c
...
...
@@ -91,9 +91,13 @@ module obl_inmom
call
legacy_n2
(
den
,
hhq
,
zw
,
g
,
lu
,
n2
)
call
legacy_rit
(
n2
,
s2
,
border_shift
,
lu
,
rit
(:,:,
2
:
size
(
rit
,
3
)))
call
legacy_rit_top
(
rlh
,
taux
,
tauy
,
border_shift
,
lu
,
rit
(:,:,
1
))
end
if
! print *, "hello aft rit"
call
sync_xy_border_3d
(
rit
)
! neutral mld & u_dynH for pph_dyn
call
legacy_neutral_mld
(
rlh
,
taux
,
tauy
,
border_shift
,
lu
,
neutral_mld
,
u_dynH
)
call
sync_xy_border_2d
(
neutral_mld
)
call
sync_xy_border_2d
(
u_dynH
)
!print *, "neutral_mld:", neutral_mld
end
if
do
j
=
1
,
ny
do
i
=
1
,
nx
...
...
@@ -115,11 +119,6 @@ module obl_inmom
call
pph_kh
(
kh
(
i
,
j
,:),
rit
(
i
,
j
,:),
pphParams
,
nz
)
call
pph_km
(
km
(
i
,
j
,:),
rit
(
i
,
j
,:),
pphParams
,
nz
)
else
if
(
kh_km_mode
==
3
)
then
if
(
i
==
1
.and.
j
==
1
)
then
call
legacy_neutral_mld
(
rlh
,
taux
,
tauy
,
border_shift
,
lu
,
neutral_mld
,
u_dynH
)
call
sync_xy_border_2d
(
neutral_mld
)
call
sync_xy_border_2d
(
u_dynH
)
end
if
call
pph_dyn_kh
(
kh
(
i
,
j
,:),
rit
(
i
,
j
,:),
u_dynH
(
i
,
j
),
neutral_mld
(
i
,
j
),
pphdynParams
,
nz
)
call
pph_dyn_km
(
km
(
i
,
j
,:),
rit
(
i
,
j
,:),
u_dynH
(
i
,
j
),
neutral_mld
(
i
,
j
),
pphdynParams
,
nz
)
end
if
...
...
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