From 90d401ec563477ef72655c0cb3afe5e8d78153db Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 1 Jul 2024 17:32:54 +0100 Subject: [PATCH] Enable consumption data with no timeslice info --- src/muse/sectors/preset_sector.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py index 2bdbbdec8..c800b96d1 100644 --- a/src/muse/sectors/preset_sector.py +++ b/src/muse/sectors/preset_sector.py @@ -116,13 +116,13 @@ def factory(cls, name: str, settings: Any) -> PresetSector: others = components.intersection(presets.data_vars).difference({component}) if component not in presets and len(others) > 0: presets[component] = zeros_like(presets[others.pop()]).drop_vars( - ["timeslice", "month", "day", "hour"] + ["timeslice", "month", "day", "hour"], errors="ignore" ) # add timeslice, if missing for component in {"supply", "consumption"}: if "timeslice" not in presets[component].dims: presets[component] = convert_timeslice( - presets[component], presets.timeslice, QuantityType.EXTENSIVE + presets[component], timeslice, QuantityType.EXTENSIVE ) comm_usage = (presets.costs > 0).any(set(presets.costs.dims) - {"commodity"}) @@ -168,7 +168,7 @@ def next(self, mca_market: Dataset) -> Dataset: ) result["costs"] = convert_timeslice( costs, mca_market.timeslice, QuantityType.INTENSIVE - ).drop_vars(["timeslice", "month", "day", "hour"]) + ).drop_vars(["timeslice", "month", "day", "hour"], errors="ignore") assert isinstance(result, Dataset) return result