Skip to content

Commit f9d8f52

Browse files
committed
treat water pits like water tanks
1 parent f00ecaa commit f9d8f52

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

scripts/pypsa-de/export_ariadne_variables.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -945,13 +945,13 @@ def _get_capacities(n, region, cap_func, cap_string="Capacity|"):
945945
like="oil boiler"
946946
).sum()
947947

948-
var[cap_string + "Heat|Storage Converter"] = capacities_central_heat.filter(
949-
like="water tanks discharger"
950-
).sum()
948+
var[cap_string + "Heat|Storage Converter"] = capacities_central_heat[
949+
capacities_central_heat.index.str.contains("water (?:tanks|pits) discharger")
950+
].sum()
951951

952-
var[cap_string + "Heat|Storage Reservoir"] = storage_capacities.filter(
953-
like="water tanks"
954-
).sum()
952+
var[cap_string + "Heat|Storage Reservoir"] = storage_capacities[
953+
storage_capacities.index.str.contains("water (?:tanks|pits)")
954+
].sum()
955955

956956
var[cap_string + "Heat"] = (
957957
var[cap_string + "Heat|Solar thermal"]
@@ -2177,7 +2177,9 @@ def get_final_energy(
21772177
.drop(
21782178
[ # chargers affect all sectors equally
21792179
"urban decentral water tanks charger",
2180+
"urban decentral water pits charger",
21802181
"rural water tanks charger",
2182+
"rural water pits charger",
21812183
],
21822184
errors="ignore",
21832185
)

0 commit comments

Comments
 (0)