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
9c44cf2e
Commit
9c44cf2e
authored
3 years ago
by
Lionel GUEZ
Browse files
Options
Downloads
Patches
Plain Diff
Rename dummy argument k of overlap to d
parent
65433fa5
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
Overlap/Tests/test_overlap.f90
+1
-1
1 addition, 1 deletion
Overlap/Tests/test_overlap.f90
Overlap/overlap.f90
+4
-4
4 additions, 4 deletions
Overlap/overlap.f90
with
5 additions
and
5 deletions
Overlap/Tests/test_overlap.f90
+
1
−
1
View file @
9c44cf2e
...
...
@@ -103,7 +103,7 @@ program test_overlap
call
shpc_create
(
hshp
,
shpc_dir
=
"SHPC"
,
cyclone
=
hshp
%
cyclone
)
call
init_interpolated_eddy
call
overlap
(
flow
,
nlon
,
nlat
,
periodic
,
dist_lim
,
hshp
,
k
=
k_test_2
,
&
call
overlap
(
flow
,
nlon
,
nlat
,
periodic
,
dist_lim
,
hshp
,
d
=
k_test_2
,
&
delta
=
max_delta
,
j
=
max_delta
+
1
)
close
(
unit_edge
)
print
*
,
'Created file "edgelist.csv".'
...
...
This diff is collapsed.
Click to expand it.
Overlap/overlap.f90
+
4
−
4
View file @
9c44cf2e
...
...
@@ -4,11 +4,11 @@ module overlap_m
contains
subroutine
overlap
(
flow
,
nlon
,
nlat
,
periodic
,
dist_lim
,
hshp_interp
,
k
,
&
subroutine
overlap
(
flow
,
nlon
,
nlat
,
periodic
,
dist_lim
,
hshp_interp
,
d
,
&
delta
,
j
)
! This procedure finds edges between flow(j - delta) and flow(j),
! corresponding to dates
k
- delta and
k
. It calls write_overlap
! corresponding to dates
d
- delta and
d
. It calls write_overlap
! for these edges. It updates flow(j - delta)%list_vis%delta_out,
! flow(j)%list_vis%delta_in and flow(j - delta + 1:j -
! 1)%number_eddies.
...
...
@@ -36,7 +36,7 @@ contains
! Collection of shapefiles to which any interpolated eddy will be written:
TYPE
(
shpc
),
intent
(
in
)::
hshp_interp
integer
,
intent
(
in
)::
k
! date in
dex
integer
,
intent
(
in
)::
d
! date
,
in
days since 1950-1-1
integer
,
intent
(
in
)::
delta
! between 1 and max_delta
integer
,
intent
(
in
)::
j
...
...
@@ -122,7 +122,7 @@ contains
flow
(
j
-
delta
+
1
:
j
-
1
)
%
number_eddies
&
=
flow
(
j
-
delta
+
1
:
j
-
1
)
%
number_eddies
+
1
call
write_overlap
(
hshp_interp
,
k
,
delta
,
i1
,
i2
,
m
,
&
call
write_overlap
(
hshp_interp
,
d
,
delta
,
i1
,
i2
,
m
,
&
flow
(
j
-
delta
+
1
:
j
-
1
)
%
number_eddies
,
&
flow
(
j
-
delta
)
%
list_vis
(
i1
)
%
cyclone
,
&
flow
(
j
-
delta
)
%
list_vis
(
i1
)
%
coord_extr
,
&
...
...
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