diff --git a/Common/read_snapshot.f90 b/Common/read_snapshot.f90
index d4fcbd3d5897298bed8fa63bd1bd80091d8576cd..8b645b7df93de07001c38a058c14e6c7fc324154 100644
--- a/Common/read_snapshot.f90
+++ b/Common/read_snapshot.f90
@@ -4,7 +4,7 @@ module read_snapshot_m
 
 contains
 
-  subroutine read_snapshot(s, k, hshp, corner, step, nlon, nlat, copy, d_init, &
+  subroutine read_snapshot(s, hshp, nlon, nlat, d_init, k, corner, step, copy, &
        ishape_last)
 
     ! Note: read_field_indices must have been called before read_snapshot.
@@ -17,19 +17,21 @@ contains
     use read_eddy_m, only: read_eddy
 
     type(snapshot), intent(out):: s ! completely defined
-    integer, intent(in):: k ! date index
     TYPE(shpc), intent(in):: hshp
 
+    integer, intent(in):: nlon, nlat
+    ! size of ssh array in input NetCDF, assuming no repeated point if
+    ! the grid is global
+
+    integer, intent(in):: d_init
+    integer, intent(in):: k ! date index
+
     real, intent(in):: corner(:) ! (2) longitude and latitude of the
     ! corner of the whole grid in input NetCDF, in rad
 
     real, intent(in):: step(:) ! (2) longitude and latitude steps, in rad
 
-    integer, intent(in):: nlon, nlat
-    ! size of ssh array in input NetCDF, assuming no repeated point if
-    ! the grid is global
-
-    integer, intent(in):: copy, d_init, ishape_last(:)
+    integer, intent(in):: copy, ishape_last(:)
 
     ! Local:
     integer ishape, ishape_first
diff --git a/Inst_eddies/Tests/test_nearby_extr.f90 b/Inst_eddies/Tests/test_nearby_extr.f90
index b69228adadbedd4224556f7467c399df59544c49..48a14dc33f613b0f0f3f73e986c9cb0a286ddbc0 100644
--- a/Inst_eddies/Tests/test_nearby_extr.f90
+++ b/Inst_eddies/Tests/test_nearby_extr.f90
@@ -52,9 +52,9 @@ program test_nearby_extr
 
   call shpc_open(hshp, trim(shpc_dir), rank = 0)
   call dbf_read_attribute_03(d_init, hshp%extremum, hshp%extr_date, ishape = 0)
-  call read_snapshot(s, d_init, hshp, corner_deg * deg_to_rad, &
-       step_deg * deg_to_rad, nlon, nlat, copy = 0, d_init = d_init, &
-       ishape_last = [ishape_last])
+  call read_snapshot(s, hshp, nlon, nlat, d_init, k = d_init, &
+       corner = corner_deg * deg_to_rad, step = step_deg * deg_to_rad, &
+       copy = 0, ishape_last = [ishape_last])
   CALL shpc_close(hshp)
 
   nearby = nearby_extr(s%extr_map, s%list_vis, i = 4)
diff --git a/Overlap/Tests/test_overlap.f90 b/Overlap/Tests/test_overlap.f90
index 9727a25df98d39269ebdfe2cb8facba4fd9b055b..da6fb18d5f0bdcbb1507c8e794f717b5aaa6525d 100644
--- a/Overlap/Tests/test_overlap.f90
+++ b/Overlap/Tests/test_overlap.f90
@@ -81,10 +81,10 @@ program test_overlap
   call read_column(ishape_last, file = trim(shpc_dir) // "/ishape_last.txt")
   call shpc_open(hshp, trim(shpc_dir), rank = 0)
   call dbf_read_attribute_03(d_init, hshp%extremum, hshp%extr_date, ishape = 0)
-  call read_snapshot(flow(1), k_test_1, hshp, corner, step, nlon, nlat, copy, &
-       d_init, ishape_last)
-  call read_snapshot(flow(max_delta + 1), k_test_2, hshp, corner, step, nlon, &
-       nlat, copy, d_init, ishape_last)
+  call read_snapshot(flow(1), hshp, nlon, nlat, d_init, k_test_1, corner, &
+       step, copy, ishape_last)
+  call read_snapshot(flow(max_delta + 1), hshp, nlon, nlat, d_init, k_test_2, &
+       corner, step, copy, ishape_last)
   CALL shpc_close(hshp)
   print *, "Enter flow(1)%list_vis%delta_out (array with ", &
        flow(1)%number_vis_extr, " values):"
diff --git a/Overlap/Tests/test_read_snapshot.f90 b/Overlap/Tests/test_read_snapshot.f90
index 07c653ddddc0ba4b3aa3a696cc8ebed5da2e89eb..d9016d8c9150d2535c7305cc58923039d587bf14 100644
--- a/Overlap/Tests/test_read_snapshot.f90
+++ b/Overlap/Tests/test_read_snapshot.f90
@@ -70,8 +70,9 @@ program test_read_snapshot
 
   call shpc_open(hshp, trim(shpc_dir), rank = 0)
   call dbf_read_attribute_03(d_init, hshp%extremum, hshp%extr_date, ishape = 0)
-  call read_snapshot(s, d_init, hshp, corner_deg * deg_to_rad, &
-       step_deg * deg_to_rad, nlon, nlat, copy, d_init, [ishape_last])
+  call read_snapshot(s, hshp, nlon, nlat, d_init, k = d_init, &
+       corner = corner_deg * deg_to_rad, step = step_deg * deg_to_rad, &
+       copy = copy, ishape_last = [ishape_last])
   CALL shpc_close(hshp)
 
   call write_snapshot(s, corner_deg, step_deg, nlon, nlat, copy, d_init)
diff --git a/Overlap/Tests/test_send_recv.f90 b/Overlap/Tests/test_send_recv.f90
index f19ec4033706b89fadccf4c81c120929e63b4a40..68f7d276390215688194f4ee64d6fae946796f5b 100644
--- a/Overlap/Tests/test_send_recv.f90
+++ b/Overlap/Tests/test_send_recv.f90
@@ -102,8 +102,9 @@ program test_send_recv
   if (rank == 0) call dbf_read_attribute_03(d_init, hshp%extremum, &
        hshp%extr_date, ishape = 0)
   call ezmpi_bcast(d_init, root = 0)
-  if (rank == 1) call read_snapshot(s, d_init, hshp, corner_deg * deg_to_rad, &
-       step_deg * deg_to_rad, nlon, nlat, copy, d_init, ishape_last)
+  if (rank == 1) call read_snapshot(s, hshp, nlon, nlat, d_init, k = d_init, &
+       corner = corner_deg * deg_to_rad, step = step_deg * deg_to_rad, &
+       copy = copy, ishape_last = ishape_last)
   CALL shpc_close(hshp)
 
   if (rank == 1) then
diff --git a/Overlap/get_snapshot.f90 b/Overlap/get_snapshot.f90
index 30431c0fb1e4adf7a6e76b01e35ac54fa6720702..a5a737a990f532993ec2f97fc65e95f254eef39d 100644
--- a/Overlap/get_snapshot.f90
+++ b/Overlap/get_snapshot.f90
@@ -40,7 +40,7 @@ contains
     !--------------------------------------------------------------
 
     if (rank == n_proc - 1 .or. k <= k_end - max_delta) then
-       call read_snapshot(s, k, hshp, corner, step, nlon, nlat, copy, d_init, &
+       call read_snapshot(s, hshp, nlon, nlat, d_init, k, corner, step, copy, &
             ishape_last)
     else
        call recv_snapshot(s, nlon, nlat, copy, source = rank + 1, tag = k)