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
4d1d7423
Commit
4d1d7423
authored
8 months ago
by
GUEZ Lionel
Browse files
Options
Downloads
Patches
Plain Diff
Change type of `corner_proj` to integer
Avoiding conversion back and forth to real.
parent
ab82573f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Inst_eddies/Tests/examine_eddy.f90
+2
-2
2 additions, 2 deletions
Inst_eddies/Tests/examine_eddy.f90
Inst_eddies/inst_eddies.f90
+1
-1
1 addition, 1 deletion
Inst_eddies/inst_eddies.f90
Inst_eddies/set_contours.f90
+4
-4
4 additions, 4 deletions
Inst_eddies/set_contours.f90
with
7 additions
and
7 deletions
Inst_eddies/Tests/examine_eddy.f90
+
2
−
2
View file @
4d1d7423
...
@@ -189,8 +189,8 @@ program examine_eddy
...
@@ -189,8 +189,8 @@ program examine_eddy
call
create_cont_list
call
create_cont_list
call
set_contours
(
e
%
out_cont
,
e
%
speed_cont
,
e
%
max_speed
,
cyclone
,
e
%
extr
,
&
call
set_contours
(
e
%
out_cont
,
e
%
speed_cont
,
e
%
max_speed
,
cyclone
,
e
%
extr
,
&
e
%
innermost_level
,
step
,
ssh
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
&
e
%
innermost_level
,
step
,
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
)),
&
u
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
v
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
llc
,
&
real
(
llc
),
outside_points
)
outside_points
)
call
close_cont_list
call
close_cont_list
call
shpc_create
(
hshpc
,
shpc_dir
=
"SHPC"
,
cyclone
=
cyclone
,
slice
=
0
,
&
call
shpc_create
(
hshpc
,
shpc_dir
=
"SHPC"
,
cyclone
=
cyclone
,
slice
=
0
,
&
grid_lon_lat
=
.true.
)
grid_lon_lat
=
.true.
)
...
...
This diff is collapsed.
Click to expand it.
Inst_eddies/inst_eddies.f90
+
1
−
1
View file @
4d1d7423
...
@@ -172,7 +172,7 @@ program inst_eddies
...
@@ -172,7 +172,7 @@ program inst_eddies
s
%
list
(
i
)
%
max_speed
,
s
%
list
(
i
)
%
cyclone
,
s
%
list
(
i
)
%
extr
,
&
s
%
list
(
i
)
%
max_speed
,
s
%
list
(
i
)
%
cyclone
,
s
%
list
(
i
)
%
extr
,
&
s
%
list
(
i
)
%
innermost_level
,
step
,
ssh
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
&
s
%
list
(
i
)
%
innermost_level
,
step
,
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
)),
&
u
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
v
(
llc
(
1
):
urc
(
1
),
llc
(
2
):
urc
(
2
)),
&
real
(
llc
)
,
outside_points
)
llc
,
outside_points
)
end
do
end
do
call
cpu_time
(
t1
)
call
cpu_time
(
t1
)
...
...
This diff is collapsed.
Click to expand it.
Inst_eddies/set_contours.f90
+
4
−
4
View file @
4d1d7423
...
@@ -41,7 +41,7 @@ contains
...
@@ -41,7 +41,7 @@ contains
real
,
intent
(
in
),
dimension
(:,
:)::
ssh
,
u
,
v
real
,
intent
(
in
),
dimension
(:,
:)::
ssh
,
u
,
v
! sea-surface height, in m, and wind, in m s-1
! sea-surface height, in m, and wind, in m s-1
real
,
intent
(
in
)::
corner_proj
(:)
! (2)
integer
,
intent
(
in
)::
corner_proj
(:)
! (2)
! Coordinates in projection space of the corner of the grid,
! Coordinates in projection space of the corner of the grid,
! corresponding to ssh(1, 1). A priori, this is not the corner of
! corresponding to ssh(1, 1). A priori, this is not the corner of
! the grid of the NetCDF file.
! the grid of the NetCDF file.
...
@@ -95,7 +95,7 @@ contains
...
@@ -95,7 +95,7 @@ contains
call
get_1_outerm
(
out_cont
,
cont_list
,
cont_list_proj
,
n_cont
,
cyclone
,
&
call
get_1_outerm
(
out_cont
,
cont_list
,
cont_list_proj
,
n_cont
,
cyclone
,
&
real
(
extr
%
coord_proj
),
innermost_level_2
,
outside_points
,
ssh
,
&
real
(
extr
%
coord_proj
),
innermost_level_2
,
outside_points
,
ssh
,
&
corner_proj
,
step
)
real
(
corner_proj
)
,
step
)
! Done with outermost contour, now let us take care of the
! Done with outermost contour, now let us take care of the
! max-speed contour.
! max-speed contour.
...
@@ -104,9 +104,9 @@ contains
...
@@ -104,9 +104,9 @@ contains
! {begin} Restrict the field to the outermost contour:
! {begin} Restrict the field to the outermost contour:
corner_window
=
floor
(
minval
(
cont_list_proj
(
n_cont
)
%
points
,
dim
=
2
))
corner_window
=
floor
(
minval
(
cont_list_proj
(
n_cont
)
%
points
,
dim
=
2
))
llc
=
corner_window
-
nint
(
corner_proj
)
+
1
llc
=
corner_window
-
corner_proj
+
1
urc
=
ceiling
(
maxval
(
cont_list_proj
(
n_cont
)
%
points
,
dim
=
2
))
&
urc
=
ceiling
(
maxval
(
cont_list_proj
(
n_cont
)
%
points
,
dim
=
2
))
&
-
nint
(
corner_proj
)
+
1
-
corner_proj
+
1
! Should have no effect except because of roundup error:
! Should have no effect except because of roundup error:
urc
(
2
)
=
min
(
urc
(
2
),
size
(
ssh
,
2
))
urc
(
2
)
=
min
(
urc
(
2
),
size
(
ssh
,
2
))
...
...
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