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
95986f99
Commit
95986f99
authored
6 months ago
by
GUEZ Lionel
Browse files
Options
Downloads
Patches
Plain Diff
Use function `shp_read_point`
parent
f7452fff
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/read_eddy.f90
+5
-8
5 additions, 8 deletions
Overlap/read_eddy.f90
with
5 additions
and
8 deletions
Overlap/read_eddy.f90
+
5
−
8
View file @
95986f99
...
@@ -13,9 +13,8 @@ contains
...
@@ -13,9 +13,8 @@ contains
use
contour_531
,
only
:
null_polyline
use
contour_531
,
only
:
null_polyline
use
gpc_f
,
only
:
shp_read_pol
,
polygon
use
gpc_f
,
only
:
shp_read_pol
,
polygon
use
jumble
,
only
:
deg_to_rad
,
pi
use
jumble
,
only
:
deg_to_rad
,
pi
use
shapelib
,
only
:
shpobject
,
shpdestroyobject
,
shpfileisnull
use
shapelib
,
only
:
shpfileisnull
use
shapelib_03
,
only
:
shp_read_object_03
,
dbf_read_attribute_03
,
&
use
shapelib_03
,
only
:
dbf_read_attribute_03
,
shp_read_point
shp_read_point
use
derived_types
,
only
:
eddy
,
shpc_slice_handler
,
missing_speed
use
derived_types
,
only
:
eddy
,
shpc_slice_handler
,
missing_speed
...
@@ -31,9 +30,8 @@ contains
...
@@ -31,9 +30,8 @@ contains
integer
,
intent
(
in
)::
ishape
! 0-based
integer
,
intent
(
in
)::
ishape
! 0-based
! Local:
! Local:
TYPE
(
shpobject
)
psobject
type
(
polygon
)
p
type
(
polygon
)
p
real
attr
real
attr
,
point
(
2
)
!---------------------------------------------------------------------
!---------------------------------------------------------------------
...
@@ -53,9 +51,8 @@ contains
...
@@ -53,9 +51,8 @@ contains
! extr_proj:
! extr_proj:
if
(
.not.
shpfileisnull
(
hshp
%
extr_proj
))
then
if
(
.not.
shpfileisnull
(
hshp
%
extr_proj
))
then
call
shp_read_object_03
(
hshp
%
extr_proj
,
ishape
,
psobject
)
call
shp_read_point
(
point
,
hshp
%
extr_proj
,
ishape
)
e
%
extr
%
coord_proj
=
nint
([
psobject
%
padfx
(
1
),
psobject
%
padfy
(
1
)])
e
%
extr
%
coord_proj
=
nint
(
point
)
call
shpdestroyobject
(
psobject
)
end
if
end
if
! outermost_contour:
! outermost_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