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
3679c22e
Commit
3679c22e
authored
3 years ago
by
Lionel GUEZ
Browse files
Options
Downloads
Patches
Plain Diff
Rename k to d and `k_interp` to `d_interp`
parent
7aefe1b6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Overlap/write_overlap.f90
+8
-8
8 additions, 8 deletions
Overlap/write_overlap.f90
with
8 additions
and
8 deletions
Overlap/write_overlap.f90
+
8
−
8
View file @
3679c22e
...
@@ -9,11 +9,11 @@ module write_overlap_m
...
@@ -9,11 +9,11 @@ module write_overlap_m
contains
contains
subroutine
write_overlap
(
hshp_interp
,
k
,
delta
,
i1
,
i2
,
m
,
i_interp
,
&
subroutine
write_overlap
(
hshp_interp
,
d
,
delta
,
i1
,
i2
,
m
,
i_interp
,
&
cyclone
,
coord_extr_1
,
ssh_extr_1
,
coord_extr_2
,
ssh_extr_2
,
w
)
cyclone
,
coord_extr_1
,
ssh_extr_1
,
coord_extr_2
,
ssh_extr_2
,
w
)
! Writes edges to unit_edge and interpolated eddies to shapefiles,
! Writes edges to unit_edge and interpolated eddies to shapefiles,
! between (
k
- delta, i1) and (
k
, i2).
! between (
d
- delta, i1) and (
d
, i2).
! Libraries:
! Libraries:
use
nr_util
,
only
:
twopi
use
nr_util
,
only
:
twopi
...
@@ -23,7 +23,7 @@ contains
...
@@ -23,7 +23,7 @@ contains
use
write_eddy_m
,
only
:
write_eddy
use
write_eddy_m
,
only
:
write_eddy
TYPE
(
shpc
),
intent
(
in
)::
hshp_interp
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
,
i1
,
i2
,
m
integer
,
intent
(
in
)::
delta
,
i1
,
i2
,
m
integer
,
intent
(
in
)::
i_interp
(:)
! (delta - 1)
integer
,
intent
(
in
)::
i_interp
(:)
! (delta - 1)
logical
,
intent
(
in
)::
cyclone
logical
,
intent
(
in
)::
cyclone
...
@@ -37,7 +37,7 @@ contains
...
@@ -37,7 +37,7 @@ contains
real
,
intent
(
in
)::
w
real
,
intent
(
in
)::
w
! Local:
! Local:
integer
i_pred
,
j_interp
,
k
_interp
integer
i_pred
,
j_interp
,
d
_interp
real
w_interp
real
w_interp
real
coord_extr_2_local
(
2
)
real
coord_extr_2_local
(
2
)
...
@@ -63,14 +63,14 @@ contains
...
@@ -63,14 +63,14 @@ contains
+
w_interp
*
coord_extr_2_local
+
w_interp
*
coord_extr_2_local
e
%
ssh_extr
=
(
1
-
w_interp
)
*
ssh_extr_1
+
w_interp
*
ssh_extr_2
e
%
ssh_extr
=
(
1
-
w_interp
)
*
ssh_extr_1
+
w_interp
*
ssh_extr_2
k
_interp
=
k
-
delta
+
j_interp
d
_interp
=
d
-
delta
+
j_interp
call
write_eddy
(
e
,
hshp_interp
,
k
_interp
,
i_interp
(
j_interp
))
call
write_eddy
(
e
,
hshp_interp
,
d
_interp
,
i_interp
(
j_interp
))
write
(
unit_edge
,
fmt
=
*
)
k
_interp
-
1
,
i_pred
,
k
_interp
,
&
write
(
unit_edge
,
fmt
=
*
)
d
_interp
-
1
,
i_pred
,
d
_interp
,
&
i_interp
(
j_interp
),
w
i_interp
(
j_interp
),
w
i_pred
=
i_interp
(
j_interp
)
i_pred
=
i_interp
(
j_interp
)
end
do
end
do
write
(
unit_edge
,
fmt
=
*
)
k
-
1
,
i_pred
,
k
,
i2
,
w
write
(
unit_edge
,
fmt
=
*
)
d
-
1
,
i_pred
,
d
,
i2
,
w
end
subroutine
write_overlap
end
subroutine
write_overlap
...
...
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