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

Merge branch 'master' of https://github.com/LukasFrankenQ/pypsa-eur

Browse Source
This commit is contained in:
LukasFrankenQ 2023-11-14 03:21:28 +00:00
commit 4a7852cba8
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/prepare_sector_network.py
View File

@ -3431,10 +3431,7 @@ def add_enhanced_geothermal(
well_name = f"{bus} enhanced geothermal" + appendix well_name = f"{bus} enhanced geothermal" + appendix
bus_eta = pd.concat( bus_eta = pd.concat(
( (efficiency[bus].rename(idx) for idx in well_name),
efficiency[bus].rename(idx)
for idx in well_name
),
axis=1, axis=1,
) )
@ -3480,7 +3477,9 @@ def add_enhanced_geothermal(
p_nom_extendable=True, p_nom_extendable=True,
) )
elif as_chp and not bus + " urban central heat" in n.buses.index: elif as_chp and not bus + " urban central heat" in n.buses.index:
n.links.at[bus + " geothermal organic rankine cycle", "efficiency"] = efficiency_orc n.links.at[
bus + " geothermal organic rankine cycle", "efficiency"
] = efficiency_orc
if snakemake.params.sector["enhanced_geothermal_flexible"]: if snakemake.params.sector["enhanced_geothermal_flexible"]:
# this StorageUnit represents flexible operation using the geothermal reservoir. # this StorageUnit represents flexible operation using the geothermal reservoir.
@ -3495,7 +3494,7 @@ def add_enhanced_geothermal(
max_hours = max_hours * boost max_hours = max_hours * boost
n.add( n.add(
"StorageUnit", "StorageUnit",
bus + ' geothermal reservoir', bus + " geothermal reservoir",
bus=f"{bus} geothermal heat surface", bus=f"{bus} geothermal heat surface",
carrier="geothermal heat", carrier="geothermal heat",
p_nom_extendable=True, p_nom_extendable=True,