bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
This commit is contained in:
Ebbe Kyhl 2022-06-27 18:06:59 +02:00 committed by GitHub
parent 2a3b576cbd
commit 5ae56cca7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.default.yaml
View File

@ -232,7 +232,7 @@ sector:
marginal_cost_storage: 0. #1e-4 marginal_cost_storage: 0. #1e-4
methanation: true methanation: true
helmeth: true helmeth: true
coal_cc: true coal_cc: false
dac: true dac: true
co2_vent: true co2_vent: true
SMR: true SMR: true

33
scripts/prepare_sector_network.py
View File

@ -1118,23 +1118,24 @@ def add_storage_and_grids(n, costs):
lifetime=costs.at['helmeth', 'lifetime'] lifetime=costs.at['helmeth', 'lifetime']
) )
if options['coal_cc']: if options.get('coal_cc'):
for generator,carrier in [("coal CC","coal")]: n.madd("Link",
n.madd("Link", spatial.nodes,
nodes + " " + generator, suffix=" coal CC",
bus0=["EU " + carrier]*len(nodes), bus0=spatial.coal.nodes,
bus1=nodes, bus1=spatial.nodes,
bus2="co2 atmosphere", bus2="co2 atmosphere",
bus3="co2 stored", bus3="co2 stored",
marginal_cost=costs.at['coal','efficiency']*costs.at['coal','VOM'], #NB: VOM 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[carrier,'CO2 intensity'], #NB: fixed cost 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, p_nom_extendable=True,
carrier=generator, carrier="coal",
efficiency=costs.at['coal','efficiency'], efficiency=costs.at['coal', 'efficiency'],
efficiency2=costs.at[carrier,'CO2 intensity']*(1-costs.at['biomass CHP capture','capture_rate']), efficiency2=costs.at['coal', 'CO2 intensity'] * (1 - costs.at['biomass CHP capture','capture_rate']),
efficiency3=costs.at[carrier,'CO2 intensity']*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']) lifetime=costs.at['coal','lifetime']
)
if options['SMR']: if options['SMR']: