From 407037a799817d8a99f47fc70a61a1deecdcb6bb Mon Sep 17 00:00:00 2001 From: "daniel.rdt" Date: Fri, 28 Jul 2023 15:09:13 +0200 Subject: [PATCH 1/3] fix in add_heating_capacities_installed_before_baseyear to account for case when there is no rural heating demand for some nodes in network --- scripts/add_existing_baseyear.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 52cb585e..009712d8 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -439,6 +439,11 @@ def add_heating_capacities_installed_before_baseyear( + n.loads_t.p_set.sum()[f"{node} services rural heat"] ) ) + # if rural heating demand for one of the nodes doesn't exist, + # then columns were dropped before and heating demand share should be 0.0 + if (f"{node} residential rural heat" in n.loads_t.p_set.sum().index) + & (f"{node} services rural heat" in n.loads_t.p_set.sum().index) + else 0.0 for node in nodal_df.index ], index=nodal_df.index, From 7c00f9d4517e2bf0179c4ab49e7582a1e17f6c17 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 28 Jul 2023 13:14:40 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- scripts/add_existing_baseyear.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 009712d8..279b6644 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -442,7 +442,7 @@ def add_heating_capacities_installed_before_baseyear( # if rural heating demand for one of the nodes doesn't exist, # then columns were dropped before and heating demand share should be 0.0 if (f"{node} residential rural heat" in n.loads_t.p_set.sum().index) - & (f"{node} services rural heat" in n.loads_t.p_set.sum().index) + & (f"{node} services rural heat" in n.loads_t.p_set.sum().index) else 0.0 for node in nodal_df.index ], From e12cad27892d10fe8bd556d3dcf9cfb2dd305efb Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Tue, 22 Aug 2023 14:42:21 +0200 Subject: [PATCH 3/3] simplify if-else expression --- scripts/add_existing_baseyear.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 9c85a215..269705a7 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -435,20 +435,20 @@ def add_heating_capacities_installed_before_baseyear( # split existing capacities between residential and services # proportional to energy demand + p_set_sum = n.loads_t.p_set.sum() ratio_residential = pd.Series( [ ( - n.loads_t.p_set.sum()[f"{node} residential rural heat"] + p_set_sum[f"{node} residential rural heat"] / ( - n.loads_t.p_set.sum()[f"{node} residential rural heat"] - + n.loads_t.p_set.sum()[f"{node} services rural heat"] + p_set_sum[f"{node} residential rural heat"] + + p_set_sum[f"{node} services rural heat"] ) ) # if rural heating demand for one of the nodes doesn't exist, # then columns were dropped before and heating demand share should be 0.0 - if (f"{node} residential rural heat" in n.loads_t.p_set.sum().index) - & (f"{node} services rural heat" in n.loads_t.p_set.sum().index) - else 0.0 + if all(f"{node} {service} rural heat" in p_set_sum.index for service in ["residential", "services"]) + else 0. for node in nodal_df.index ], index=nodal_df.index,