diff --git a/Common/derived_types.f90 b/Common/derived_types.f90
index 240b734671c7cdb520a51631fc87815f7948777e..44d0a10e8b45476feeb3ac944dd29b2346afd374 100644
--- a/Common/derived_types.f90
+++ b/Common/derived_types.f90
@@ -67,7 +67,7 @@ module derived_types
! identification number or this extremum. 0 at other points.
end type snapshot
- type shpc_slice_handler
+ type ori_slice_handler
! Slice of a shapefile collection, for a given orientation
! (cyclonic or anticyclonic eddies).
@@ -90,7 +90,7 @@ module derived_types
max_speed_eddy_index
character(len = :), allocatable:: dir ! directory
- end type Shpc_Slice_Handler
+ end type Ori_Slice_Handler
type shpc_slice_meta
! Some metadata of a slice of SHPC
diff --git a/Common/ori_slice_open.f90 b/Common/ori_slice_open.f90
index de257d0d70a0e7eb2689868aa943c0f187af7cbe..8737f126ab59894a0497f6494f665c72031b61e4 100644
--- a/Common/ori_slice_open.f90
+++ b/Common/ori_slice_open.f90
@@ -15,11 +15,11 @@ contains
USE jumble, only: new_unit
use shapelib_03, only: shp_open_03
- use derived_types, only: shpc_slice_handler
+ use derived_types, only: ori_slice_handler
use get_slice_dir_m, only: get_slice_dir
use read_field_indices_m, only: read_field_indices
- TYPE(shpc_slice_handler), intent(out):: hshp
+ TYPE(ori_slice_handler), intent(out):: hshp
character(len = *), intent(in):: shpc_dir
logical, intent(in):: cyclone
integer, intent(in):: slice
diff --git a/Common/read_field_indices.f90 b/Common/read_field_indices.f90
index d7d0db3d4a33a02d4f9fa7203e305ef24cf467ba..ee2a53b1b4513ebde8c2e03b240ef94d152072f7 100644
--- a/Common/read_field_indices.f90
+++ b/Common/read_field_indices.f90
@@ -9,9 +9,9 @@ contains
! Libraries:
use shapelib_03, only: dbf_get_field_index_03
- use derived_types, only: shpc_slice_handler
+ use derived_types, only: ori_slice_handler
- TYPE(shpc_slice_handler), intent(inout):: hshp
+ TYPE(ori_slice_handler), intent(inout):: hshp
!---------------------------------------------------------------------
diff --git a/Common/shpc_close.f90 b/Common/shpc_close.f90
index 97be801a823c704a9fc9c291485db891ae3d8e8f..2bee2895f86ec0287c04ed486dbce81a222e0b34 100644
--- a/Common/shpc_close.f90
+++ b/Common/shpc_close.f90
@@ -9,9 +9,9 @@ contains
! Libraries:
use shapelib, only: shpclose
- use derived_types, only: shpc_slice_handler
+ use derived_types, only: ori_slice_handler
- TYPE(shpc_slice_handler), intent(inout):: hshp
+ TYPE(ori_slice_handler), intent(inout):: hshp
!-------------------------------------------------------------
diff --git a/Inst_eddies/Tests/examine_eddy.f90 b/Inst_eddies/Tests/examine_eddy.f90
index 614220af89c0bcf0db4d1f15a011b43bcf5e1de5..489ff2acb6e76ad43a289966f5b98438ec03a3c6 100644
--- a/Inst_eddies/Tests/examine_eddy.f90
+++ b/Inst_eddies/Tests/examine_eddy.f90
@@ -34,7 +34,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 derived_types, only: snapshot, ori_slice_handler, eddy
use input_ssh_m, only: input_ssh, corner_whole, step, nlon, uniform_lon_lat
use invert_proj_m, only: invert_proj
use read_eddy_m, only: read_eddy
@@ -80,7 +80,7 @@ program examine_eddy
! coordinates in projection space of all the significant extrema,
! except the target extremum
- TYPE(shpc_slice_handler) hshpc
+ TYPE(ori_slice_handler) hshpc
integer llc(2) ! indices in global grid of lower left corner
integer urc(2) ! indices in global grid of upper right corner
character(len = :), allocatable:: ssh_fname, u_fname, v_fname ! file names
diff --git a/Inst_eddies/Tests/test_get_1_outerm.f90 b/Inst_eddies/Tests/test_get_1_outerm.f90
index 0716951de86572e6a7d952cf6d919bf194fa9e4e..cdc41474b5216d55c18b24e81c6b61c204c89ccf 100644
--- a/Inst_eddies/Tests/test_get_1_outerm.f90
+++ b/Inst_eddies/Tests/test_get_1_outerm.f90
@@ -13,7 +13,7 @@ program test_get_1_outerm
shp_append_object_03, dbf_write_attribute_03
use config_m, only: config
- use derived_types, only: eddy, shpc_slice_handler, null_ssh_contour, &
+ use derived_types, only: eddy, ori_slice_handler, null_ssh_contour, &
missing_speed, ssh_contour
use get_1_outerm_m, only: get_1_outerm
use input_ssh_m, only: input_ssh, uniform_lon_lat
@@ -38,7 +38,7 @@ program test_get_1_outerm
logical:: cyclone = .true.
logical periodic ! grid is periodic in longitude
- TYPE(shpc_slice_handler) hshpc
+ TYPE(ori_slice_handler) hshpc
type(eddy) e
integer, allocatable:: outside_points(:, :) ! (2, :)
diff --git a/Inst_eddies/Tests/test_nearby_extr.f90 b/Inst_eddies/Tests/test_nearby_extr.f90
index e71ba9d1b521af6664e0370d03890b2a7db1a678..5df85a4cdb97f489e41fbb1829c4ce4d57d10664 100644
--- a/Inst_eddies/Tests/test_nearby_extr.f90
+++ b/Inst_eddies/Tests/test_nearby_extr.f90
@@ -4,7 +4,7 @@ program test_nearby_extr
use jumble, only: get_command_arg_dyn, read_opcol
use shapelib_03, only: dbf_read_attribute_03
- use derived_types, only: snapshot, shpc_slice_handler, shpc_slice_meta
+ use derived_types, only: snapshot, ori_slice_handler, shpc_slice_meta
use nearby_extr_m, only: nearby_extr
use read_grid_m, only: read_grid, uniform_lon_lat
use read_snapshot_m, only: read_snapshot
@@ -15,7 +15,7 @@ program test_nearby_extr
character(len = :), allocatable:: shpc_dir
type(snapshot) s
- TYPE(shpc_slice_handler) hshp
+ TYPE(ori_slice_handler) hshp
integer l
type(shpc_slice_meta) ssm
diff --git a/Inst_eddies/Tests/test_set_max_speed.f90 b/Inst_eddies/Tests/test_set_max_speed.f90
index eff02d0b068ea3e5559cb499311e0ecc2dbc0849..f42b5c36ede494f2b132ab8133a4a835721e016a 100644
--- a/Inst_eddies/Tests/test_set_max_speed.f90
+++ b/Inst_eddies/Tests/test_set_max_speed.f90
@@ -14,7 +14,7 @@ program test_set_max_speed
use config_m, only: config
use cont_list_m, only: create_cont_list, close_cont_list
- use derived_types, only: eddy, shpc_slice_handler, ssh_contour
+ use derived_types, only: eddy, ori_slice_handler, ssh_contour
use input_ssh_m, only: input_ssh, corner_whole, step, nlon, nlat, &
uniform_lon_lat
use read_eddy_m, only: read_eddy
@@ -31,7 +31,7 @@ program test_set_max_speed
integer d, eddy_index, n_cont, i, ishape
real, allocatable:: ssh(:, :) ! (nlon, nlat) sea-surface height, in m
type(eddy) e
- TYPE(shpc_slice_handler) hshpc
+ TYPE(ori_slice_handler) hshpc
character(len = :), allocatable:: path
! Window around the extremum:
diff --git a/Inst_eddies/inst_eddies.f90 b/Inst_eddies/inst_eddies.f90
index b4a2c9d23e3712ec12212ae8ed9ed3ae0922fa47..2a15183aa1f08a0f7444eb0230e933c340d8ad48 100644
--- a/Inst_eddies/inst_eddies.f90
+++ b/Inst_eddies/inst_eddies.f90
@@ -10,7 +10,7 @@ program inst_eddies
use numer_rec_95, only: indexx
use config_m, only: config, max_radius
- use derived_types, only: eddy, shpc_slice_handler
+ use derived_types, only: eddy, ori_slice_handler
use input_ssh_m, only: input_ssh, nlon, nlat, uniform_lon_lat
use nearby_extr_m, only: nearby_extr
use set_all_extr_m, only: set_all_extr
@@ -35,7 +35,7 @@ program inst_eddies
! periodic in longitude, else (nlon, nlat). At a point of extremum
! SSH: identification number or this extremum. 0 at other points.
- TYPE(shpc_slice_handler) hshpc_cyclo, hshpc_anti
+ TYPE(ori_slice_handler) hshpc_cyclo, hshpc_anti
integer i, l, n_arg
integer unit
logical periodic ! grid is periodic in longitude
diff --git a/Inst_eddies/shpc_create.f90 b/Inst_eddies/shpc_create.f90
index d2fb9a8169c03a8cb4e52f1e798c406e25fe50d4..b0fd4dc27951d8f4d3008f00b967f12d975793a8 100644
--- a/Inst_eddies/shpc_create.f90
+++ b/Inst_eddies/shpc_create.f90
@@ -13,10 +13,10 @@ contains
use shapelib, only: shpt_point, shpt_polygon, ftdouble, ftinteger
use shapelib_03, only: shp_create_03, dbf_add_field_03
- use derived_types, only: shpc_slice_handler
+ use derived_types, only: ori_slice_handler
use get_slice_dir_m, only: get_slice_dir
- TYPE(shpc_slice_handler), intent(out):: hshp
+ TYPE(ori_slice_handler), intent(out):: hshp
character(len = *), intent(in):: shpc_dir
logical, intent(in):: cyclone
integer, intent(in):: slice
diff --git a/Inst_eddies/write_eddy.f90 b/Inst_eddies/write_eddy.f90
index 1601ee348b05be46b1ff3c20755ba387b994ac60..260cbf5a900151aa485d4a956f64179b7199eb86 100644
--- a/Inst_eddies/write_eddy.f90
+++ b/Inst_eddies/write_eddy.f90
@@ -15,10 +15,10 @@ contains
use shapelib_03, only: shp_append_point_03, dbf_write_attribute_03, &
shp_append_object_03, shp_append_null_03
- use derived_types, only: eddy, shpc_slice_handler
+ use derived_types, only: eddy, ori_slice_handler
type(eddy), intent(in):: e
- TYPE(shpc_slice_handler), intent(in):: hshpc
+ TYPE(ori_slice_handler), intent(in):: hshpc
integer, intent(in):: date
integer, intent(in):: i ! eddy index
diff --git a/Inst_eddies/write_snapshot.f90 b/Inst_eddies/write_snapshot.f90
index b769448459e582fae55830845d227317d08ad502..6a31d1335bc30d4bf2d48507ca107b8c14bff747 100644
--- a/Inst_eddies/write_snapshot.f90
+++ b/Inst_eddies/write_snapshot.f90
@@ -9,7 +9,7 @@ contains
! Libraries:
use shapelib_03, only: shp_get_info_03
- use derived_types, only: eddy, shpc_slice_handler
+ use derived_types, only: eddy, ori_slice_handler
use write_eddy_m, only: write_eddy
type(eddy), intent(in):: list(:)
@@ -17,7 +17,7 @@ contains
! in the list. Eddies include "eddies" without an outermost
! contour, that is, only the extremum is defined.
- TYPE(shpc_slice_handler), intent(in):: hshpc_cyclo, hshpc_anti
+ TYPE(ori_slice_handler), intent(in):: hshpc_cyclo, hshpc_anti
integer, intent(in):: date
! Local:
diff --git a/Overlap/Tests/save_snapshot.f90 b/Overlap/Tests/save_snapshot.f90
index e49b721f2188eb0bf507947af21e770c42abbdbc..e34edf8d4af1d24d8c79a7a7722ae76c8ea376b6 100644
--- a/Overlap/Tests/save_snapshot.f90
+++ b/Overlap/Tests/save_snapshot.f90
@@ -10,7 +10,7 @@ contains
use jumble, only: arth, rad_to_deg
use read_grid_m, only: corner_whole, step, nlon, nlat, uniform_lon_lat
- use derived_types, only: snapshot, shpc_slice_handler
+ use derived_types, only: snapshot, ori_slice_handler
use shpc_close_m, only: shpc_close
use shpc_create_m, only: shpc_create
use write_extr_map_m, only: write_extr_map
@@ -20,7 +20,7 @@ contains
integer, intent(in):: copy, d
! Local:
- TYPE(shpc_slice_handler) hshpc_cyclo, hshpc_anti
+ TYPE(ori_slice_handler) hshpc_cyclo, hshpc_anti
!-----------------------------------------------------------------
diff --git a/Overlap/Tests/test_get_dispatch_snap.f90 b/Overlap/Tests/test_get_dispatch_snap.f90
index 5da3e9c0ed83be0fa4abe1aa31f4eda23e846c3d..146d1197e9b7b40caa2f455c930b566d1cc4cd62 100644
--- a/Overlap/Tests/test_get_dispatch_snap.f90
+++ b/Overlap/Tests/test_get_dispatch_snap.f90
@@ -8,7 +8,7 @@ program test_get_dispatch_snap
use shapelib_03, only: dbf_read_attribute_03
use config_graph_m, only: config_graph, copy
- use derived_types, only: snapshot, shpc_slice_handler, shpc_slice_meta
+ use derived_types, only: snapshot, ori_slice_handler, shpc_slice_meta
use dispatch_snapshot_m, only: dispatch_snapshot
use get_snapshot_m, only: get_snapshot
use read_grid_m, only: read_grid, uniform_lon_lat
@@ -21,7 +21,7 @@ program test_get_dispatch_snap
character(len = :), allocatable:: shpc_dir
type(snapshot) s
- TYPE(shpc_slice_handler) hshp
+ TYPE(ori_slice_handler) hshp
type(shpc_slice_meta) ssm
integer k_begin, rank, n_proc, k_end, n_dates
integer unit_isolated
diff --git a/Overlap/Tests/test_overlap.f90 b/Overlap/Tests/test_overlap.f90
index ce792cfe4f89be38b397023574b3f2f61dc9c9e7..a93b8c4dad512fdcbc2c71ba70ea98e50b2cbade 100644
--- a/Overlap/Tests/test_overlap.f90
+++ b/Overlap/Tests/test_overlap.f90
@@ -5,7 +5,7 @@ program test_overlap
use shapelib_03, only: dbf_read_attribute_03
use config_graph_m, only: config_graph, copy, max_delta, cyclone
- use derived_types, only: snapshot, shpc_slice_handler, shpc_slice_meta
+ use derived_types, only: snapshot, ori_slice_handler, shpc_slice_meta
use overlap_m, only: overlap
use read_grid_m, only: read_grid, uniform_lon_lat
use read_snapshot_m, only: read_snapshot
@@ -19,7 +19,7 @@ program test_overlap
integer:: k_test_1 = 0, k_test_2 = 1, i_slice = 0
integer unit, i, n_dates
type(snapshot), allocatable:: flow(:) ! (max_delta + 1)
- TYPE(shpc_slice_handler) hshp
+ TYPE(ori_slice_handler) hshp
type(shpc_slice_meta) ssm
integer e_overestim ! over-estimation of the number of eddies at each date
diff --git a/Overlap/Tests/test_read_eddy.f90 b/Overlap/Tests/test_read_eddy.f90
index 084008dac0410d298a98610f758f927e5a1c79a9..694a46b85bac05889f444edb130c4dfb9eb470b7 100644
--- a/Overlap/Tests/test_read_eddy.f90
+++ b/Overlap/Tests/test_read_eddy.f90
@@ -3,7 +3,7 @@ program test_read_eddy
! Library:
use jumble, only: get_command_arg_dyn
- use derived_types, only: eddy, shpc_slice_handler
+ use derived_types, only: eddy, ori_slice_handler
use read_eddy_m, only: read_eddy
use read_grid_m, only: read_grid, uniform_lon_lat
use shpc_close_m, only: shpc_close
@@ -16,7 +16,7 @@ program test_read_eddy
type(eddy) e
integer k, eddy_i
integer:: ishape = 0
- TYPE(shpc_slice_handler) hshp_in, hshp_out
+ TYPE(ori_slice_handler) hshp_in, hshp_out
character(len = :), allocatable:: shpc_dir
logical:: cyclone = .false.
namelist /main_nml/ ishape, cyclone
diff --git a/Overlap/Tests/test_read_snapshot.f90 b/Overlap/Tests/test_read_snapshot.f90
index ed40db6b9e6fd7315ae4ae6601e66da4c0b85760..d45833cb37b943cd929909faf9ba55fa4d9c0e46 100644
--- a/Overlap/Tests/test_read_snapshot.f90
+++ b/Overlap/Tests/test_read_snapshot.f90
@@ -7,7 +7,7 @@ program test_read_snapshot
use shapelib_03, only: dbf_read_attribute_03
use config_graph_m, only: config_graph, copy, cyclone
- use derived_types, only: snapshot, shpc_slice_handler, shpc_slice_meta
+ use derived_types, only: snapshot, ori_slice_handler, shpc_slice_meta
use read_grid_m, only: read_grid, uniform_lon_lat
use read_snapshot_m, only: read_snapshot
use shpc_close_m, only: shpc_close
@@ -18,7 +18,7 @@ program test_read_snapshot
character(len = :), allocatable:: shpc_dir
type(snapshot) s
- TYPE(shpc_slice_handler), allocatable:: hshp(:) ! (n_slices)
+ TYPE(ori_slice_handler), allocatable:: hshp(:) ! (n_slices)
type(shpc_slice_meta), allocatable:: ssm(:) ! (n_slices)
integer unit, k, i, iostat
integer n_slices ! number of input SHPC directories
diff --git a/Overlap/Tests/test_send_recv.f90 b/Overlap/Tests/test_send_recv.f90
index 38bd48510ce1e8379ab25bc0e7a136e2159ae4f3..3a8a68fe5cc61757da0803e908ef726f078cc0c2 100644
--- a/Overlap/Tests/test_send_recv.f90
+++ b/Overlap/Tests/test_send_recv.f90
@@ -9,7 +9,7 @@ program test_send_recv
use shapelib_03, only: dbf_read_attribute_03
use config_graph_m, only: config_graph, copy
- use derived_types, only: snapshot, shpc_slice_handler, shpc_slice_meta
+ use derived_types, only: snapshot, ori_slice_handler, shpc_slice_meta
use read_grid_m, only: read_grid, uniform_lon_lat
use read_snapshot_m, only: read_snapshot
use recv_snapshot_m, only: recv_snapshot
@@ -25,7 +25,7 @@ program test_send_recv
integer rank, n_proc, n_dates
logical flag
INTEGER(KIND=MPI_ADDRESS_KIND) attribute_val
- TYPE(shpc_slice_handler) hshp
+ TYPE(ori_slice_handler) hshp
type(shpc_slice_meta) ssm
!---------------------------------------------------------------------
diff --git a/Overlap/eddy_graph.f90 b/Overlap/eddy_graph.f90
index 42270260a5e97a2874a26c42f15d54a0e1e8177e..bc2ee3ea868b8af34e5263f02ead49f18f419099 100644
--- a/Overlap/eddy_graph.f90
+++ b/Overlap/eddy_graph.f90
@@ -9,7 +9,7 @@ program eddy_graph
use shapelib_03, only: dbf_read_attribute_03
use config_graph_m, only: config_graph, cyclone, max_delta
- use derived_types, only: snapshot, shpc_slice_handler, shpc_slice_meta
+ use derived_types, only: snapshot, ori_slice_handler, shpc_slice_meta
use dispatch_snapshot_m, only: dispatch_snapshot
use get_snapshot_m, only: get_snapshot
use overlap_m, only: overlap
@@ -29,7 +29,7 @@ program eddy_graph
integer unit_isolated, unit
integer n_slices ! number of slices in the input SHPC
integer e_overestim ! over-estimation of the number of eddies at each date
- TYPE(shpc_slice_handler), allocatable:: hshpc(:) ! (n_slices)
+ TYPE(ori_slice_handler), allocatable:: hshpc(:) ! (n_slices)
type(shpc_slice_meta), allocatable:: ssm(:) ! (n_slices)
type(snapshot), allocatable:: flow(:) ! (max_delta + 1)
character(len = 30) file
diff --git a/Overlap/get_snapshot.f90 b/Overlap/get_snapshot.f90
index ce3d767007bcc677dc7cf31c85b7c798a9e4098c..c4e9af33558a6e4300e3560ae6cc061eeda2388e 100644
--- a/Overlap/get_snapshot.f90
+++ b/Overlap/get_snapshot.f90
@@ -7,12 +7,12 @@ contains
subroutine get_snapshot(s, hshp, ssm, k, k_end, rank, n_proc)
use config_graph_m, only: copy, max_delta
- use derived_types, only: snapshot, shpc_slice_handler, shpc_slice_meta
+ use derived_types, only: snapshot, ori_slice_handler, shpc_slice_meta
use read_snapshot_m, only: read_snapshot
use recv_snapshot_m, only: recv_snapshot
type(snapshot), intent(out):: s
- TYPE(shpc_slice_handler), intent(in):: hshp(:) ! (n_slices)
+ TYPE(ori_slice_handler), intent(in):: hshp(:) ! (n_slices)
type(shpc_slice_meta), intent(in):: ssm(:) ! (n_slices)
integer, intent(in):: k ! date index
integer, intent(in):: k_end ! last date index analyzed by this MPI process
diff --git a/Overlap/read_eddy.f90 b/Overlap/read_eddy.f90
index ca1036f520a6e8c2574618373f283c76eaa36441..31930914662b885e2446b42554fec2fda95faaa1 100644
--- a/Overlap/read_eddy.f90
+++ b/Overlap/read_eddy.f90
@@ -15,7 +15,7 @@ contains
use jumble, only: deg_to_rad, pi
use shapelib_03, only: dbf_read_attribute_03, shp_read_point
- use derived_types, only: eddy, shpc_slice_handler, missing_speed
+ use derived_types, only: eddy, ori_slice_handler, missing_speed
type(eddy), intent(out):: e
! All components except e%innermost_level are defined. Component
@@ -25,7 +25,7 @@ contains
integer, intent(out):: d ! date
integer, intent(out):: i ! eddy index
- TYPE(shpc_slice_handler), intent(in):: hshp
+ TYPE(ori_slice_handler), intent(in):: hshp
integer, intent(in):: ishape ! 0-based
! Local:
diff --git a/Overlap/read_snapshot.f90 b/Overlap/read_snapshot.f90
index 5a35aae3b5f21d682b813854d225d709a333a4ea..7335fce82e5170507455d09fa30e29334228b27e 100644
--- a/Overlap/read_snapshot.f90
+++ b/Overlap/read_snapshot.f90
@@ -10,14 +10,14 @@ contains
use jumble, only: assert
use numer_rec_95, only: hunt
- use derived_types, only: snapshot, eddy, shpc_slice_handler, shpc_slice_meta
+ use derived_types, only: snapshot, eddy, ori_slice_handler, shpc_slice_meta
use read_eddy_m, only: read_eddy
use read_grid_m, only: nlon, nlat, corner_whole, step, uniform_lon_lat
type(snapshot), intent(out):: s
! completely defined except s%list%innermost_level
- TYPE(shpc_slice_handler), intent(in):: hshpc(:) ! (n_slices)
+ TYPE(ori_slice_handler), intent(in):: hshpc(:) ! (n_slices)
type(shpc_slice_meta), intent(in):: ssm(:) ! (n_slices)
integer, intent(in):: k ! date index
integer, intent(in):: copy
diff --git a/test_write_null.f90 b/test_write_null.f90
index 5950e22f5358f7555448be891477e30a2f81f148..af4553a9bc5a5768f54be19e37df4f48e16e2298 100644
--- a/test_write_null.f90
+++ b/test_write_null.f90
@@ -7,14 +7,14 @@ program test_write_null
use shapelib_03, only: shp_append_point_03, dbf_write_attribute_03, &
shp_append_null_03
- use derived_types, only: shpc_slice_handler
+ use derived_types, only: ori_slice_handler
use shpc_close_m, only: shpc_close
use shpc_create_m, only: shpc_create
use ori_slice_open_m, only: ori_slice_open
implicit none
- TYPE(shpc_slice_handler) hshpc
+ TYPE(ori_slice_handler) hshpc
integer i, ishape, iostat
integer:: n_eddies = 50000
logical:: mixed = .true.