From 3f8d31f87326b78fd7b4385bef10efb992a08902 Mon Sep 17 00:00:00 2001
From: David Hendriks <davidhendriks93@gmail.com>
Date: Thu, 12 Aug 2021 18:10:16 +0100
Subject: [PATCH] Fixed ensemble version output to include filters
---
binarycpython/utils/functions.py | 10 +++++++++-
binarycpython/utils/grid.py | 1 +
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/binarycpython/utils/functions.py b/binarycpython/utils/functions.py
index d428ddd70..c1c2379be 100644
--- a/binarycpython/utils/functions.py
+++ b/binarycpython/utils/functions.py
@@ -646,11 +646,19 @@ def parse_binary_c_version_info(version_info_string: str) -> dict:
cleaned = cleaned - ensembles
ensemble_dict = {}
+ ensemble_filter_dict = {}
for el in ensembles:
split_info = el.split("Ensemble ")[-1].split(" is ")
+
if len(split_info) > 1:
- ensemble_dict[int(split_info[0])] = split_info[-1]
+ if not split_info[0].startswith('filter'):
+ ensemble_dict[int(split_info[0])] = split_info[-1]
+ else:
+ filter_no = int(split_info[0].replace('filter ', ''))
+ ensemble_filter_dict[filter_no] = split_info[-1]
+
version_info_dict["ensembles"] = ensemble_dict if ensemble_dict else None
+ version_info_dict["ensemble_filters"] = ensemble_filter_dict if ensemble_filter_dict else None
##########################
# macros:
diff --git a/binarycpython/utils/grid.py b/binarycpython/utils/grid.py
index a77abd8c3..5a5d8ec68 100644
--- a/binarycpython/utils/grid.py
+++ b/binarycpython/utils/grid.py
@@ -1118,6 +1118,7 @@ class Population:
# print("thread {}: persistent_data_memaddr: ".format(self.process_ID), persistent_data_memaddr)
# Get results binary_c
+ # print("running: {}".format(binary_cmdline_string))
out = _binary_c_bindings.run_system(
argstring=binary_cmdline_string,
custom_logging_func_memaddr=self.grid_options[
--
GitLab