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-07-03 08:07:29 +00:00
parent 76e15d6862
commit 53328e89f2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/prepare_sector_network.py
View File

@ -2417,7 +2417,8 @@ def add_biomass(n, costs):
bus4=spatial.co2.df.loc[urban_central, "nodes"].values, bus4=spatial.co2.df.loc[urban_central, "nodes"].values,
carrier="urban central solid biomass CHP CC", carrier="urban central solid biomass CHP CC",
p_nom_extendable=True, p_nom_extendable=True,
capital_cost=costs.at[key + " CC", "fixed"] * costs.at[key + " CC", "efficiency"] capital_cost=costs.at[key + " CC", "fixed"]
* costs.at[key + " CC", "efficiency"]
+ costs.at["biomass CHP capture", "fixed"] + costs.at["biomass CHP capture", "fixed"]
* costs.at["solid biomass", "CO2 intensity"], * costs.at["solid biomass", "CO2 intensity"],
marginal_cost=costs.at[key + " CC", "VOM"], marginal_cost=costs.at[key + " CC", "VOM"],
@ -2478,8 +2479,8 @@ def add_biomass(n, costs):
marginal_cost=costs.at["BtL", "efficiency"] * costs.at["BtL", "VOM"], marginal_cost=costs.at["BtL", "efficiency"] * costs.at["BtL", "VOM"],
) )
#Assuming that acid gas removal (incl. CO2) from syngas i performed with Rectisol # Assuming that acid gas removal (incl. CO2) from syngas i performed with Rectisol
#process (Methanol) and that electricity demand for this is included in the base process # process (Methanol) and that electricity demand for this is included in the base process
n.madd( n.madd(
"Link", "Link",
spatial.biomass.nodes, spatial.biomass.nodes,
@ -3101,8 +3102,8 @@ def add_industry(n, costs):
p_nom_extendable=True, p_nom_extendable=True,
capital_cost=costs.at["waste CHP CC", "fixed"] capital_cost=costs.at["waste CHP CC", "fixed"]
* costs.at["waste CHP CC", "efficiency"] * costs.at["waste CHP CC", "efficiency"]
+ costs.at['biomass CHP capture', 'fixed'] + costs.at["biomass CHP capture", "fixed"]
* costs.at['oil', 'CO2 intensity'], * costs.at["oil", "CO2 intensity"],
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"],