Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
Detection eddies
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
Releases
Package registry
Container 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
Admin message
Gitlab has been updated. More info
here
and
there
.
Show more breadcrumbs
IPSL
LMD
DPAO
Detection eddies
Commits
68cd7344
Commit
68cd7344
authored
8 months ago
by
GUEZ Lionel
Browse files
Options
Downloads
Patches
Plain Diff
Pass `extr%coord_proj` to `set_max_speed`
Avoiding a repeated computation.
parent
73bcbfda
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Inst_eddies/Tests/test_set_max_speed.f90
+3
-3
3 additions, 3 deletions
Inst_eddies/Tests/test_set_max_speed.f90
Inst_eddies/set_contours.f90
+2
-1
2 additions, 1 deletion
Inst_eddies/set_contours.f90
Inst_eddies/set_max_speed.f90
+5
-3
5 additions, 3 deletions
Inst_eddies/set_max_speed.f90
with
10 additions
and
7 deletions
Inst_eddies/Tests/test_set_max_speed.f90
+
3
−
3
View file @
68cd7344
...
...
@@ -138,9 +138,9 @@ program test_set_max_speed
call
shpclose
(
hshp
)
call
create_cont_list
call
set_max_speed
(
e
%
speed_cont
,
e
%
max_speed
,
cont_list
,
cont_list_proj
,
&
n_cont
,
e
%
extr
%
coord
,
ssh
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)
),
&
u
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
v
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
&
corner_window
,
step
)
n_cont
,
e
%
extr
%
coord
,
real
(
e
%
extr
%
coord_proj
),
&
ssh
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
u
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
&
v
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
corner_window
,
step
)
call
close_cont_list
call
shpc_create
(
hshpc
,
shpc_dir
=
"SHPC"
,
cyclone
=
cyclone
,
slice
=
0
,
&
grid_lon_lat
=
.true.
)
...
...
This diff is collapsed.
Click to expand it.
Inst_eddies/set_contours.f90
+
2
−
1
View file @
68cd7344
...
...
@@ -118,7 +118,8 @@ contains
! Done restricting field
call
set_max_speed
(
speed_cont
,
max_speed
,
cont_list
,
cont_list_proj
,
&
n_cont
,
extr
%
coord
,
ssh
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
&
n_cont
,
extr
%
coord
,
real
(
extr
%
coord_proj
),
&
ssh
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
&
u
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
&
v
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
corner_window
,
step
)
end
if
...
...
This diff is collapsed.
Click to expand it.
Inst_eddies/set_max_speed.f90
+
5
−
3
View file @
68cd7344
...
...
@@ -5,7 +5,7 @@ module set_max_speed_m
contains
subroutine
set_max_speed
(
speed_cont
,
max_speed
,
cont_list
,
cont_list_proj
,
&
n_cont
,
extr_coord
,
ssh
,
u
,
v
,
corner
,
step
)
n_cont
,
extr_coord
,
extr_coord_proj
,
ssh
,
u
,
v
,
corner
,
step
)
! This procedure defines speed_cont and max_speed. On return,
! speed_cont may be a null ssh contour and max_speed may be set to
...
...
@@ -72,6 +72,9 @@ contains
real
,
intent
(
in
)::
extr_coord
(:)
! (2) longitude and latitude of extremum , in rad
real
,
intent
(
in
)::
extr_coord_proj
(:)
! (2)
! coordinates of extremum in projection space
real
,
intent
(
in
)::
ssh
(:,
:),
u
(:,
:),
v
(:,
:)
! The domain should be the bounding box of out_cont, because we do
! not exclude other extrema.
...
...
@@ -86,12 +89,11 @@ contains
! Local:
real
,
allocatable
::
speed
(:)
! (n_cont) speed on the contour
integer
i
,
i_outer
,
ishape
real
corner_proj
(
2
)
,
extr_coord_proj
(
2
)
real
corner_proj
(
2
)
!---------------------------------------------------------------
corner_proj
=
(
corner
-
corner_whole
)
/
step
+
1.
extr_coord_proj
=
(
extr_coord
-
corner_whole
)
/
step
+
1.
i_outer
=
n_cont
if
(
n_cont
>=
2
)
call
complete_ssh
(
cont_list_proj
%
ssh
,
n_cont
)
...
...
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