From 46310f0a30b887b74e0649f861d52f31107f67de Mon Sep 17 00:00:00 2001 From: millingermarkus Date: Mon, 1 Aug 2022 15:00:27 +0200 Subject: [PATCH] Minor correction to prepare_sector_network --- scripts/prepare_sector_network.py | 38 ++++++++++++++++--------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 8eea6a19..15e30a65 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1861,9 +1861,10 @@ def add_biomass(n, costs): ) #Solid biomass to liquid fuel - if options["biomass_to_liquid"] + if options["biomass_to_liquid"]: n.madd("Link", - spatial.biomass.nodes + " biomass to liquid", + spatial.biomass.nodes, + suffix=" biomass to liquid", bus0=spatial.biomass.nodes, bus1=spatial.oil.nodes, bus3="co2 atmosphere", @@ -1874,25 +1875,26 @@ def add_biomass(n, costs): p_nom_extendable=True, capital_cost=costs.at['BtL', 'fixed'], marginal_cost=costs.at['BtL', 'efficiency']*costs.loc["BtL", "VOM"] - ) + ) #TODO: Update with energy penalty n.madd("Link", - spatial.biomass.nodes + " biomass to liquid CC", - bus0=spatial.biomass.nodes, - bus1=spatial.oil.nodes, - bus2=spatial.co2.nodes, - bus3="co2 atmosphere", - carrier="biomass to liquid", - lifetime=costs.at['BtL', 'lifetime'], - efficiency=costs.at['BtL', 'efficiency'], - efficiency2=costs.at['BtL', 'CO2 stored'] * costs.at['BtL', 'capture rate'], - efficiency3=-costs.at['solid biomass', 'CO2 intensity'] + costs.at['BtL', 'CO2 stored'] * (1 - costs.at['BtL', 'capture rate']), - p_nom_extendable=True, - capital_cost=costs.at['BtL', 'fixed'] + costs.at['biomass CHP capture', 'fixed'] * costs.at[ - "BtL", "CO2 stored"], - marginal_cost=costs.at['BtL', 'efficiency'] * costs.loc["BtL", "VOM"] - ) + spatial.biomass.nodes, + suffix=" biomass to liquid CC", + bus0=spatial.biomass.nodes, + bus1=spatial.oil.nodes, + bus2=spatial.co2.nodes, + bus3="co2 atmosphere", + carrier="biomass to liquid", + lifetime=costs.at['BtL', 'lifetime'], + efficiency=costs.at['BtL', 'efficiency'], + efficiency2=costs.at['BtL', 'CO2 stored'] * costs.at['BtL', 'capture rate'], + efficiency3=-costs.at['solid biomass', 'CO2 intensity'] + costs.at['BtL', 'CO2 stored'] * (1 - costs.at['BtL', 'capture rate']), + p_nom_extendable=True, + capital_cost=costs.at['BtL', 'fixed'] + costs.at['biomass CHP capture', 'fixed'] * costs.at[ + "BtL", "CO2 stored"], + marginal_cost=costs.at['BtL', 'efficiency'] * costs.loc["BtL", "VOM"] + ) def add_industry(n, costs):