From ae1ea81520b6d71803b732360ab3fc5fa837d668 Mon Sep 17 00:00:00 2001
From: Tom Brown <tom@nworbmot.org>
Date: Sun, 21 Jul 2019 12:09:18 +0200
Subject: [PATCH] Copper plate biogas and solid biomass

Because there was insufficient solid biomass in 3-4 countries to
supply industry for it locally, and we need to account for transport
of solid biomass.

Should be replaced by transport cost links between countries.
---
 scripts/prepare_sector_network.py | 35 ++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index e60f7fe4..130622f3 100644
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -1094,34 +1094,32 @@ def add_biomass(network):
     network.add("Carrier","solid biomass")
 
     network.madd("Bus",
-                 cts + " biogas",
+                 ["EU biogas"],
                  carrier="biogas")
 
     network.madd("Bus",
-                 cts + " solid biomass",
+                 ["EU solid biomass"],
                  carrier="solid biomass")
 
     network.madd("Store",
-                 cts,
-                 suffix=" biogas",
-                 bus=cts + " biogas",
+                 ["EU biogas"],
+                 bus="EU biogas",
                  carrier="biogas",
-                 e_nom=biomass_potentials.loc[cts,"biogas"],
+                 e_nom=biomass_potentials.loc[cts,"biogas"].sum(),
                  marginal_cost=costs.at['biogas','fuel'],
-                 e_initial=biomass_potentials.loc[cts,"biogas"])
+                 e_initial=biomass_potentials.loc[cts,"biogas"].sum())
 
     network.madd("Store",
-                 cts,
-                 suffix=" solid biomass",
-                 bus=cts + " solid biomass",
+                 ["EU solid biomass"],
+                 bus="EU solid biomass",
                  carrier="solid biomass",
-                 e_nom=biomass_potentials.loc[cts,"solid biomass"],
+                 e_nom=biomass_potentials.loc[cts,"solid biomass"].sum(),
                  marginal_cost=costs.at['solid biomass','fuel'],
-                 e_initial=biomass_potentials.loc[cts,"solid biomass"])
+                 e_initial=biomass_potentials.loc[cts,"solid biomass"].sum())
 
     network.madd("Link",
-                 cts + " biogas to gas",
-                 bus0=cts + " biogas",
+                 ["biogas to gas"],
+                 bus0="EU biogas",
                  bus1="EU gas",
                  bus2="co2 atmosphere",
                  carrier="biogas to gas",
@@ -1137,7 +1135,7 @@ def add_biomass(network):
         #with BECCS
         network.madd("Link",
                      urban_central + " solid biomass to urban central CHP",
-                     bus0=urban_central.str[:2] + " solid biomass",
+                     bus0="EU solid biomass",
                      bus1=urban_central + " urban central CHP",
                      bus2="co2 atmosphere",
                      bus3="co2 stored",
@@ -1161,11 +1159,10 @@ def add_industry(network):
     countries = solid_biomass_by_country.index
 
     network.madd("Load",
-                 countries,
-                 suffix=" solid biomass for industry",
-                 bus=countries+ " solid biomass",
+                 ["solid biomass for industry"],
+                 bus="EU solid biomass",
                  carrier="solid biomass for industry",
-                 p_set=solid_biomass_by_country/8760.)
+                 p_set=solid_biomass_by_country.sum()/8760.)
 
     #Net transfer of CO2 from atmosphere to stored
     network.madd("Load",