From 4fad2d2e4c0a400e7fdb06a2f9f2c9dd7a54c289 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Mon, 25 Apr 2022 19:22:05 +0200
Subject: [PATCH] Count valid instead of invalid Rossby values
Simpler, no subtraction.
---
cost_function.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/cost_function.py b/cost_function.py
index 044a5951..d2b15bc4 100755
--- a/cost_function.py
+++ b/cost_function.py
@@ -38,7 +38,7 @@ def calculate_radii_rossby(list_eddies, e_overestim, handlers, array_d_init):
radii = 0 # in m
rossby = 0
- days_modifier = 0
+ n_valid_Rossby = 0
Omega = 2 * math.pi / 86164.
n_eddies = len(list_eddies)
@@ -61,17 +61,15 @@ def calculate_radii_rossby(list_eddies, e_overestim, handlers, array_d_init):
.record(location)['r_eq_area'] * 1000 # in m
if (V_max < 100):
- # calculate Ro and Delta_Ro
rossby += V_max / (f * R_Vmax)
- else:
- days_modifier += 1
+ n_valid_Rossby += 1
radii += R_Vmax # in m
radii /= n_eddies
-
- if n_eddies > days_modifier:
- rossby /= n_eddies - days_modifier
+
+ if n_valid_Rossby != 0:
+ rossby /= n_valid_Rossby
else:
rossby = None
--
GitLab