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-05-13 15:14:33 +00:00
parent 614590b98f
commit b529ab1d3c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/prepare_sector_network.py
View File

@ -2905,7 +2905,9 @@ def add_industry(n, costs):
if cf_industry["waste_to_energy"] or cf_industry["waste_to_energy_cc"]: if cf_industry["waste_to_energy"] or cf_industry["waste_to_energy_cc"]:
non_sequestered_hvc_locations = pd.Index(spatial.oil.demand_locations) + " non-sequestered HVC" non_sequestered_hvc_locations = (
pd.Index(spatial.oil.demand_locations) + " non-sequestered HVC"
)
n.madd( n.madd(
"Bus", "Bus",
@ -2956,7 +2958,7 @@ def add_industry(n, costs):
* costs.at["waste CHP", "efficiency"], * costs.at["waste CHP", "efficiency"],
marginal_cost=costs.at["waste CHP", "VOM"], marginal_cost=costs.at["waste CHP", "VOM"],
efficiency=costs.at["waste CHP", "efficiency"], efficiency=costs.at["waste CHP", "efficiency"],
efficiency2=costs.at['waste CHP', 'efficiency-heat'], efficiency2=costs.at["waste CHP", "efficiency-heat"],
efficiency3=costs.at["oil", "CO2 intensity"], efficiency3=costs.at["oil", "CO2 intensity"],
lifetime=costs.at["waste CHP", "lifetime"], lifetime=costs.at["waste CHP", "lifetime"],
) )
@ -2977,8 +2979,9 @@ def add_industry(n, costs):
* costs.at["waste CHP CC", "efficiency"], * costs.at["waste CHP CC", "efficiency"],
marginal_cost=costs.at["waste CHP CC", "VOM"], marginal_cost=costs.at["waste CHP CC", "VOM"],
efficiency=costs.at["waste CHP CC", "efficiency"], efficiency=costs.at["waste CHP CC", "efficiency"],
efficiency2=costs.at["waste CHP CC", 'efficiency-heat'], efficiency2=costs.at["waste CHP CC", "efficiency-heat"],
efficiency3=costs.at["oil", "CO2 intensity"] * (1 - options["cc_fraction"]), efficiency3=costs.at["oil", "CO2 intensity"]
* (1 - options["cc_fraction"]),
efficiency4=costs.at["oil", "CO2 intensity"] * options["cc_fraction"], efficiency4=costs.at["oil", "CO2 intensity"] * options["cc_fraction"],
lifetime=costs.at["waste CHP CC", "lifetime"], lifetime=costs.at["waste CHP CC", "lifetime"],
) )