From 8781e690661b064432689511f215eaa48affa7bf Mon Sep 17 00:00:00 2001
From: Tom Brown <tom@nworbmot.org>
Date: Fri, 9 Feb 2024 18:36:16 +0100
Subject: [PATCH] bugfix: coal emissions for industry weren't tracked

Also allow industrial coal demand to be regional (so we can include
them in regional CO2 constraints).
---
 config/config.default.yaml        |  1 +
 scripts/prepare_sector_network.py | 39 +++++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/config/config.default.yaml b/config/config.default.yaml
index 1033d49d..44b54148 100644
--- a/config/config.default.yaml
+++ b/config/config.default.yaml
@@ -501,6 +501,7 @@ sector:
   SMR_cc: true
   regional_methanol_demand: false
   regional_oil_demand: false
+  regional_coal_demand: false
   regional_co2_sequestration_potential:
     enable: false
     attribute: 'conservative estimate Mt'
diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index be8aea53..18d1feb0 100755
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -172,6 +172,13 @@ def define_spatial(nodes, options):
     spatial.coal.nodes = ["EU coal"]
     spatial.coal.locations = ["EU"]
 
+    if options["regional_coal_demand"]:
+        spatial.coal.demand_locations = nodes
+        spatial.coal.industry = nodes + " coal for industry"
+    else:
+        spatial.coal.demand_locations = ["EU"]
+        spatial.coal.industry = ["EU coal for industry"]
+
     # lignite
     spatial.lignite = SimpleNamespace()
     spatial.lignite.nodes = ["EU lignite"]
@@ -3048,19 +3055,41 @@ def add_industry(n, costs):
 
         mwh_coal_per_mwh_coke = 1.366  # from eurostat energy balance
         p_set = (
-            industrial_demand["coal"].sum()
-            + mwh_coal_per_mwh_coke * industrial_demand["coke"].sum()
+            industrial_demand["coal"]
+            + mwh_coal_per_mwh_coke * industrial_demand["coke"]
         ) / nhours
 
+        if not options["regional_coal_demand"]:
+            p_set = p_set.sum()
+
+        n.madd(
+            "Bus",
+            spatial.coal.industry,
+            location=spatial.coal.demand_locations,
+            carrier="coal for industry",
+            unit="MWh_LHV",
+        )
+
         n.madd(
             "Load",
-            spatial.coal.nodes,
-            suffix=" for industry",
-            bus=spatial.coal.nodes,
+            spatial.coal.industry,
+            bus=spatial.coal.industry,
             carrier="coal for industry",
             p_set=p_set,
         )
 
+        n.madd(
+            "Link",
+            spatial.coal.industry,
+            bus0=spatial.coal.nodes,
+            bus1=spatial.coal.industry,
+            bus2="co2 atmosphere",
+            carrier="coal for industry",
+            p_nom_extendable=True,
+            efficiency2=costs.at["coal", "CO2 intensity"],
+        )
+
+
 
 def add_waste_heat(n):
     # TODO options?