From 82e9a48b74a181aaf0659e0d363f5bd17367e171 Mon Sep 17 00:00:00 2001
From: martavp <martavictoriaperez@gmail.com>
Date: Mon, 5 Jul 2021 11:29:02 +0200
Subject: [PATCH] Add oil consumed in shipping as a load to EU oil bus

---
 config.default.yaml               | 1 +
 scripts/prepare_sector_network.py | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/config.default.yaml b/config.default.yaml
index 15b727aa..3026a2f7 100644
--- a/config.default.yaml
+++ b/config.default.yaml
@@ -500,6 +500,7 @@ plotting:
     solid biomass: '#DAA520'
     today: '#D2691E'
     shipping: '#6495ED'
+    shipping oil: "#6495ED"
     shipping oil emissions: "#6495ED"
     electricity distribution grid: '#333333'
     H2 for industry: "#222222"
diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index a9482d6b..17a2262f 100644
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -1730,6 +1730,15 @@ def add_industry(n, costs):
     if shipping_hydrogen_share < 1:
 
         shipping_oil_share = 1 - shipping_hydrogen_share
+        
+        n.madd("Load",
+               nodes,
+               suffix=" shipping oil",
+               bus="EU oil",
+               carrier="shipping oil",
+               p_set=shipping_oil_share*nodal_energy_totals.loc[nodes,["total international navigation","total domestic navigation"]].sum(axis=1)*1e6/8760.
+               )
+        
         co2 = shipping_oil_share * nodal_energy_totals.loc[nodes, all_navigation].sum().sum() * 1e6 / 8760 * costs.at["oil", "CO2 intensity"]
 
         n.add("Load",