Apply suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
This commit is contained in:
parent
2a3b576cbd
commit
5ae56cca7c
@ -232,7 +232,7 @@ sector:
|
||||
marginal_cost_storage: 0. #1e-4
|
||||
methanation: true
|
||||
helmeth: true
|
||||
coal_cc: true
|
||||
coal_cc: false
|
||||
dac: true
|
||||
co2_vent: true
|
||||
SMR: true
|
||||
|
@ -1118,23 +1118,24 @@ def add_storage_and_grids(n, costs):
|
||||
lifetime=costs.at['helmeth', 'lifetime']
|
||||
)
|
||||
|
||||
if options['coal_cc']:
|
||||
if options.get('coal_cc'):
|
||||
|
||||
for generator,carrier in [("coal CC","coal")]:
|
||||
n.madd("Link",
|
||||
nodes + " " + generator,
|
||||
bus0=["EU " + carrier]*len(nodes),
|
||||
bus1=nodes,
|
||||
n.madd("Link",
|
||||
spatial.nodes,
|
||||
suffix=" coal CC",
|
||||
bus0=spatial.coal.nodes,
|
||||
bus1=spatial.nodes,
|
||||
bus2="co2 atmosphere",
|
||||
bus3="co2 stored",
|
||||
marginal_cost=costs.at['coal','efficiency']*costs.at['coal','VOM'], #NB: VOM is per MWel
|
||||
capital_cost=costs.at['coal','efficiency']*costs.at['coal','fixed']+ costs.at['biomass CHP capture','fixed']*costs.at[carrier,'CO2 intensity'], #NB: fixed cost is per MWel
|
||||
marginal_cost=costs.at['coal', 'efficiency'] * costs.at['coal', 'VOM'], #NB: VOM is per MWel
|
||||
capital_cost=costs.at['coal', 'efficiency'] * costs.at['coal', 'fixed'] + costs.at['biomass CHP capture', 'fixed'] * costs.at['coal', 'CO2 intensity'], #NB: fixed cost is per MWel
|
||||
p_nom_extendable=True,
|
||||
carrier=generator,
|
||||
efficiency=costs.at['coal','efficiency'],
|
||||
efficiency2=costs.at[carrier,'CO2 intensity']*(1-costs.at['biomass CHP capture','capture_rate']),
|
||||
efficiency3=costs.at[carrier,'CO2 intensity']*costs.at['biomass CHP capture','capture_rate'],
|
||||
lifetime=costs.at['coal','lifetime'])
|
||||
carrier="coal",
|
||||
efficiency=costs.at['coal', 'efficiency'],
|
||||
efficiency2=costs.at['coal', 'CO2 intensity'] * (1 - costs.at['biomass CHP capture','capture_rate']),
|
||||
efficiency3=costs.at['coal', 'CO2 intensity'] * costs.at['biomass CHP capture','capture_rate'],
|
||||
lifetime=costs.at['coal','lifetime']
|
||||
)
|
||||
|
||||
if options['SMR']:
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user