From b740c1921f9a6002075f9fd9f431b7b4c9d78095 Mon Sep 17 00:00:00 2001 From: Lionel GUEZ <guez@lmd.ens.fr> Date: Thu, 17 Jun 2021 16:54:25 +0200 Subject: [PATCH] Rename variable `shp_tr_dir` to `shpc_dir` --- Overlap/Tests/test_read_snapshot.f90 | 9 ++++----- Overlap/Tests/test_send_recv.f90 | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Overlap/Tests/test_read_snapshot.f90 b/Overlap/Tests/test_read_snapshot.f90 index 7a42e69c..54029359 100644 --- a/Overlap/Tests/test_read_snapshot.f90 +++ b/Overlap/Tests/test_read_snapshot.f90 @@ -16,7 +16,7 @@ program test_read_snapshot implicit none - character(len = :), allocatable:: shp_tr_dir + character(len = :), allocatable:: shpc_dir type(snapshot) s TYPE(shp_tr) hshp integer k1, copy, unit @@ -42,8 +42,7 @@ program test_read_snapshot !------------------------------------------------------------------------- call mpi_init - call get_command_arg_dyn(1, shp_tr_dir, & - "Required argument: SHP-triplet-directory") + call get_command_arg_dyn(1, shpc_dir, "Required argument: SHPC-directory") write(unit = error_unit, nml = main_nml) write(unit = error_unit, fmt = *) "Enter namelist main_nml." @@ -51,7 +50,7 @@ program test_read_snapshot write(unit = *, nml = main_nml) call new_unit(unit) - open(unit, file = shp_tr_dir // "/grid_nml.txt", status = "old", & + open(unit, file = shpc_dir // "/grid_nml.txt", status = "old", & action = "read", position = "rewind") read(unit, nml = grid_nml) close(unit) @@ -64,7 +63,7 @@ program test_read_snapshot "test_read_snapshot dist_lim") copy = merge(dist_lim, 0, periodic) - call shp_tr_open(hshp, trim(shp_tr_dir), rank = 0) + call shp_tr_open(hshp, trim(shpc_dir), rank = 0) call dbf_read_attribute_03(k1, hshp%extremum, hshp%extr_date, ishape = 0) call read_snapshot(s, k1, hshp, corner_deg * deg_to_rad, & step_deg * deg_to_rad, nlon, nlat, copy, k1, ishape_last = [3]) diff --git a/Overlap/Tests/test_send_recv.f90 b/Overlap/Tests/test_send_recv.f90 index cc5b3195..5ff7defa 100644 --- a/Overlap/Tests/test_send_recv.f90 +++ b/Overlap/Tests/test_send_recv.f90 @@ -22,7 +22,7 @@ program test_send_recv implicit none - character(len = :), allocatable:: shp_tr_dir + character(len = :), allocatable:: shpc_dir type(snapshot) s integer rank, n_proc, k1, copy, n_dates, unit logical flag @@ -58,8 +58,7 @@ program test_send_recv call mpi_abort(MPI_Comm_world, errorcode = 1) end if - call get_command_arg_dyn(1, shp_tr_dir, & - "Required argument: SHP-triplet-directory") + call get_command_arg_dyn(1, shpc_dir, "Required argument: SHPC-directory") if (rank == 0) then call MPI_Comm_get_attr(MPI_Comm_world, MPI_io, attribute_val, flag) @@ -73,7 +72,7 @@ program test_send_recv write(unit = *, nml = main_nml) call new_unit(unit) - open(unit, file = shp_tr_dir // "/grid_nml.txt", status = "old", & + open(unit, file = shpc_dir // "/grid_nml.txt", status = "old", & action = "read", position = "rewind") read(unit, nml = grid_nml) close(unit) @@ -86,7 +85,7 @@ program test_send_recv "test_send_recv dist_lim") copy = merge(dist_lim, 0, periodic) call read_column(ishape_last, & - file = trim(shp_tr_dir) // "/ishape_last.txt") + file = trim(shpc_dir) // "/ishape_last.txt") n_dates = size(ishape_last) end if @@ -99,7 +98,7 @@ program test_send_recv if (rank == 1) allocate(ishape_last(n_dates)) call ezmpi_bcast(ishape_last, root = 0) - call shp_tr_open(hshp, trim(shp_tr_dir), rank) + call shp_tr_open(hshp, trim(shpc_dir), rank) if (rank == 0) call dbf_read_attribute_03(k1, hshp%extremum, hshp%extr_date, & ishape = 0) call ezmpi_bcast(k1, root = 0) -- GitLab