From 62d0f068be868c601213090a8241a52063eaff6b Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 29 Jun 2021 13:13:03 +0200
Subject: [PATCH] Work with date index in tests
Follow-up to commit 3b68dd5.
---
Inst_eddies/Tests/test_nearby_extr.f90 | 2 +-
Overlap/Tests/test_overlap.f90 | 6 +++---
Overlap/Tests/test_read_snapshot.f90 | 2 +-
Overlap/Tests/test_send_recv.f90 | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Inst_eddies/Tests/test_nearby_extr.f90 b/Inst_eddies/Tests/test_nearby_extr.f90
index 48a14dc3..df39bd69 100644
--- a/Inst_eddies/Tests/test_nearby_extr.f90
+++ b/Inst_eddies/Tests/test_nearby_extr.f90
@@ -52,7 +52,7 @@ 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, hshp, nlon, nlat, d_init, k = d_init, &
+ call read_snapshot(s, hshp, nlon, nlat, d_init, k = 0, &
corner = corner_deg * deg_to_rad, step = step_deg * deg_to_rad, &
copy = 0, ishape_last = [ishape_last])
CALL shpc_close(hshp)
diff --git a/Overlap/Tests/test_overlap.f90 b/Overlap/Tests/test_overlap.f90
index 6febf24a..a966d662 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), 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, &
+ call read_snapshot(flow(1), hshp, nlon, nlat, d_init, k_test_1 - d_init, &
corner, step, copy, ishape_last)
+ call read_snapshot(flow(max_delta + 1), hshp, nlon, nlat, d_init, &
+ k_test_2 - d_init, 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 d9016d8c..a3f277ed 100644
--- a/Overlap/Tests/test_read_snapshot.f90
+++ b/Overlap/Tests/test_read_snapshot.f90
@@ -70,7 +70,7 @@ 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, hshp, nlon, nlat, d_init, k = d_init, &
+ call read_snapshot(s, hshp, nlon, nlat, d_init, k = 0, &
corner = corner_deg * deg_to_rad, step = step_deg * deg_to_rad, &
copy = copy, ishape_last = [ishape_last])
CALL shpc_close(hshp)
diff --git a/Overlap/Tests/test_send_recv.f90 b/Overlap/Tests/test_send_recv.f90
index 68f7d276..4dff6b16 100644
--- a/Overlap/Tests/test_send_recv.f90
+++ b/Overlap/Tests/test_send_recv.f90
@@ -102,19 +102,19 @@ 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, hshp, nlon, nlat, d_init, k = d_init, &
+ if (rank == 1) call read_snapshot(s, hshp, nlon, nlat, d_init, k = 0, &
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
- call send_snapshot(s, dest = 0, tag = d_init)
+ call send_snapshot(s, dest = 0, tag = 0)
else
! rank == 0
call MPI_Comm_get_attr(MPI_Comm_world, MPI_TAG_UB, attribute_val, flag)
call assert(flag, "test_send_recv MPI_Comm_get_attr MPI_TAG_UB")
print *, "MPI_TAG_UB = ", attribute_val
- call recv_snapshot(s, nlon, nlat, copy, source = 1, tag = d_init)
+ call recv_snapshot(s, nlon, nlat, copy, source = 1, tag = 0)
call write_snapshot(s, corner_deg, step_deg, nlon, nlat, copy, d_init)
end if
--
GitLab