From 6aea45fbebe06cb66734487f1d2deb450d80af06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Eide?= Date: Wed, 30 Aug 2023 11:49:49 +0200 Subject: [PATCH] Review comments --- src/ert/config/ensemble_config.py | 4 ++-- src/ert/config/summary_config.py | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/ert/config/ensemble_config.py b/src/ert/config/ensemble_config.py index 990cb75b1b0..ce3d2af2e56 100644 --- a/src/ert/config/ensemble_config.py +++ b/src/ert/config/ensemble_config.py @@ -154,10 +154,10 @@ def make_field(field_list: List[str]) -> Field: time_map = [] if refcase_file_path is not None: refcase = cls._load_refcase(refcase_file_path) - time_map = [ + time_map = set( datetime(date.year, date.month, date.day) for date in refcase.report_dates - ] + ) optional_keys = [] summary_keys = [item for sublist in summary_list for item in sublist] for key in summary_keys: diff --git a/src/ert/config/summary_config.py b/src/ert/config/summary_config.py index 690da9722cb..92be7b82fad 100644 --- a/src/ert/config/summary_config.py +++ b/src/ert/config/summary_config.py @@ -5,7 +5,7 @@ from dataclasses import dataclass from datetime import datetime from fnmatch import fnmatch -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Set import numpy as np import xarray as xr @@ -24,7 +24,7 @@ class SummaryConfig(ResponseConfig): input_file: str keys: List[str] - refcase: Optional[List[datetime]] = None + refcase: Optional[Set[datetime]] = None def read_from_file(self, run_path: str, iens: int) -> xr.Dataset: filename = self.input_file.replace("", str(iens)) @@ -45,16 +45,14 @@ def read_from_file(self, run_path: str, iens: int) -> xr.Dataset: c_time = summary.alloc_time_vector(True) time_map = [t.datetime() for t in c_time] if self.refcase: - missing = [] - for reference_time in self.refcase: - if reference_time not in time_map: - missing.append(reference_time) + missing = self.refcase.difference(time_map) if missing: + first, last = min(missing), max(missing) logger.warning( f"Realization: {iens}, load warning: {len(missing)} " f"inconsistencies in time map, first: Time mismatch for response " - f"time: {missing[0]}, last: Time mismatch for response time: " - f"{missing[-1]} from: {run_path}/{filename}.UNSMRY" + f"time: {first}, last: Time mismatch for response time: " + f"{last} from: {run_path}/{filename}.UNSMRY" ) user_summary_keys = set(self.keys)