From 29925d76b5f89079fd40c6fba19e58506840f0bf Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 13 May 2025 08:37:41 +0100 Subject: [PATCH 1/2] Fix bug in aggregate_enduses --- src/muse/sectors/subsector.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py index 7852d689..265394c8 100644 --- a/src/muse/sectors/subsector.py +++ b/src/muse/sectors/subsector.py @@ -230,4 +230,9 @@ def aggregate_enduses(technologies: xr.Dataset) -> list[str]: """ from muse.commodities import is_enduse - return technologies.commodity.values[is_enduse(technologies.comm_usage)].tolist() + # We select enduse commodities with positive fixed outputs + enduse_output = technologies.fixed_outputs.any( + [u for u in technologies.dims if u != "commodity"] + ) * is_enduse(technologies.comm_usage) + + return technologies.commodity.values[enduse_output].tolist() From 96d5c0ef9222c5430a938334f9a6efa217766504 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 13 May 2025 09:07:42 +0100 Subject: [PATCH 2/2] Fix error --- src/muse/sectors/subsector.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py index 265394c8..c8738528 100644 --- a/src/muse/sectors/subsector.py +++ b/src/muse/sectors/subsector.py @@ -231,8 +231,9 @@ def aggregate_enduses(technologies: xr.Dataset) -> list[str]: from muse.commodities import is_enduse # We select enduse commodities with positive fixed outputs - enduse_output = technologies.fixed_outputs.any( - [u for u in technologies.dims if u != "commodity"] + outputs = technologies.fixed_outputs + enduse_output = outputs.any( + [u for u in outputs.dims if u != "commodity"] ) * is_enduse(technologies.comm_usage) return technologies.commodity.values[enduse_output].tolist()