diff --git a/Common/ori_slice_open.f90 b/Common/ori_slice_open.f90
index b05dbd0240f0330d8418bcb8af08b8391307d42a..db9332cd1b904f7d07d0c9fca9abacd62cfe90fd 100644
--- a/Common/ori_slice_open.f90
+++ b/Common/ori_slice_open.f90
@@ -1,10 +1,10 @@
-module shpc_open_m
+module ori_slice_open_m
implicit none
contains
- subroutine shpc_open(hshp, shpc_dir, cyclone, slice, with_proj, pszaccess, &
+ subroutine ori_slice_open(hshp, shpc_dir, cyclone, slice, with_proj, pszaccess, &
iostat)
! Opens a given slice of a given orientation in an SHPC.
@@ -57,7 +57,7 @@ contains
status = "old", action = "readwrite", position = "append")
end if
else if (.not. present(iostat)) then
- write(ERROR_UNIT, fmt = *) "shpc_open: failed"
+ write(ERROR_UNIT, fmt = *) "ori_slice_open: failed"
write(ERROR_UNIT, fmt = *) "shpc_dir = ", shpc_dir
write(ERROR_UNIT, fmt = *) "cyclone = ", cyclone
write(ERROR_UNIT, fmt = *) "slice = ", slice
@@ -66,6 +66,6 @@ contains
stop 1
end if
- end subroutine shpc_open
+ end subroutine ori_slice_open
-end module shpc_open_m
+end module ori_slice_open_m
diff --git a/Inst_eddies/Tests/test_nearby_extr.f90 b/Inst_eddies/Tests/test_nearby_extr.f90
index 138ac9b16c1cb1c166cf8329f16bf00093e534b3..e71ba9d1b521af6664e0370d03890b2a7db1a678 100644
--- a/Inst_eddies/Tests/test_nearby_extr.f90
+++ b/Inst_eddies/Tests/test_nearby_extr.f90
@@ -9,7 +9,7 @@ program test_nearby_extr
use read_grid_m, only: read_grid, uniform_lon_lat
use read_snapshot_m, only: read_snapshot
use shpc_close_m, only: shpc_close
- use shpc_open_m, only: shpc_open
+ use ori_slice_open_m, only: ori_slice_open
implicit none
@@ -31,7 +31,7 @@ program test_nearby_extr
print *, "Enter namelist main_nml."
read(unit = *, nml = main_nml)
call read_grid(rank = 0, shpc_dir = shpc_dir)
- call shpc_open(hshp, trim(shpc_dir), cyclone = .true., slice = 0, &
+ call ori_slice_open(hshp, trim(shpc_dir), cyclone = .true., slice = 0, &
with_proj = .not. uniform_lon_lat, pszaccess = "rb")
call dbf_read_attribute_03(ssm%d0, hshp%extremum, hshp%extr_date, ishape = 0)
call read_opcol(ssm%ishape_last, hshp%unit, my_lbound = ssm%d0)
diff --git a/Inst_eddies/Tests/test_set_max_speed.f90 b/Inst_eddies/Tests/test_set_max_speed.f90
index 60c120fb4470146921086c4f8e599d6d698e7b6b..eff02d0b068ea3e5559cb499311e0ecc2dbc0849 100644
--- a/Inst_eddies/Tests/test_set_max_speed.f90
+++ b/Inst_eddies/Tests/test_set_max_speed.f90
@@ -21,7 +21,7 @@ program test_set_max_speed
use set_max_speed_m, only: set_max_speed
use shpc_close_m, only: shpc_close
use shpc_create_m, only: shpc_create
- use shpc_open_m, only: shpc_open
+ use ori_slice_open_m, only: ori_slice_open
use write_eddy_m, only: write_eddy
implicit none
@@ -73,7 +73,7 @@ program test_set_max_speed
leave_trace = .true.)
print *, "test_set_max_speed: Reading from shapefiles..."
call get_command_arg_dyn(3, path, "Required 3rd argument: SHPC-directory")
- call shpc_open(hshpc, path, cyclone, slice = 0, &
+ call ori_slice_open(hshpc, path, cyclone, slice = 0, &
with_proj = .not. uniform_lon_lat, pszaccess = "rb")
call read_eddy(e, d, eddy_index, hshpc, ishape = 0)
CALL shpc_close(hshpc)
diff --git a/Inst_eddies/inst_eddies.f90 b/Inst_eddies/inst_eddies.f90
index 42fc6be727907bb5120ff415f0f46e5364412f59..b4a2c9d23e3712ec12212ae8ed9ed3ae0922fa47 100644
--- a/Inst_eddies/inst_eddies.f90
+++ b/Inst_eddies/inst_eddies.f90
@@ -16,7 +16,7 @@ program inst_eddies
use set_all_extr_m, only: set_all_extr
use set_contours_m, only: set_contours
use shpc_close_m, only: shpc_close
- use shpc_open_m, only: shpc_open
+ use ori_slice_open_m, only: ori_slice_open
use write_snapshot_m, only: write_snapshot
implicit none
@@ -102,9 +102,9 @@ program inst_eddies
position = "append")
call config(leave_trace)
call input_ssh(periodic, ssh, ssh_fname, u_fname, v_fname, leave_trace)
- call shpc_open(hshpc_cyclo, shpc_dir, cyclone = .true., slice = slice, &
+ call ori_slice_open(hshpc_cyclo, shpc_dir, cyclone = .true., slice = slice, &
with_proj = .not. uniform_lon_lat, pszaccess = "rb+")
- call shpc_open(hshpc_anti, shpc_dir, cyclone = .false., slice = slice, &
+ call ori_slice_open(hshpc_anti, shpc_dir, cyclone = .false., slice = slice, &
with_proj = .not. uniform_lon_lat, pszaccess = "rb+")
call cpu_time(t1)
write(unit, fmt = *) "CPU time for preamble, before computation:", t1 - t0, &
diff --git a/Overlap/Tests/test_get_dispatch_snap.f90 b/Overlap/Tests/test_get_dispatch_snap.f90
index 2f7870da7228a16a18003890e7323a0d9cf7bf52..5da3e9c0ed83be0fa4abe1aa31f4eda23e846c3d 100644
--- a/Overlap/Tests/test_get_dispatch_snap.f90
+++ b/Overlap/Tests/test_get_dispatch_snap.f90
@@ -14,7 +14,7 @@ program test_get_dispatch_snap
use read_grid_m, only: read_grid, uniform_lon_lat
use send_snapshot_m, only: send_snapshot
use shpc_close_m, only: shpc_close
- use shpc_open_m, only: shpc_open
+ use ori_slice_open_m, only: ori_slice_open
use save_snapshot_m, only: save_snapshot
implicit none
@@ -51,7 +51,7 @@ program test_get_dispatch_snap
write(unit = *, nml = main_nml)
end if
- call shpc_open(hshp, trim(shpc_dir), cyclone = .true., slice = 0, &
+ call ori_slice_open(hshp, trim(shpc_dir), cyclone = .true., slice = 0, &
with_proj = .not. uniform_lon_lat, pszaccess = "rb")
call dbf_read_attribute_03(ssm%d0, hshp%extremum, hshp%extr_date, ishape = 0)
call read_opcol(ssm%ishape_last, hshp%unit, my_lbound = ssm%d0)
diff --git a/Overlap/Tests/test_overlap.f90 b/Overlap/Tests/test_overlap.f90
index b087c32626c4cdc64e7859c1a7795ae725a6fd45..ce792cfe4f89be38b397023574b3f2f61dc9c9e7 100644
--- a/Overlap/Tests/test_overlap.f90
+++ b/Overlap/Tests/test_overlap.f90
@@ -10,7 +10,7 @@ program test_overlap
use read_grid_m, only: read_grid, uniform_lon_lat
use read_snapshot_m, only: read_snapshot
use shpc_close_m, only: shpc_close
- use shpc_open_m, only: shpc_open
+ use ori_slice_open_m, only: ori_slice_open
use unit_edge_m, only: open_edge_file, unit_edge
implicit none
@@ -37,7 +37,7 @@ program test_overlap
read(unit = *, nml = main_nml)
write(unit = *, nml = main_nml)
- call shpc_open(hshp, trim(shpc_dir), cyclone, i_slice, &
+ call ori_slice_open(hshp, trim(shpc_dir), cyclone, i_slice, &
with_proj = .not. uniform_lon_lat, pszaccess = "rb")
call dbf_read_attribute_03(ssm%d0, hshp%extremum, hshp%extr_date, ishape = 0)
call read_opcol(ssm%ishape_last, hshp%unit, my_lbound = ssm%d0)
diff --git a/Overlap/Tests/test_read_eddy.f90 b/Overlap/Tests/test_read_eddy.f90
index cc67084952b0ef7151c3d70269abfe3c294149b7..084008dac0410d298a98610f758f927e5a1c79a9 100644
--- a/Overlap/Tests/test_read_eddy.f90
+++ b/Overlap/Tests/test_read_eddy.f90
@@ -8,7 +8,7 @@ program test_read_eddy
use read_grid_m, only: read_grid, uniform_lon_lat
use shpc_close_m, only: shpc_close
use shpc_create_m, only: shpc_create
- use shpc_open_m, only: shpc_open
+ use ori_slice_open_m, only: ori_slice_open
use write_eddy_m, only: write_eddy
implicit none
@@ -27,7 +27,7 @@ program test_read_eddy
call read_grid(shpc_dir, rank = 0)
print *, "Enter namelist main_nml."
read(unit = *, nml = main_nml)
- call shpc_open(hshp_in, shpc_dir, cyclone, slice = 0, &
+ call ori_slice_open(hshp_in, shpc_dir, cyclone, slice = 0, &
with_proj = .not. uniform_lon_lat, pszaccess = "rb")
call read_eddy(e, k, eddy_i, hshp_in, ishape)
call shpc_create(hshp_out, shpc_dir = "SHPC", cyclone = hshp_in%cyclone, &
diff --git a/Overlap/Tests/test_read_snapshot.f90 b/Overlap/Tests/test_read_snapshot.f90
index dfbdf3db195687ab79e8ce05f961dd8ae3b4894e..ed40db6b9e6fd7315ae4ae6601e66da4c0b85760 100644
--- a/Overlap/Tests/test_read_snapshot.f90
+++ b/Overlap/Tests/test_read_snapshot.f90
@@ -11,7 +11,7 @@ program test_read_snapshot
use read_grid_m, only: read_grid, uniform_lon_lat
use read_snapshot_m, only: read_snapshot
use shpc_close_m, only: shpc_close
- use shpc_open_m, only: shpc_open
+ use ori_slice_open_m, only: ori_slice_open
use save_snapshot_m, only: save_snapshot
implicit none
@@ -49,7 +49,7 @@ program test_read_snapshot
allocate(hshp(n_slices), ssm(n_slices))
do i = 1, n_slices
- call shpc_open(hshp(i), trim(shpc_dir), cyclone, slice = i - 1, &
+ call ori_slice_open(hshp(i), trim(shpc_dir), cyclone, slice = i - 1, &
with_proj = .not. uniform_lon_lat, pszaccess = "rb")
call dbf_read_attribute_03(ssm(i)%d0, hshp(i)%extremum, &
hshp(i)%extr_date, ishape = 0)
diff --git a/Overlap/Tests/test_send_recv.f90 b/Overlap/Tests/test_send_recv.f90
index 580e19aa8046c5d8d50115c82fce6295a8dba180..38bd48510ce1e8379ab25bc0e7a136e2159ae4f3 100644
--- a/Overlap/Tests/test_send_recv.f90
+++ b/Overlap/Tests/test_send_recv.f90
@@ -16,7 +16,7 @@ program test_send_recv
use save_snapshot_m, only: save_snapshot
use send_snapshot_m, only: send_snapshot
use shpc_close_m, only: shpc_close
- use shpc_open_m, only: shpc_open
+ use ori_slice_open_m, only: ori_slice_open
implicit none
@@ -50,7 +50,7 @@ program test_send_recv
call read_grid(shpc_dir, rank)
call config_graph(rank)
- call shpc_open(hshp, trim(shpc_dir), cyclone = .false., slice = 0, &
+ call ori_slice_open(hshp, trim(shpc_dir), cyclone = .false., slice = 0, &
with_proj = .not. uniform_lon_lat, pszaccess = "rb")
call dbf_read_attribute_03(ssm%d0, hshp%extremum, hshp%extr_date, ishape = 0)
call read_opcol(ssm%ishape_last, hshp%unit, my_lbound = ssm%d0)
diff --git a/Overlap/eddy_graph.f90 b/Overlap/eddy_graph.f90
index 0c124fcbd451c11d743187f443d01a2b777c4804..42270260a5e97a2874a26c42f15d54a0e1e8177e 100644
--- a/Overlap/eddy_graph.f90
+++ b/Overlap/eddy_graph.f90
@@ -15,7 +15,7 @@ program eddy_graph
use overlap_m, only: overlap
use read_grid_m, only: read_grid, uniform_lon_lat
use unit_edge_m, only: open_edge_file, unit_edge
- use shpc_open_m, only: shpc_open
+ use ori_slice_open_m, only: ori_slice_open
use shpc_close_m, only: shpc_close
implicit none
@@ -90,7 +90,7 @@ program eddy_graph
allocate(hshpc(n_slices), ssm(n_slices))
do i = 1, n_slices
- call shpc_open(hshpc(i), trim(shpc_dir), cyclone, &
+ call ori_slice_open(hshpc(i), trim(shpc_dir), cyclone, &
slice = first_slice + i - 1, with_proj = .not. uniform_lon_lat, &
pszaccess = "rb")
call dbf_read_attribute_03(ssm(i)%d0, hshpc(i)%extremum, &
diff --git a/test_write_null.f90 b/test_write_null.f90
index f4dfaf9299862179434c3770f0c4ed52b970af07..5950e22f5358f7555448be891477e30a2f81f148 100644
--- a/test_write_null.f90
+++ b/test_write_null.f90
@@ -10,7 +10,7 @@ program test_write_null
use derived_types, only: shpc_slice_handler
use shpc_close_m, only: shpc_close
use shpc_create_m, only: shpc_create
- use shpc_open_m, only: shpc_open
+ use ori_slice_open_m, only: ori_slice_open
implicit none
@@ -22,7 +22,7 @@ program test_write_null
!--------------------------------------------------------------
- call shpc_open(hshpc, shpc_dir = "SHPC", cyclone = .true., slice = 0, &
+ call ori_slice_open(hshpc, shpc_dir = "SHPC", cyclone = .true., slice = 0, &
with_proj = .false., pszaccess = "rb+", iostat = iostat)
if (iostat /= 0) call shpc_create(hshpc, shpc_dir = "SHPC", &
cyclone = .true., slice = 0, with_proj = .false.)