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
Show more breadcrumbs
IPSL
LMD
DPAO
Detection eddies
Commits
11ed345d
Commit
11ed345d
authored
8 months ago
by
GUEZ Lionel
Browse files
Options
Downloads
Patches
Plain Diff
Rename `outside_points_proj` to `outside_points`
Rename variable `outside_points_proj` to `outside_points`.
parent
cdeaedf4
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Inst_eddies/get_1_outerm.f90
+5
-5
5 additions, 5 deletions
Inst_eddies/get_1_outerm.f90
Inst_eddies/set_contours.f90
+4
-4
4 additions, 4 deletions
Inst_eddies/set_contours.f90
with
9 additions
and
9 deletions
Inst_eddies/get_1_outerm.f90
+
5
−
5
View file @
11ed345d
...
...
@@ -5,7 +5,7 @@ module get_1_outerm_m
contains
subroutine
get_1_outerm
(
out_cont
,
cont_list
,
cont_list_proj
,
n_cont
,
&
cyclone
,
extr_coord_proj
,
innermost_level_2
,
outside_points
_proj
,
ssh
,
&
cyclone
,
extr_coord_proj
,
innermost_level_2
,
outside_points
,
ssh
,
&
corner
,
step
)
! This procedure gets one outermost good contour with sufficient
...
...
@@ -90,7 +90,7 @@ contains
! extremum, in m. Assume: innermost_level_2 < extremum for a
! maximum, > extremum for a minimum.
real
,
intent
(
in
)::
outside_points
_proj
(:,
:)
! (2, :)
real
,
intent
(
in
)::
outside_points
(:,
:)
! (2, :)
! coordinates in projection space of all the significant extrema,
! except the target extremum
...
...
@@ -115,7 +115,7 @@ contains
n_max_cont
=
size
(
cont_list_proj
)
n_cont
=
0
cont_list_proj
(
1
)
%
polyline
=
good_contour
(
corner
,
ssh
,
innermost_level_2
,
&
extr_coord_proj
,
outside_points
_proj
)
extr_coord_proj
,
outside_points
)
test_n_points
:
if
(
.not.
cont_list_proj
(
1
)
%
closed
)
then
! cont_list_proj(1)%n_points == 0
...
...
@@ -129,7 +129,7 @@ contains
call
assert
(
merge
(
level_try
>
level_good
,
level_try
<
level_good
,
&
cyclone
),
"get_1_outerm level_try"
)
cont_list_proj
(
2
)
%
polyline
=
good_contour
(
corner
,
ssh
,
level_try
,
&
extr_coord_proj
,
outside_points
_proj
)
extr_coord_proj
,
outside_points
)
if
(
cont_list_proj
(
2
)
%
closed
)
then
! cont_list_proj(2)%n_points /= 0
...
...
@@ -145,7 +145,7 @@ contains
do
while
(
abs
(
level_bad
-
level_good
)
>
precision
)
level_try
=
(
level_good
+
level_bad
)
/
2.
cont_list_proj
(
n_cont
+
1
)
%
polyline
=
good_contour
(
corner
,
ssh
,
&
level_try
,
extr_coord_proj
,
outside_points
_proj
)
level_try
,
extr_coord_proj
,
outside_points
)
if
(
cont_list_proj
(
n_cont
+
1
)
%
closed
)
then
! cont_list_proj(n_cont + 1)%n_points /= 0
...
...
This diff is collapsed.
Click to expand it.
Inst_eddies/set_contours.f90
+
4
−
4
View file @
11ed345d
...
...
@@ -5,7 +5,7 @@ module set_contours_m
contains
subroutine
set_contours
(
out_cont
,
speed_cont
,
max_speed
,
cyclone
,
extr
,
&
innermost_level
,
step
,
ssh
,
u
,
v
,
corner
,
outside_points
_proj
)
innermost_level
,
step
,
ssh
,
u
,
v
,
corner
,
outside_points
)
! This procedure sets contours in an eddy.
...
...
@@ -46,7 +46,7 @@ contains
! corresponding to ssh(1, 1). A priori, this is not the corner of
! the grid of the NetCDF file.
integer
,
intent
(
in
)::
outside_points
_proj
(:,
:)
! (2, :)
integer
,
intent
(
in
)::
outside_points
(:,
:)
! (2, :)
! coordinates in projection space of all the significant extrema,
! except the target extremum
...
...
@@ -94,8 +94,8 @@ contains
innermost_level
,
abs
(
extr
%
ssh
-
innermost_level
)
<
min_amp
)
call
get_1_outerm
(
out_cont
,
cont_list
,
cont_list_proj
,
n_cont
,
cyclone
,
&
real
(
extr
%
coord_proj
),
innermost_level_2
,
real
(
outside_points
_proj
)
,
&
ssh
,
real
(
corner
),
step
)
real
(
extr
%
coord_proj
),
innermost_level_2
,
real
(
outside_points
),
ssh
,
&
real
(
corner
),
step
)
! Done with outermost contour, now let us take care of the
! max-speed contour.
...
...
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