From a5522586c5a1dc81dceb4bc05b8dc6e43015d572 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ipsl.fr>
Date: Thu, 12 Sep 2024 14:53:21 +0200
Subject: [PATCH] Rename variable `corner` to `corner_whole`
Rename variable `corner` of module `read_grid_m` to `corner_whole`. As
in module `input_ssh_m`. Cf. commit ef43e372.
---
Overlap/Tests/save_snapshot.f90 | 7 ++++---
Overlap/read_grid.F90 | 6 +++---
Overlap/read_snapshot.f90 | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Overlap/Tests/save_snapshot.f90 b/Overlap/Tests/save_snapshot.f90
index 33d4d2f8..624e50bb 100644
--- a/Overlap/Tests/save_snapshot.f90
+++ b/Overlap/Tests/save_snapshot.f90
@@ -9,7 +9,7 @@ contains
! Libraries:
use jumble, only: arth, rad_to_deg
- use read_grid_m, only: corner, step, nlon, nlat
+ use read_grid_m, only: corner_whole, step, nlon, nlat
use derived_types, only: snapshot, shpc_slice_handler
use shpc_close_m, only: shpc_close
use shpc_create_m, only: shpc_create
@@ -33,9 +33,10 @@ contains
CALL shpc_close(hshpc_anti)
print *, 'Created a slice in SHPC.'
print *, "Number of extrema:", s%number_extr
- call write_extr_map(s%extr_map, longitude = arth((corner(1) - copy &
+ call write_extr_map(s%extr_map, longitude = arth((corner_whole(1) - copy &
* step(1)) * rad_to_deg, step(1) * rad_to_deg, nlon + 2 * copy), &
- latitude = arth(corner(2) * rad_to_deg, step(2) * rad_to_deg, nlat))
+ latitude = arth(corner_whole(2) * rad_to_deg, step(2) * rad_to_deg, &
+ nlat))
end subroutine save_snapshot
diff --git a/Overlap/read_grid.F90 b/Overlap/read_grid.F90
index 93eca2fb..400ebaab 100644
--- a/Overlap/read_grid.F90
+++ b/Overlap/read_grid.F90
@@ -8,7 +8,7 @@ module read_grid_m
logical, protected:: periodic = .false. ! grid is periodic in longitude
- real, protected:: corner(2)
+ real, protected:: corner_whole(2)
! longitude and latitude of the corner of the whole grid in input
! NetCDF file, in rad
@@ -52,7 +52,7 @@ contains
action = "read", position = "rewind")
read(unit, nml = grid_nml)
close(unit)
- corner = corner_deg * deg_to_rad
+ corner_whole = corner_deg * deg_to_rad
step = step_deg * deg_to_rad
end if
@@ -60,7 +60,7 @@ contains
call ezmpi_bcast(nlon, root = 0)
call ezmpi_bcast(nlat, root = 0)
call ezmpi_bcast(periodic, root = 0)
- call ezmpi_bcast(corner, root = 0)
+ call ezmpi_bcast(corner_whole, root = 0)
call ezmpi_bcast(step, root = 0)
call ezmpi_bcast(uniform_lon_lat, root = 0)
#endif
diff --git a/Overlap/read_snapshot.f90 b/Overlap/read_snapshot.f90
index dc82e890..5a35aae3 100644
--- a/Overlap/read_snapshot.f90
+++ b/Overlap/read_snapshot.f90
@@ -12,7 +12,7 @@ contains
use derived_types, only: snapshot, eddy, shpc_slice_handler, shpc_slice_meta
use read_eddy_m, only: read_eddy
- use read_grid_m, only: nlon, nlat, corner, step, uniform_lon_lat
+ use read_grid_m, only: nlon, nlat, corner_whole, step, uniform_lon_lat
type(snapshot), intent(out):: s
! completely defined except s%list%innermost_level
@@ -67,7 +67,7 @@ contains
! we define them here:
if (s%number_extr /= 0 .and. uniform_lon_lat) &
forall (eddy_i = 1:s%number_extr) s%list(eddy_i)%extr%coord_proj &
- = nint((s%list(eddy_i)%extr%coord - corner) / step + 1.)
+ = nint((s%list(eddy_i)%extr%coord - corner_whole) / step + 1.)
! Define s%extr_map from s%list%extr%coord_proj:
--
GitLab