From 76f029aa3a5007ab2d11b967b9164431b2d9e8be Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ipsl.fr>
Date: Wed, 11 Sep 2024 16:26:49 +0200
Subject: [PATCH] Replace `grid_lon_lat` by `with_proj`
Replace dummy argument `grid_lon_lat` of procedure `shpc_create` by
`with_proj`.
---
Inst_eddies/Tests/examine_eddy.f90 | 2 +-
Inst_eddies/Tests/test_get_1_outerm.f90 | 2 +-
Inst_eddies/Tests/test_set_max_speed.f90 | 2 +-
Inst_eddies/inst_eddies.f90 | 4 ++--
Inst_eddies/shpc_create.f90 | 6 +++---
Overlap/Tests/save_snapshot.f90 | 4 ++--
Overlap/Tests/test_read_eddy.f90 | 2 +-
test_write_null.f90 | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Inst_eddies/Tests/examine_eddy.f90 b/Inst_eddies/Tests/examine_eddy.f90
index 65feda27..f615e4dc 100644
--- a/Inst_eddies/Tests/examine_eddy.f90
+++ b/Inst_eddies/Tests/examine_eddy.f90
@@ -207,7 +207,7 @@ program examine_eddy
outside_points)
call close_cont_list
call shpc_create(hshpc, shpc_dir = "SHPC", cyclone = cyclone, slice = 0, &
- grid_lon_lat = .true.)
+ with_proj = .false.)
call write_eddy(e, hshpc, date, 1)
write(hshpc%unit, fmt = *) 0
CALL shpc_close(hshpc)
diff --git a/Inst_eddies/Tests/test_get_1_outerm.f90 b/Inst_eddies/Tests/test_get_1_outerm.f90
index 9a9f6f12..fae7918b 100644
--- a/Inst_eddies/Tests/test_get_1_outerm.f90
+++ b/Inst_eddies/Tests/test_get_1_outerm.f90
@@ -108,7 +108,7 @@ program test_get_1_outerm
e%speed_cont = null_ssh_contour()
e%max_speed = missing_speed
call shpc_create(hshpc, shpc_dir = "SHPC", cyclone = cyclone, slice = 0, &
- grid_lon_lat = grid_lon_lat)
+ with_proj = .not. grid_lon_lat)
call write_eddy(e, hshpc, date, i = 1)
write(hshpc%unit, fmt = *) 0
CALL shpc_close(hshpc)
diff --git a/Inst_eddies/Tests/test_set_max_speed.f90 b/Inst_eddies/Tests/test_set_max_speed.f90
index 468723f3..9ad94f88 100644
--- a/Inst_eddies/Tests/test_set_max_speed.f90
+++ b/Inst_eddies/Tests/test_set_max_speed.f90
@@ -137,7 +137,7 @@ program test_set_max_speed
v(llc(1):urc(1), llc(2):urc(2)), real(llc))
call close_cont_list
call shpc_create(hshpc, shpc_dir = "SHPC", cyclone = cyclone, slice = 0, &
- grid_lon_lat = .true.)
+ with_proj = .false.)
call write_eddy(e, hshpc, d, eddy_index)
write(hshpc%unit, fmt = *) 0
CALL shpc_close(hshpc)
diff --git a/Inst_eddies/inst_eddies.f90 b/Inst_eddies/inst_eddies.f90
index 23927af0..dffcf5f2 100644
--- a/Inst_eddies/inst_eddies.f90
+++ b/Inst_eddies/inst_eddies.f90
@@ -137,9 +137,9 @@ program inst_eddies
else
print *, "inst_eddies: Opening failed so we will create a slice..."
call shpc_create(hshpc_cyclo, shpc_dir, cyclone = .true., slice = slice, &
- grid_lon_lat = .true.)
+ with_proj = .false.)
call shpc_create(hshpc_anti, shpc_dir, cyclone = .false., slice = slice, &
- grid_lon_lat = .true.)
+ with_proj = .false.)
end if
call cpu_time(t1)
diff --git a/Inst_eddies/shpc_create.f90 b/Inst_eddies/shpc_create.f90
index 480df2e0..c4d85819 100644
--- a/Inst_eddies/shpc_create.f90
+++ b/Inst_eddies/shpc_create.f90
@@ -4,7 +4,7 @@ module shpc_create_m
contains
- subroutine shpc_create(hshp, shpc_dir, cyclone, slice, grid_lon_lat)
+ subroutine shpc_create(hshp, shpc_dir, cyclone, slice, with_proj)
use, intrinsic:: ISO_FORTRAN_ENV
@@ -20,7 +20,7 @@ contains
character(len = *), intent(in):: shpc_dir
logical, intent(in):: cyclone
integer, intent(in):: slice
- logical, intent(in):: grid_lon_lat
+ logical, intent(in):: with_proj
! Local:
@@ -50,7 +50,7 @@ contains
nwidth = 13, ndecimals = 6)
! extr_proj shapefile:
- if (.not. grid_lon_lat) then
+ if (with_proj) then
call shp_create_03(hshp%dir // "/extr_proj", shpt_point, hshp%extr_proj)
call dbf_add_field_03(hshp%extr_proj_date, hshp%extr_proj, 'date', &
ftinteger, nwidth = 5, ndecimals = 0)
diff --git a/Overlap/Tests/save_snapshot.f90 b/Overlap/Tests/save_snapshot.f90
index 77a5d360..17be84b8 100644
--- a/Overlap/Tests/save_snapshot.f90
+++ b/Overlap/Tests/save_snapshot.f90
@@ -26,9 +26,9 @@ contains
!-----------------------------------------------------------------
call shpc_create(hshpc_cyclo, shpc_dir = "SHPC", cyclone = .true., &
- slice = 0, grid_lon_lat = .true.)
+ slice = 0, with_proj = .false.)
call shpc_create(hshpc_anti, shpc_dir = "SHPC", cyclone = .false., &
- slice = 0, grid_lon_lat = .true.)
+ slice = 0, with_proj = .false.)
call write_snapshot(s%list, hshpc_cyclo, hshpc_anti, d)
CALL shpc_close(hshpc_cyclo)
CALL shpc_close(hshpc_anti)
diff --git a/Overlap/Tests/test_read_eddy.f90 b/Overlap/Tests/test_read_eddy.f90
index 64a63dbc..6b7e4c08 100644
--- a/Overlap/Tests/test_read_eddy.f90
+++ b/Overlap/Tests/test_read_eddy.f90
@@ -29,7 +29,7 @@ program test_read_eddy
with_proj = .not. grid_lon_lat, pszaccess = "rb")
call read_eddy(e, k, eddy_i, hshp_in, ishape)
call shpc_create(hshp_out, shpc_dir = "SHPC", cyclone = hshp_in%cyclone, &
- slice = 0, grid_lon_lat = grid_lon_lat)
+ slice = 0, with_proj = .not. grid_lon_lat)
CALL shpc_close(hshp_in)
call write_eddy(e, hshp_out, k, eddy_i)
write(hshp_out%unit, fmt = *) 0
diff --git a/test_write_null.f90 b/test_write_null.f90
index c55c39b4..f4dfaf92 100644
--- a/test_write_null.f90
+++ b/test_write_null.f90
@@ -25,7 +25,7 @@ program test_write_null
call shpc_open(hshpc, shpc_dir = "SHPC", cyclone = .true., slice = 0, &
with_proj = .false., pszaccess = "rb+", iostat = iostat)
if (iostat /= 0) call shpc_create(hshpc, shpc_dir = "SHPC", &
- cyclone = .true., slice = 0, grid_lon_lat = .true.)
+ cyclone = .true., slice = 0, with_proj = .false.)
print *, "Enter namelist main_nml."
read(unit = *, nml = main_nml)
--
GitLab