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
d43d67a6
Commit
d43d67a6
authored
6 months ago
by
GUEZ Lionel
Browse files
Options
Downloads
Patches
Plain Diff
Read `extr_proj` if not `uniform_lon_lat`
In program `examine_eddy`.
parent
76f029aa
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Inst_eddies/Tests/examine_eddy.f90
+16
-5
16 additions, 5 deletions
Inst_eddies/Tests/examine_eddy.f90
with
16 additions
and
5 deletions
Inst_eddies/Tests/examine_eddy.f90
+
16
−
5
View file @
d43d67a6
...
...
@@ -35,7 +35,7 @@ program examine_eddy
use
config_m
,
only
:
config
,
max_radius
use
cont_list_m
,
only
:
create_cont_list
,
close_cont_list
use
derived_types
,
only
:
snapshot
,
shpc_slice_handler
,
eddy
use
input_ssh_m
,
only
:
input_ssh
,
corner_whole
,
step
,
nlon
use
input_ssh_m
,
only
:
input_ssh
,
corner_whole
,
step
,
nlon
,
uniform_lon_lat
use
read_eddy_m
,
only
:
read_eddy
use
shpc_create_m
,
only
:
shpc_create
use
set_all_extr_m
,
only
:
set_all_extr
...
...
@@ -122,8 +122,14 @@ program examine_eddy
slice_o_dir
=
slice_dir
//
"/Anticyclones"
end
if
call
shp_open_03
(
hshp
,
pszshapefile
=
slice_o_dir
//
"/extremum"
,
&
pszaccess
=
"rb"
)
if
(
uniform_lon_lat
)
then
call
shp_open_03
(
hshp
,
pszshapefile
=
slice_o_dir
//
"/extremum"
,
&
pszaccess
=
"rb"
)
else
call
shp_open_03
(
hshp
,
pszshapefile
=
slice_o_dir
//
"/extr_proj"
,
&
pszaccess
=
"rb"
)
end
if
call
dbf_get_field_index_03
(
hshp
,
"date"
,
ifield
)
call
dbf_read_attribute_03
(
d0
,
hshp
,
ifield
,
ishape
=
0
)
call
read_column
(
ishape_last
,
file
=
slice_o_dir
//
"/ishape_last.txt"
,
&
...
...
@@ -140,8 +146,13 @@ program examine_eddy
do
ishape
=
ishape_first
,
ishape_last
(
date
)
call
shp_read_point
(
coord
,
hshp
,
ishape
)
coord_proj
(:,
ishape
-
ishape_first
+
1
)
=
nint
((
coord
*
deg_to_rad
&
-
corner_whole
)
/
step
+
1.
)
if
(
uniform_lon_lat
)
then
coord_proj
(:,
ishape
-
ishape_first
+
1
)
=
nint
((
coord
*
deg_to_rad
&
-
corner_whole
)
/
step
+
1.
)
else
coord_proj
(:,
ishape
-
ishape_first
+
1
)
=
nint
(
coord
)
end
if
end
do
e
%
extr
%
coord
=
(
coord_proj
(:,
eddy_i_target
)
-
1
)
*
step
+
corner_whole
...
...
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