From 3f9ca4f78e5ec9a05cb94d68505ba134d9c180b0 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Mon, 25 Apr 2022 10:55:08 +0200
Subject: [PATCH] Rename `calculate_radii_and_rossby`
Rename function `calculate_radii_and_rossby` to `calculate_radii_rossby`.
---
cost_function.py | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/cost_function.py b/cost_function.py
index 79771be1..db65ef44 100755
--- a/cost_function.py
+++ b/cost_function.py
@@ -30,8 +30,8 @@ import util_eddies
import sys
import bisect
-def calculate_radii_and_rossby(start, end, inc, segment, e_overestim, handlers,
- array_d_init):
+def calculate_radii_rossby(start, end, inc, segment, e_overestim, handlers,
+ array_d_init):
radii = 0 # in m
rossby = 0
days_modifier = 0
@@ -171,9 +171,8 @@ for n in g.vertices():
last_rossby = 0
# First 7 days calculation
- first_res = calculate_radii_and_rossby(0, num_of_days_to_avg,
- 1, segment, e_overestim,
- handlers, array_d_init)
+ first_res = calculate_radii_rossby(0, num_of_days_to_avg, 1, segment,
+ e_overestim, handlers, array_d_init)
# average and assign radii
first_radii = first_res['radii'] / num_of_days_to_avg
@@ -188,10 +187,10 @@ for n in g.vertices():
g.vp.first_av_ros[n] = first_rossby
# Last 7 days calculation
- last_res = calculate_radii_and_rossby(len(segment) - 1, len(segment) -
- (num_of_days_to_avg + 1), -1,
- segment, e_overestim, handlers,
- array_d_init)
+ last_res = calculate_radii_rossby(len(segment) - 1, len(segment) -
+ (num_of_days_to_avg + 1), -1,
+ segment, e_overestim, handlers,
+ array_d_init)
# Average and assign the last radii
last_radii = last_res['radii'] / num_of_days_to_avg
@@ -208,8 +207,8 @@ for n in g.vertices():
# The number of eddies in a segment is lower than the number
# of days over which to average. The values will be the same
# except for the positions.
- res = calculate_radii_and_rossby(0, num_of_days, 1, segment,
- e_overestim, handlers, array_d_init)
+ res = calculate_radii_rossby(0, num_of_days, 1, segment, e_overestim,
+ handlers, array_d_init)
# grab the days modifier
modifier = res['days_modifier']
--
GitLab