diff --git a/Overlap/Tests/test_get_dispatch_snap.f90 b/Overlap/Tests/test_get_dispatch_snap.f90
index e7d40f5a11fa45dd42960a99437d3cd74d481b68..2f7870da7228a16a18003890e7323a0d9cf7bf52 100644
--- a/Overlap/Tests/test_get_dispatch_snap.f90
+++ b/Overlap/Tests/test_get_dispatch_snap.f90
@@ -41,7 +41,7 @@ program test_get_dispatch_snap
   end if
 
   call get_command_arg_dyn(1, shpc_dir, "Required argument: SHPC-directory")
-  call read_grid(rank, shpc_dir)
+  call read_grid(shpc_dir, rank)
   call config_graph(rank)
 
   if (rank == 0) then
diff --git a/Overlap/Tests/test_overlap.f90 b/Overlap/Tests/test_overlap.f90
index 098f20fbc55c20db1baf6cf4ae271582c9b24b20..b087c32626c4cdc64e7859c1a7795ae725a6fd45 100644
--- a/Overlap/Tests/test_overlap.f90
+++ b/Overlap/Tests/test_overlap.f90
@@ -28,7 +28,7 @@ program test_overlap
   !-------------------------------------------------------------------------
 
   call get_command_arg_dyn(1, shpc_dir, "Required argument: SHPC-directory")
-  call read_grid(rank = 0, shpc_dir = shpc_dir)
+  call read_grid(shpc_dir, rank = 0)
   call config_graph(rank = 0)
 
   ! main_nml:
diff --git a/Overlap/Tests/test_read_eddy.f90 b/Overlap/Tests/test_read_eddy.f90
index 77e8f52cea19da5e68e9a86eb6ea176e01a2ed54..cc67084952b0ef7151c3d70269abfe3c294149b7 100644
--- a/Overlap/Tests/test_read_eddy.f90
+++ b/Overlap/Tests/test_read_eddy.f90
@@ -24,7 +24,7 @@ program test_read_eddy
   !-------------------------------------------------------------------------
 
   call get_command_arg_dyn(1, shpc_dir, "Required argument: SHPC-directory")
-  call read_grid(rank = 0, shpc_dir = shpc_dir)
+  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, &
diff --git a/Overlap/Tests/test_read_snapshot.f90 b/Overlap/Tests/test_read_snapshot.f90
index 442a64d5de6ff1c15f7a1cbb6a8d260b8fc03f62..dfbdf3db195687ab79e8ce05f961dd8ae3b4894e 100644
--- a/Overlap/Tests/test_read_snapshot.f90
+++ b/Overlap/Tests/test_read_snapshot.f90
@@ -28,7 +28,7 @@ program test_read_snapshot
   !-------------------------------------------------------------------------
 
   call get_command_arg_dyn(1, shpc_dir, "Required argument: SHPC-directory")
-  call read_grid(rank = 0, shpc_dir = shpc_dir)
+  call read_grid(shpc_dir, rank = 0)
   call config_graph(rank = 0)
 
   ! n_slices:
diff --git a/Overlap/Tests/test_send_recv.f90 b/Overlap/Tests/test_send_recv.f90
index f90e660ef736f53d862aa555c8b1467be02f6c3c..580e19aa8046c5d8d50115c82fce6295a8dba180 100644
--- a/Overlap/Tests/test_send_recv.f90
+++ b/Overlap/Tests/test_send_recv.f90
@@ -48,7 +48,7 @@ program test_send_recv
           "test_send_recv MPI_io MPI_ANY_SOURCE")
   end if
 
-  call read_grid(rank, shpc_dir)
+  call read_grid(shpc_dir, rank)
   call config_graph(rank)
   call shpc_open(hshp, trim(shpc_dir), cyclone = .false., slice = 0, &
        with_proj = .not. uniform_lon_lat, pszaccess = "rb")
diff --git a/Overlap/eddy_graph.f90 b/Overlap/eddy_graph.f90
index c68a0c5c211579154382202fd76f290ec0c5267e..0c124fcbd451c11d743187f443d01a2b777c4804 100644
--- a/Overlap/eddy_graph.f90
+++ b/Overlap/eddy_graph.f90
@@ -47,7 +47,7 @@ program eddy_graph
   call MPI_Comm_rank(MPI_Comm_world, rank)
   call MPI_Comm_size(MPI_Comm_world, n_proc)
   call get_command_arg_dyn(1, shpc_dir, "Required argument: SHPC-directory")
-  call read_grid(rank, shpc_dir)
+  call read_grid(shpc_dir, rank)
   call config_graph(rank)
 
   if (rank == 0) then
diff --git a/Overlap/read_grid.F90 b/Overlap/read_grid.F90
index 663e38485c200a956d850078a001d0509c7b0731..93eca2fbde47fc5c0a33cbef3a7a121f4508a7dd 100644
--- a/Overlap/read_grid.F90
+++ b/Overlap/read_grid.F90
@@ -19,7 +19,7 @@ module read_grid_m
 
 contains
 
-  subroutine read_grid(rank, shpc_dir)
+  subroutine read_grid(shpc_dir, rank)
 
     ! Libraries:
 #ifndef CPP_SEQUENTIAL
@@ -27,8 +27,8 @@ contains
 #endif
     use jumble, only: new_unit, deg_to_rad
 
-    integer, intent(in):: rank
     character(len = *), intent(in):: shpc_dir
+    integer, intent(in):: rank
 
     ! Local: