From 9c44cf2e01ad2a0b21f7af60cdd244f3f7fb1027 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 29 Jun 2021 10:55:49 +0200
Subject: [PATCH] Rename dummy argument k of overlap to d
---
Overlap/Tests/test_overlap.f90 | 2 +-
Overlap/overlap.f90 | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Overlap/Tests/test_overlap.f90 b/Overlap/Tests/test_overlap.f90
index da6fb18d..6febf24a 100644
--- a/Overlap/Tests/test_overlap.f90
+++ b/Overlap/Tests/test_overlap.f90
@@ -103,7 +103,7 @@ program test_overlap
call shpc_create(hshp, shpc_dir = "SHPC", cyclone = hshp%cyclone)
call init_interpolated_eddy
- call overlap(flow, nlon, nlat, periodic, dist_lim, hshp, k = k_test_2, &
+ call overlap(flow, nlon, nlat, periodic, dist_lim, hshp, d = k_test_2, &
delta = max_delta, j = max_delta + 1)
close(unit_edge)
print *, 'Created file "edgelist.csv".'
diff --git a/Overlap/overlap.f90 b/Overlap/overlap.f90
index da2433e5..267f1035 100644
--- a/Overlap/overlap.f90
+++ b/Overlap/overlap.f90
@@ -4,11 +4,11 @@ module overlap_m
contains
- subroutine overlap(flow, nlon, nlat, periodic, dist_lim, hshp_interp, k, &
+ subroutine overlap(flow, nlon, nlat, periodic, dist_lim, hshp_interp, d, &
delta, j)
! This procedure finds edges between flow(j - delta) and flow(j),
- ! corresponding to dates k - delta and k. It calls write_overlap
+ ! corresponding to dates d - delta and d. It calls write_overlap
! for these edges. It updates flow(j - delta)%list_vis%delta_out,
! flow(j)%list_vis%delta_in and flow(j - delta + 1:j -
! 1)%number_eddies.
@@ -36,7 +36,7 @@ contains
! Collection of shapefiles to which any interpolated eddy will be written:
TYPE(shpc), intent(in):: hshp_interp
- integer, intent(in):: k ! date index
+ integer, intent(in):: d ! date, in days since 1950-1-1
integer, intent(in):: delta ! between 1 and max_delta
integer, intent(in):: j
@@ -122,7 +122,7 @@ contains
flow(j - delta + 1:j - 1)%number_eddies &
= flow(j - delta + 1:j - 1)%number_eddies + 1
- call write_overlap(hshp_interp, k, delta, i1, i2, m, &
+ call write_overlap(hshp_interp, d, delta, i1, i2, m, &
flow(j - delta + 1:j - 1)%number_eddies, &
flow(j - delta)%list_vis(i1)%cyclone, &
flow(j - delta)%list_vis(i1)%coord_extr, &
--
GitLab