Rename `calculate_radii_and_rossby`

Rename function `calculate_radii_and_rossby` to `calculate_radii_rossby`.

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']