diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 15e30a65..19637b5f 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1859,7 +1859,7 @@ def add_biomass(n, costs): efficiency4=costs.at['solid biomass', 'CO2 intensity'] * costs.at['biomass CHP capture', 'capture_rate'], lifetime=costs.at[key, 'lifetime'] ) - + #Solid biomass to liquid fuel if options["biomass_to_liquid"]: n.madd("Link", @@ -1867,11 +1867,11 @@ def add_biomass(n, costs): suffix=" biomass to liquid", bus0=spatial.biomass.nodes, bus1=spatial.oil.nodes, - bus3="co2 atmosphere", + bus2="co2 atmosphere", carrier="biomass to liquid", lifetime=costs.at['BtL', 'lifetime'], efficiency=costs.at['BtL', 'efficiency'], - efficiency3=-costs.at['solid biomass', 'CO2 intensity'] + costs.at['BtL', 'CO2 stored'], + efficiency2=-costs.at['solid biomass', 'CO2 intensity'] + costs.at['BtL', 'CO2 stored'], p_nom_extendable=True, capital_cost=costs.at['BtL', 'fixed'], marginal_cost=costs.at['BtL', 'efficiency']*costs.loc["BtL", "VOM"] @@ -1883,13 +1883,13 @@ def add_biomass(n, costs): suffix=" biomass to liquid CC", bus0=spatial.biomass.nodes, bus1=spatial.oil.nodes, - bus2=spatial.co2.nodes, - bus3="co2 atmosphere", + bus2="co2 atmosphere", + bus3=spatial.co2.nodes, 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']), + efficiency2=-costs.at['solid biomass', 'CO2 intensity'] + costs.at['BtL', 'CO2 stored'] * (1 - costs.at['BtL', 'capture rate']), + efficiency3=costs.at['BtL', 'CO2 stored'] * 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"],