From 3999afdb5a71d69f98563fbebf67d94625c07f93 Mon Sep 17 00:00:00 2001
From: Fabian Neumann <fabian.neumann@outlook.de>
Date: Wed, 28 Dec 2022 12:19:20 +0100
Subject: [PATCH] fixes to methanol implementation

---
 config.default.yaml               |  2 +-
 scripts/prepare_sector_network.py | 52 +++++++++++++++----------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/config.default.yaml b/config.default.yaml
index ce078fb5..58be20ff 100644
--- a/config.default.yaml
+++ b/config.default.yaml
@@ -198,7 +198,7 @@ sector:
   MWh_MeOH_per_MWh_e: 3.6907 # in LHV, source: DECHEMA (2017): Low carbon energy and feedstock for the European chemical industry , pg. 64.
   shipping_hydrogen_liquefaction: false # whether to consider liquefaction costs for shipping H2 demands
   shipping_hydrogen_share: 0
-  shippint_methanol_share: 1
+  shipping_methanol_share: 1
   shipping_oil_share: 0
   shipping_methanol_efficiency: 0.46 # 10-15% higher https://www.iea-amf.org/app/webroot/files/file/Annex%20Reports/AMF_Annex_56.pdf, https://users.ugent.be/~lsileghe/documents/extended_abstract.pdf
   shipping_oil_efficiency: 0.40 #For conversion of fuel oil to propulsion in 2011
diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index 40578a1b..f16c26db 100644
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -2202,7 +2202,7 @@ def add_industry(n, costs):
             unit="MWh_LHV"
         )
 
-        n.madd(
+        n.madd("Link",
             spatial.h2.locations + "methanolisation",
             bus0=spatial.h2.nodes,
             bus1=spatial.methanol.nodes,
@@ -2231,7 +2231,7 @@ def add_industry(n, costs):
         # CO2 intensity methanol based on stoichiometric calculation with 22.7 GJ/t methanol (32 g/mol), CO2 (44 g/mol), 277.78 MWh/TJ = 0.218 t/MWh
         co2 = p_set_methanol / options["MWh_MeOH_per_tCO2"]
 
-        n.add("Load"
+        n.add("Load",
             "shipping methanol emissions",
             bus="co2 atmosphere",
             carrier="shipping methanol emissions",
@@ -2259,34 +2259,34 @@ def add_industry(n, costs):
             p_set=-co2
         )
 
-        if "oil" not in n.buses.carrier.unique():
-            n.madd("Bus",
-                spatial.oil.nodes,
-                location=spatial.oil.locations,
-                carrier="oil",
-                unit="MWh_LHV"
-            )
+    if "oil" not in n.buses.carrier.unique():
+        n.madd("Bus",
+            spatial.oil.nodes,
+            location=spatial.oil.locations,
+            carrier="oil",
+            unit="MWh_LHV"
+        )
 
-        if "oil" not in n.stores.carrier.unique():
+    if "oil" not in n.stores.carrier.unique():
 
-            #could correct to e.g. 0.001 EUR/kWh * annuity and O&M
-            n.madd("Store",
-                [oil_bus + " Store" for oil_bus in spatial.oil.nodes],
-                bus=spatial.oil.nodes,
-                e_nom_extendable=True,
-                e_cyclic=True,
-                carrier="oil",
-            )
+        #could correct to e.g. 0.001 EUR/kWh * annuity and O&M
+        n.madd("Store",
+            [oil_bus + " Store" for oil_bus in spatial.oil.nodes],
+            bus=spatial.oil.nodes,
+            e_nom_extendable=True,
+            e_cyclic=True,
+            carrier="oil",
+        )
 
-        if "oil" not in n.generators.carrier.unique():
+    if "oil" not in n.generators.carrier.unique():
 
-            n.madd("Generator",
-                spatial.oil.nodes,
-                bus=spatial.oil.nodes,
-                p_nom_extendable=True,
-                carrier="oil",
-                marginal_cost=costs.at["oil", 'fuel']
-            )
+        n.madd("Generator",
+            spatial.oil.nodes,
+            bus=spatial.oil.nodes,
+            p_nom_extendable=True,
+            carrier="oil",
+            marginal_cost=costs.at["oil", 'fuel']
+        )
 
     if options["oil_boilers"]: