Minor correction to prepare_sector_network
This commit is contained in:
parent
0019723262
commit
46310f0a30
@ -1861,9 +1861,10 @@ def add_biomass(n, costs):
|
|||||||
)
|
)
|
||||||
|
|
||||||
#Solid biomass to liquid fuel
|
#Solid biomass to liquid fuel
|
||||||
if options["biomass_to_liquid"]
|
if options["biomass_to_liquid"]:
|
||||||
n.madd("Link",
|
n.madd("Link",
|
||||||
spatial.biomass.nodes + " biomass to liquid",
|
spatial.biomass.nodes,
|
||||||
|
suffix=" biomass to liquid",
|
||||||
bus0=spatial.biomass.nodes,
|
bus0=spatial.biomass.nodes,
|
||||||
bus1=spatial.oil.nodes,
|
bus1=spatial.oil.nodes,
|
||||||
bus3="co2 atmosphere",
|
bus3="co2 atmosphere",
|
||||||
@ -1874,25 +1875,26 @@ def add_biomass(n, costs):
|
|||||||
p_nom_extendable=True,
|
p_nom_extendable=True,
|
||||||
capital_cost=costs.at['BtL', 'fixed'],
|
capital_cost=costs.at['BtL', 'fixed'],
|
||||||
marginal_cost=costs.at['BtL', 'efficiency']*costs.loc["BtL", "VOM"]
|
marginal_cost=costs.at['BtL', 'efficiency']*costs.loc["BtL", "VOM"]
|
||||||
)
|
)
|
||||||
|
|
||||||
#TODO: Update with energy penalty
|
#TODO: Update with energy penalty
|
||||||
n.madd("Link",
|
n.madd("Link",
|
||||||
spatial.biomass.nodes + " biomass to liquid CC",
|
spatial.biomass.nodes,
|
||||||
bus0=spatial.biomass.nodes,
|
suffix=" biomass to liquid CC",
|
||||||
bus1=spatial.oil.nodes,
|
bus0=spatial.biomass.nodes,
|
||||||
bus2=spatial.co2.nodes,
|
bus1=spatial.oil.nodes,
|
||||||
bus3="co2 atmosphere",
|
bus2=spatial.co2.nodes,
|
||||||
carrier="biomass to liquid",
|
bus3="co2 atmosphere",
|
||||||
lifetime=costs.at['BtL', 'lifetime'],
|
carrier="biomass to liquid",
|
||||||
efficiency=costs.at['BtL', 'efficiency'],
|
lifetime=costs.at['BtL', 'lifetime'],
|
||||||
efficiency2=costs.at['BtL', 'CO2 stored'] * costs.at['BtL', 'capture rate'],
|
efficiency=costs.at['BtL', 'efficiency'],
|
||||||
efficiency3=-costs.at['solid biomass', 'CO2 intensity'] + costs.at['BtL', 'CO2 stored'] * (1 - costs.at['BtL', 'capture rate']),
|
efficiency2=costs.at['BtL', 'CO2 stored'] * costs.at['BtL', 'capture rate'],
|
||||||
p_nom_extendable=True,
|
efficiency3=-costs.at['solid biomass', 'CO2 intensity'] + costs.at['BtL', 'CO2 stored'] * (1 - costs.at['BtL', 'capture rate']),
|
||||||
capital_cost=costs.at['BtL', 'fixed'] + costs.at['biomass CHP capture', 'fixed'] * costs.at[
|
p_nom_extendable=True,
|
||||||
"BtL", "CO2 stored"],
|
capital_cost=costs.at['BtL', 'fixed'] + costs.at['biomass CHP capture', 'fixed'] * costs.at[
|
||||||
marginal_cost=costs.at['BtL', 'efficiency'] * costs.loc["BtL", "VOM"]
|
"BtL", "CO2 stored"],
|
||||||
)
|
marginal_cost=costs.at['BtL', 'efficiency'] * costs.loc["BtL", "VOM"]
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def add_industry(n, costs):
|
def add_industry(n, costs):
|
||||||
|
Loading…
Reference in New Issue
Block a user