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

some simplifications

Browse Source
This commit is contained in:
lisazeyen 2024-08-01 17:47:21 +02:00
parent dcde6a9f58
commit b2d346f02c
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/prepare_sector_network.py
View File

@ -543,21 +543,16 @@ def add_carrier_buses(n, carrier, nodes=None):
) )
fossils = ["coal", "gas", "oil", "lignite"] fossils = ["coal", "gas", "oil", "lignite"]
if not options.get("fossil_fuels", True) and carrier in fossils: if options.get("fossil_fuels", True) and carrier in fossils:
print("Not adding fossil ", carrier)
extendable = False n.madd(
else: "Generator",
print("Adding fossil ", carrier) nodes,
extendable = True bus=nodes,
p_nom_extendable=True,
n.madd( carrier=carrier,
"Generator", marginal_cost=costs.at[carrier, "fuel"],
nodes, )
bus=nodes,
p_nom_extendable=extendable,
carrier=carrier,
marginal_cost=costs.at[carrier, "fuel"],
)
# TODO: PyPSA-Eur merge issue # TODO: PyPSA-Eur merge issue
@ -2906,17 +2901,12 @@ def add_industry(n, costs):
carrier="oil", carrier="oil",
) )
if not options.get("fossil_fuels", True): if options.get("fossil_fuels", True) and "oil" not in n.generators.carrier.unique():
extendable = False
else:
extendable = True
if "oil" not in n.generators.carrier.unique():
n.madd( n.madd(
"Generator", "Generator",
spatial.oil.nodes, spatial.oil.nodes,
bus=spatial.oil.nodes, bus=spatial.oil.nodes,
p_nom_extendable=extendable, p_nom_extendable=True,
carrier="oil", carrier="oil",
marginal_cost=costs.at["oil", "fuel"], marginal_cost=costs.at["oil", "fuel"],
) )