From 670023563cf08e80a224c8781bd9b3e4ded1fee1 Mon Sep 17 00:00:00 2001 From: Lionel GUEZ <guez@lmd.ens.fr> Date: Mon, 26 Feb 2024 15:58:01 +0100 Subject: [PATCH] Rename variable `min_inters` to `min_inters_speed` Because we are going to introduce another variable for the intersection of outermost contours. --- Overlap/config_graph.F90 | 6 +++--- Overlap/overlap.f90 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Overlap/config_graph.F90 b/Overlap/config_graph.F90 index c05c68ec..158f6fcd 100644 --- a/Overlap/config_graph.F90 +++ b/Overlap/config_graph.F90 @@ -13,7 +13,7 @@ module config_graph_m ! the extremum of a given eddy. logical, protected:: cyclone = .true. - real, protected:: min_inters = 0.5 ! minimum intersection between contours + real, protected:: min_inters_speed = 0.5 ! minimum intersection between contours contains @@ -30,7 +30,7 @@ contains integer, intent(in):: rank ! Local: - namelist /config_graph_nml/ max_delta, dist_lim, cyclone, min_inters + namelist /config_graph_nml/ max_delta, dist_lim, cyclone, min_inters_speed !----------------------------------------------------------------- @@ -50,7 +50,7 @@ contains call ezmpi_bcast(max_delta, root = 0) call ezmpi_bcast(dist_lim, root = 0) call ezmpi_bcast(cyclone, root = 0) - call ezmpi_bcast(min_inters, root = 0) + call ezmpi_bcast(min_inters_speed, root = 0) call ezmpi_bcast(copy, root = 0) #endif diff --git a/Overlap/overlap.f90 b/Overlap/overlap.f90 index e103d94a..9bf4af49 100644 --- a/Overlap/overlap.f90 +++ b/Overlap/overlap.f90 @@ -17,7 +17,7 @@ contains use jumble, only: twopi use candidate_overlap_m, only: candidate_overlap - use config_graph_m, only: dist_lim, min_inters + use config_graph_m, only: dist_lim, min_inters_speed use derived_types, only: snapshot use read_grid_m, only: nlon, nlat, periodic use spher_polygon_area_m, only: spher_polygon_area @@ -105,7 +105,7 @@ contains if (res_pol%nparts /= 0) then ! polyline_1 and polyline_2 overlap - if (spher_polygon_area(res_pol) >= min_inters & + if (spher_polygon_area(res_pol) >= min_inters_speed & * min(abs(spher_polyline_area(polyline_1)), & abs(spher_polyline_area(polyline_2)))) then write(unit_edge, fmt = *) & -- GitLab