From 0f6ef04d3b564984912e25ea650ea7c8d4592029 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Fri, 22 Jul 2022 16:13:38 +0200
Subject: [PATCH] Do not read in `shpc_open`
We are more clearly separating opening files and reading from them.
---
Common/shpc_open.f90 | 8 ++------
Inst_eddies/Tests/test_nearby_extr.f90 | 5 ++++-
Overlap/Tests/test_get_dispatch_snap.f90 | 3 +++
Overlap/Tests/test_overlap.f90 | 4 ++++
Overlap/Tests/test_read_eddy.f90 | 6 +++++-
Overlap/Tests/test_read_snapshot.f90 | 7 ++++++-
Overlap/Tests/test_send_recv.f90 | 3 +++
Overlap/eddy_graph.f90 | 8 +++++++-
8 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/Common/shpc_open.f90 b/Common/shpc_open.f90
index b943c2d7..01da636c 100644
--- a/Common/shpc_open.f90
+++ b/Common/shpc_open.f90
@@ -7,8 +7,8 @@ contains
subroutine shpc_open(hshp, shpc_dir, pszaccess)
! Libraries:
- USE jumble, only: new_unit, read_column
- use shapelib_03, only: shp_open_03, dbf_read_attribute_03
+ USE jumble, only: new_unit
+ use shapelib_03, only: shp_open_03
use derived_types, only: shpc
use read_field_indices_m, only: read_field_indices
@@ -36,10 +36,6 @@ contains
close(unit)
hshp%cyclone = trim(adjustl(orientation)) == "cyclones"
hshp%dir = shpc_dir
- call dbf_read_attribute_03(hshp%d0, hshp%extremum, hshp%extr_date, &
- ishape = 0)
- call read_column(hshp%ishape_last, file = shpc_dir // "/ishape_last.txt", &
- my_lbound = hshp%d0)
end subroutine shpc_open
diff --git a/Inst_eddies/Tests/test_nearby_extr.f90 b/Inst_eddies/Tests/test_nearby_extr.f90
index 705b8b01..ab3754b6 100644
--- a/Inst_eddies/Tests/test_nearby_extr.f90
+++ b/Inst_eddies/Tests/test_nearby_extr.f90
@@ -1,7 +1,7 @@
program test_nearby_extr
! Libraries:
- use jumble, only: get_command_arg_dyn, new_unit
+ use jumble, only: get_command_arg_dyn, new_unit, read_column
use jumble, only: deg_to_rad, rad_to_deg
use shapelib_03, only: dbf_read_attribute_03
@@ -44,6 +44,9 @@ program test_nearby_extr
close(unit)
call shpc_open(hshp, trim(shpc_dir), pszaccess = "rb")
+ call dbf_read_attribute_03(hshp%d0, hshp%extremum, hshp%extr_date, ishape = 0)
+ call read_column(hshp%ishape_last, file = shpc_dir // "/ishape_last.txt", &
+ my_lbound = hshp%d0)
call read_snapshot(s, [hshp], nlon, nlat, k = hshp%d0, &
corner = corner_deg * deg_to_rad, step = step_deg * deg_to_rad, &
copy = 0)
diff --git a/Overlap/Tests/test_get_dispatch_snap.f90 b/Overlap/Tests/test_get_dispatch_snap.f90
index 6d5edb68..38377a9c 100644
--- a/Overlap/Tests/test_get_dispatch_snap.f90
+++ b/Overlap/Tests/test_get_dispatch_snap.f90
@@ -73,6 +73,9 @@ program test_get_dispatch_snap
end if
call shpc_open(hshp, trim(shpc_dir), pszaccess = "rb")
+ call dbf_read_attribute_03(hshp%d0, hshp%extremum, hshp%extr_date, ishape = 0)
+ call read_column(hshp%ishape_last, file = shpc_dir // "/ishape_last.txt", &
+ my_lbound = hshp%d0)
if (rank == 0) then
n_dates = size(hshp%ishape_last)
diff --git a/Overlap/Tests/test_overlap.f90 b/Overlap/Tests/test_overlap.f90
index c95e675b..35d919a1 100644
--- a/Overlap/Tests/test_overlap.f90
+++ b/Overlap/Tests/test_overlap.f90
@@ -65,6 +65,10 @@ program test_overlap
step = step_deg * deg_to_rad
allocate(flow(max_delta + 1))
call shpc_open(hshp, trim(shpc_dir), pszaccess = "rb")
+ call dbf_read_attribute_03(hshp%d0, hshp%extremum, hshp%extr_date, &
+ ishape = 0)
+ call read_column(hshp%ishape_last, file = shpc_dir // "/ishape_last.txt", &
+ my_lbound = hshp%d0)
n_dates = size(hshp%ishape_last)
call assert(hshp%d0 <= [k_test_1, k_test_2] .and. [k_test_1, k_test_2] &
< hshp%d0 + n_dates, "test_overlap k_test_1, k_test_2")
diff --git a/Overlap/Tests/test_read_eddy.f90 b/Overlap/Tests/test_read_eddy.f90
index 7f63edce..eae08f0d 100644
--- a/Overlap/Tests/test_read_eddy.f90
+++ b/Overlap/Tests/test_read_eddy.f90
@@ -1,7 +1,8 @@
program test_read_eddy
! Library:
- use jumble, only: get_command_arg_dyn
+ use jumble, only: get_command_arg_dyn, read_column
+ use shapelib_03, only: dbf_read_attribute_03
use derived_types, only: eddy, shpc
use read_eddy_m, only: read_eddy
@@ -25,6 +26,9 @@ program test_read_eddy
print *, "Enter namelist main_nml."
read(unit = *, nml = main_nml)
call shpc_open(hshp, shpc_dir, pszaccess = "rb")
+ call dbf_read_attribute_03(hshp%d0, hshp%extremum, hshp%extr_date, ishape = 0)
+ call read_column(hshp%ishape_last, file = shpc_dir // "/ishape_last.txt", &
+ my_lbound = hshp%d0)
call read_eddy(e, k, eddy_i, hshp, ishape)
CALL shpc_close(hshp)
diff --git a/Overlap/Tests/test_read_snapshot.f90 b/Overlap/Tests/test_read_snapshot.f90
index ef7107c7..f540c8e5 100644
--- a/Overlap/Tests/test_read_snapshot.f90
+++ b/Overlap/Tests/test_read_snapshot.f90
@@ -3,7 +3,8 @@ program test_read_snapshot
use, intrinsic:: ISO_FORTRAN_ENV
! Libraries:
- use jumble, only: get_command_arg_dyn, new_unit, deg_to_rad, assert
+ use jumble, only: get_command_arg_dyn, new_unit, deg_to_rad, assert, &
+ read_column
use shapelib_03, only: dbf_read_attribute_03
use derived_types, only: snapshot, shpc
@@ -48,6 +49,10 @@ program test_read_snapshot
do i = 1, n_shpc
call get_command_arg_dyn(i, shpc_dir)
call shpc_open(hshp(i), trim(shpc_dir), pszaccess = "rb")
+ call dbf_read_attribute_03(hshp(i)%d0, hshp(i)%extremum, &
+ hshp(i)%extr_date, ishape = 0)
+ call read_column(hshp(i)%ishape_last, &
+ file = shpc_dir // "/ishape_last.txt", my_lbound = hshp(i)%d0)
end do
! Assuming grid_nml.txt is the same in all input SHPC:
diff --git a/Overlap/Tests/test_send_recv.f90 b/Overlap/Tests/test_send_recv.f90
index e097f374..75397cbd 100644
--- a/Overlap/Tests/test_send_recv.f90
+++ b/Overlap/Tests/test_send_recv.f90
@@ -83,6 +83,9 @@ program test_send_recv
end if
call shpc_open(hshp, trim(shpc_dir), pszaccess = "rb")
+ call dbf_read_attribute_03(hshp%d0, hshp%extremum, hshp%extr_date, ishape = 0)
+ call read_column(hshp%ishape_last, file = shpc_dir // "/ishape_last.txt", &
+ my_lbound = hshp%d0)
if (rank == 0) then
n_dates = size(hshp%ishape_last)
diff --git a/Overlap/eddy_graph.f90 b/Overlap/eddy_graph.f90
index 7e3f9bf7..76e2222c 100644
--- a/Overlap/eddy_graph.f90
+++ b/Overlap/eddy_graph.f90
@@ -4,9 +4,11 @@ program eddy_graph
! Libraries:
use ezmpi, only: ezmpi_bcast
- use jumble, only: get_command_arg_dyn, new_unit, ediff1d, assert, deg_to_rad
+ use jumble, only: get_command_arg_dyn, new_unit, ediff1d, assert, &
+ deg_to_rad, read_column
use mpi_f08, only: mpi_init, mpi_finalize, MPI_Comm_rank, MPI_Comm_world, &
MPI_Comm_size
+ use shapelib_03, only: dbf_read_attribute_03
use derived_types, only: snapshot, shpc
use dispatch_snapshot_m, only: dispatch_snapshot
@@ -77,6 +79,10 @@ program eddy_graph
do i = 1, n_shpc
call get_command_arg_dyn(i, shpc_dir)
call shpc_open(hshpc(i), trim(shpc_dir), pszaccess = "rb")
+ call dbf_read_attribute_03(hshpc(i)%d0, hshpc(i)%extremum, &
+ hshpc(i)%extr_date, ishape = 0)
+ call read_column(hshpc(i)%ishape_last, &
+ file = shpc_dir // "/ishape_last.txt", my_lbound = hshpc(i)%d0)
end do
if (rank == 0) then
--
GitLab