Merge branch 'feature/myopic_existing_baseyear_fix' of github.com:daniel-rdt/pypsa-eur into daniel-rdt-feature/myopic_existing_baseyear_fix

This commit is contained in:
Fabian Neumann 2023-08-22 14:39:50 +02:00
commit 33305f9761

View File

@ -444,6 +444,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,