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

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse Source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot] 2024-03-01 17:42:20 +00:00 committed by Fabian Neumann
parent 2055fe68ef
commit 1d709913ed
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/prepare_sector_network.py
View File

@ -2905,7 +2905,10 @@ def add_industry(n, costs):
investment_year, investment_year,
) )
if snakemake.config["industry"]["waste_to_energy"] and options["regional_oil_demand"]: if (
snakemake.config["industry"]["waste_to_energy"]
and options["regional_oil_demand"]
):
n.madd( n.madd(
"Bus", "Bus",
@ -2924,7 +2927,9 @@ def add_industry(n, costs):
bus3=spatial.co2.process_emissions, bus3=spatial.co2.process_emissions,
carrier="naphtha for industry", carrier="naphtha for industry",
p_nom_extendable=True, p_nom_extendable=True,
efficiency2=non_sequestered*emitted_co2_per_naphtha/costs.at["oil", "CO2 intensity"], efficiency2=non_sequestered
* emitted_co2_per_naphtha
/ costs.at["oil", "CO2 intensity"],
efficiency3=process_co2_per_naphtha, efficiency3=process_co2_per_naphtha,
) )
@ -2948,12 +2953,14 @@ def add_industry(n, costs):
carrier="waste CHP", carrier="waste CHP",
p_nom_extendable=True, p_nom_extendable=True,
# p_nom=biomass_potential['municipal solid waste'] / 8760, # p_nom=biomass_potential['municipal solid waste'] / 8760,
capital_cost=costs.at['waste CHP', 'fixed'] * costs.at['waste CHP', 'efficiency'], capital_cost=costs.at["waste CHP", "fixed"]
marginal_cost=costs.at['waste CHP', 'VOM'], * costs.at["waste CHP", "efficiency"],
efficiency=costs.at['waste CHP', 'efficiency'], marginal_cost=costs.at["waste CHP", "VOM"],
efficiency=costs.at["waste CHP", "efficiency"],
# efficiency4=costs.at['waste CHP', 'efficiency-heat'], # efficiency4=costs.at['waste CHP', 'efficiency-heat'],
efficiency2=costs.at['oil', 'CO2 intensity'], efficiency2=costs.at["oil", "CO2 intensity"],
lifetime=costs.at['waste CHP', 'lifetime']) lifetime=costs.at["waste CHP", "lifetime"],
)
# TODO add heat # TODO add heat
n.madd( n.madd(
@ -2966,14 +2973,15 @@ def add_industry(n, costs):
carrier="waste CHP CC", carrier="waste CHP CC",
p_nom_extendable=True, p_nom_extendable=True,
# p_nom=biomass_potential['municipal solid waste'] / 8760, # p_nom=biomass_potential['municipal solid waste'] / 8760,
capital_cost=costs.at['waste CHP CC', 'fixed'] * costs.at['waste CHP CC', 'efficiency'], capital_cost=costs.at["waste CHP CC", "fixed"]
marginal_cost=costs.at['waste CHP CC', 'VOM'], * costs.at["waste CHP CC", "efficiency"],
efficiency=costs.at['waste CHP CC', 'efficiency'], marginal_cost=costs.at["waste CHP CC", "VOM"],
efficiency=costs.at["waste CHP CC", "efficiency"],
# efficiency4=costs.at['waste CHP', 'efficiency-heat'], # efficiency4=costs.at['waste CHP', 'efficiency-heat'],
efficiency2=costs.at['oil', 'CO2 intensity']*(1 - options["cc_fraction"]), efficiency2=costs.at["oil", "CO2 intensity"] * (1 - options["cc_fraction"]),
efficiency3=costs.at['oil', 'CO2 intensity']*options["cc_fraction"], efficiency3=costs.at["oil", "CO2 intensity"] * options["cc_fraction"],
lifetime=costs.at['waste CHP CC', 'lifetime']) lifetime=costs.at["waste CHP CC", "lifetime"],
)
else: else: