Keep radius in km

Avoiding multiplication by 1000 for each instantaneous eddy.

Trajectories/cost_function.py

@@ -28,7 +28,7 @@ import util_eddies
 
 Omega = 2 * math.pi / 86164.0  # in s-1
 r_Earth = 6371  # radius of the Earth, in km
-FACTOR = 2 * Omega
+FACTOR = 2 * Omega * 1000  # 1000 for conversion of km to m
 
 
 def avg_radii_rossby(latitude_list, speed_list, radius_list):
@@ -44,13 +44,13 @@ def avg_radii_rossby(latitude_list, speed_list, radius_list):
     n_valid_Rossby = 0
 
     for latitude, speed, radius in zip(latitude_list, speed_list, radius_list):
-        radius = radius * 1000  # in m
-
         if abs(speed) < 100:
             avg_Rossby += speed / (FACTOR * math.sin(latitude) * radius)
+            # (convert radius to m)
+
             n_valid_Rossby += 1
 
-        avg_rad += radius  # in m
+        avg_rad += radius
 
     avg_rad /= len(radius_list)
 
@@ -211,8 +211,8 @@ delta_cent_mean = 3.8481  # in km
 delta_cent_std = 8.0388  # in km
 delta_ro_mean = -0.0025965
 delta_ro_std = 5.2168
-delta_r_mean = -9.4709  # in m
-delta_r_std = 8.6953e3  # in m
+delta_r_mean = -9.4709e-3  # in km
+delta_r_std = 8.6953  # in km
 
 # Load the graph_tool file: