Skip to content
Snippets Groups Projects
Commit 4fad2d2e authored by Lionel GUEZ's avatar Lionel GUEZ
Browse files

Count valid instead of invalid Rossby values

Simpler, no subtraction.
parent c4db31d9
No related branches found
No related tags found
No related merge requests found
...@@ -38,7 +38,7 @@ def calculate_radii_rossby(list_eddies, e_overestim, handlers, array_d_init): ...@@ -38,7 +38,7 @@ def calculate_radii_rossby(list_eddies, e_overestim, handlers, array_d_init):
radii = 0 # in m radii = 0 # in m
rossby = 0 rossby = 0
days_modifier = 0 n_valid_Rossby = 0
Omega = 2 * math.pi / 86164. Omega = 2 * math.pi / 86164.
n_eddies = len(list_eddies) n_eddies = len(list_eddies)
...@@ -61,17 +61,15 @@ def calculate_radii_rossby(list_eddies, e_overestim, handlers, array_d_init): ...@@ -61,17 +61,15 @@ def calculate_radii_rossby(list_eddies, e_overestim, handlers, array_d_init):
.record(location)['r_eq_area'] * 1000 # in m .record(location)['r_eq_area'] * 1000 # in m
if (V_max < 100): if (V_max < 100):
# calculate Ro and Delta_Ro
rossby += V_max / (f * R_Vmax) rossby += V_max / (f * R_Vmax)
else: n_valid_Rossby += 1
days_modifier += 1
radii += R_Vmax # in m radii += R_Vmax # in m
radii /= n_eddies radii /= n_eddies
if n_eddies > days_modifier: if n_valid_Rossby != 0:
rossby /= n_eddies - days_modifier rossby /= n_valid_Rossby
else: else:
rossby = None rossby = None
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment