From ff66ef80cce1b5cad2a09e7bfa74750707760e39 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Thu, 8 Aug 2019 20:35:23 +0200
Subject: [PATCH] In main program unit `test_successive_overlap`, do not print
eddies for which `delta_out` == 1 and eddies for which `delta_in` == 1. This
is redundant with information in file `edgelist.csv`. I have checked in test
`Successive_overlap_global` that eddies for which `delta_out` == 1 correspond
to column i1 (sorted, unique) and eddies for which `delta_in` == 1 correspond
to column i2 (sorted, unique).
---
Tests/test_successive_overlap.f90 | 17 +----------------
candidate_overlap.f90 | 3 ++-
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/Tests/test_successive_overlap.f90 b/Tests/test_successive_overlap.f90
index a50f0af2..68aeb4f7 100644
--- a/Tests/test_successive_overlap.f90
+++ b/Tests/test_successive_overlap.f90
@@ -104,30 +104,15 @@ program test_successive_overlap
print *, 'Created file "edgelist.csv".'
print *, snapshot_1, ":"
- print *, "Eddies for which delta_out == 1:"
-
- do i = 1, flow(1)%number_vis_extr
- if (flow(1)%list_vis(i)%delta_out /= huge(0)) &
- write(unit = *, fmt = "(i0, 1x)", advance = "no") i
- end do
-
- print *
print *, "Valid isolated eddies:"
do i = 1, flow(1)%number_vis_extr
if (flow(1)%list_vis(i)%valid .and. flow(1)%list_vis(i)%delta_out &
== huge(0)) write(unit = *, fmt = "(i0, 1x)", advance = "no") i
end do
-
print *
- print *, Snapshot_2, ":"
- print *, "Eddies for which delta_in == 1:"
-
- do i = 1, flow(2)%number_vis_extr
- if (flow(2)%list_vis(i)%delta_in /= huge(0)) &
- write(unit = *, fmt = "(i0, 1x)", advance = "no") i
- end do
print *
+ print *, Snapshot_2, ":"
print *, "Valid isolated eddies:"
do i = 1, flow(2)%number_vis_extr
diff --git a/candidate_overlap.f90 b/candidate_overlap.f90
index ec33a985..950601a2 100644
--- a/candidate_overlap.f90
+++ b/candidate_overlap.f90
@@ -18,7 +18,8 @@ contains
! extremum. 0 at other points.
type(eddy), intent(in):: list_vis(:)
- ! Visible eddies at a given date. We need components ? to be defined.
+ ! Visible eddies at a given date. We need components valid and
+ ! cyclone to be defined.
logical, intent(in):: cyclone ! cyclonicity of the target extremum
--
GitLab