From 592bc4eee7f57ef93e104f266595cb6d8ded754d Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Tue, 12 Sep 2023 17:28:42 +0200
Subject: [PATCH] cherry-pick

---
 scripts/prepare_sector_network.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index 7b58329c..de02095d 100644
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -3285,11 +3285,10 @@ def lossy_bidirectional_links(n, carrier, efficiencies={}):
 
     carrier_i = n.links.query("carrier == @carrier").index
 
-<<<<<<< HEAD
-    if not any(v != 1. 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)
+    if (
+        not any((v != 1.0) or (v >= 0) for v in efficiencies.values())
+        or carrier_i.empty
+    ):
         return
 
     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, "efficiency"] = (
-        efficiency_static * efficiency_per_1000km ** (n.links.loc[carrier_i, "length"] / 1e3)
+    n.links.loc[
+        carrier_i, "efficiency"
+    ] = efficiency_static * efficiency_per_1000km ** (
+        n.links.loc[carrier_i, "length"] / 1e3
     )
     rev_links = (
         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
     carrier_i = n.links.query("carrier == @carrier").index
     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, "efficiency2"] = - compression_per_1000km * n.links.loc[carrier_i, "length"] / 1e3
+        n.links.loc[carrier_i, "bus2"] = n.links.loc[carrier_i, "bus0"].map(
+            n.buses.location
+        )  # electricity
+        n.links.loc[carrier_i, "efficiency2"] = (
+            -compression_per_1000km * n.links.loc[carrier_i, "length"] / 1e3
+        )
+
 
 if __name__ == "__main__":
     if "snakemake" not in globals():