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
c9c67fcf
Commit
c9c67fcf
authored
3 years ago
by
Lionel GUEZ
Browse files
Options
Downloads
Patches
Plain Diff
Allow field radius4 to be missing
Useful to read shapefiles from conversion of Matlab data.
parent
c9c7b858
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
Common/read_eddy.f90
+7
-2
7 additions, 2 deletions
Common/read_eddy.f90
Common/read_field_indices.F90
+4
-1
4 additions, 1 deletion
Common/read_field_indices.F90
with
11 additions
and
3 deletions
Common/read_eddy.f90
+
7
−
2
View file @
c9c67fcf
...
...
@@ -63,8 +63,13 @@ contains
call
dbf_read_attribute_03
(
e
%
out_cont
%
ssh
,
hshp
%
outermost
,
hshp
%
out_ssh
,
&
ishape
)
call
dbf_read_attribute_03
(
e
%
radius4
,
hshp
%
outermost
,
hshp
%
out_radius4
,
&
ishape
)
if
(
hshp
%
out_radius4
/
=
-
1
)
then
call
dbf_read_attribute_03
(
e
%
radius4
,
hshp
%
outermost
,
hshp
%
out_radius4
,
&
ishape
)
else
e
%
radius4
=
-
1
end
if
call
shp_read_object_03
(
hshp
%
outermost
,
ishape
,
psobject
)
p
=
shpobj2pol
(
psobject
)
...
...
This diff is collapsed.
Click to expand it.
Common/read_field_indices.F90
+
4
−
1
View file @
c9c67fcf
...
...
@@ -7,6 +7,7 @@ contains
subroutine
read_field_indices
(
hshp
)
! Libraries:
use
shapelib
,
only
:
dbfgetfieldindex
use
shapelib_03
,
only
:
dbf_get_field_index_03
use
derived_types
,
only
:
shpc
...
...
@@ -28,7 +29,9 @@ contains
call
dbf_get_field_index_03
(
hshp
%
outermost
,
"date"
,
hshp
%
out_date
)
call
dbf_get_field_index_03
(
hshp
%
outermost
,
"eddy_index"
,
&
hshp
%
out_eddy_index
)
call
dbf_get_field_index_03
(
hshp
%
outermost
,
"radius4"
,
hshp
%
out_radius4
)
! We allow the field radius4 to be missing:
hshp
%
out_radius4
=
dbfgetfieldindex
(
hshp
%
outermost
,
"radius4"
)
call
dbf_get_field_index_03
(
hshp
%
max_speed
,
"r_eq_area"
,
&
hshp
%
max_speed_r_eq_area
)
...
...
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