From 8b2302859214ed67f110ed8c66e8af1692adeaa9 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Fri, 15 Oct 2021 13:09:16 +0100
Subject: [PATCH] add modulo cost in tpr calculation: if modulo is 10, we
underestimate the cost by ~ a factor 10, so we should multiply by the modulo
---
binarycpython/utils/grid.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/binarycpython/utils/grid.py b/binarycpython/utils/grid.py
index 246a9853c..fda9f533b 100644
--- a/binarycpython/utils/grid.py
+++ b/binarycpython/utils/grid.py
@@ -4774,7 +4774,9 @@ eccentricity3=0
eta, units, tpr, eta_secs = trem(
dt, system_number, dn, self.grid_options["_total_starcount"]
)
- tpr *= self.grid_options['num_cores']
+
+ # compensate for multithreading and modulo
+ tpr *= self.grid_options['num_cores'] * self.grid_options['modulo']
if eta_secs < secs_per_day:
fintime = time.localtime(now + eta_secs)
--
GitLab