bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cherry-pick

Browse Source
This commit is contained in:
Fabian Neumann 2023-09-12 17:28:42 +02:00
parent 118cabe8a6
commit 592bc4eee7
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/prepare_sector_network.py
View File

@ -3285,11 +3285,10 @@ def lossy_bidirectional_links(n, carrier, efficiencies={}):
carrier_i = n.links.query("carrier == @carrier").index carrier_i = n.links.query("carrier == @carrier").index
<<<<<<< HEAD if (
if not any(v != 1. for v in efficiencies.values()) or carrier_i.empty: not any((v != 1.0) or (v >= 0) for v in efficiencies.values())
======= or carrier_i.empty
if not any((v != 1.0) or (v >= 0) for v in efficiencies.values()) or carrier_i.empty: ):
>>>>>>> 5822adb0 (add option to consider compression losses in pipelines as electricity demand)
return return
efficiency_static = efficiencies.get("efficiency_static", 1) efficiency_static = efficiencies.get("efficiency_static", 1)
@ -3303,8 +3302,10 @@ def lossy_bidirectional_links(n, carrier, efficiencies={}):
) )
n.links.loc[carrier_i, "p_min_pu"] = 0 n.links.loc[carrier_i, "p_min_pu"] = 0
n.links.loc[carrier_i, "efficiency"] = ( n.links.loc[
efficiency_static * efficiency_per_1000km ** (n.links.loc[carrier_i, "length"] / 1e3) carrier_i, "efficiency"
] = efficiency_static * efficiency_per_1000km ** (
n.links.loc[carrier_i, "length"] / 1e3
) )
rev_links = ( rev_links = (
n.links.loc[carrier_i].copy().rename({"bus0": "bus1", "bus1": "bus0"}, axis=1) n.links.loc[carrier_i].copy().rename({"bus0": "bus1", "bus1": "bus0"}, axis=1)
@ -3319,8 +3320,13 @@ def lossy_bidirectional_links(n, carrier, efficiencies={}):
# do compression losses after concatenation to take electricity consumption at bus0 in either direction # do compression losses after concatenation to take electricity consumption at bus0 in either direction
carrier_i = n.links.query("carrier == @carrier").index carrier_i = n.links.query("carrier == @carrier").index
if compression_per_1000km > 0: if compression_per_1000km > 0:
n.links.loc[carrier_i, "bus2"] = n.links.loc[carrier_i, "bus0"].map(n.buses.location) # electricity n.links.loc[carrier_i, "bus2"] = n.links.loc[carrier_i, "bus0"].map(
n.links.loc[carrier_i, "efficiency2"] = - compression_per_1000km * n.links.loc[carrier_i, "length"] / 1e3 n.buses.location
) # electricity
n.links.loc[carrier_i, "efficiency2"] = (
-compression_per_1000km * n.links.loc[carrier_i, "length"] / 1e3
)
if __name__ == "__main__": if __name__ == "__main__":
if "snakemake" not in globals(): if "snakemake" not in globals():