bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 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-12 20:14:25 +00:00
commit 0205d3efbf
2 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
scripts/prepare_sector_network.py
View File

@ -3316,7 +3316,9 @@ def add_enhanced_geothermal(
"""
if len(spatial.geothermal_heat.nodes) > 1:
logger.warning("'add_enhanced_geothermal' not implemented for multiple geothermal nodes.")
logger.warning(
"'add_enhanced_geothermal' not implemented for multiple geothermal nodes."
)
config = snakemake.config
@ -3335,21 +3337,20 @@ def add_enhanced_geothermal(
# cost for ORC is subtracted, as it is already included in the geothermal cost.
# The orc cost are attributed to a separate link representing the ORC.
egs_potentials["capital_cost"] = (
(egs_annuity + FOM / (1. + FOM))
(egs_annuity + FOM / (1.0 + FOM))
* (egs_potentials["CAPEX"] - costs.at["organice rankine cycle", "investment"])
* Nyears
* 1000.
* 1000.0
)
assert (egs_potentials["capital_cost"] > 0).all(), "Error in EGS cost, negative values found."
assert (
egs_potentials["capital_cost"] > 0
).all(), "Error in EGS cost, negative values found."
plant_annuity = calculate_annuity(
costs.at["organic rankine cycle", "lifetime"],
dr
)
plant_annuity = calculate_annuity(costs.at["organic rankine cycle", "lifetime"], dr)
plant_capital_cost = (
(plant_annuity + FOM / (1 + FOM)) *
costs.at["organic rankine cycle", "investment"] *
Nyears
(plant_annuity + FOM / (1 + FOM))
* costs.at["organic rankine cycle", "investment"]
* Nyears
)
efficiency_orc = costs.at["organic rankine cycle", "efficiency"]
@ -3381,16 +3382,14 @@ def add_enhanced_geothermal(
if snakemake.params.sector["enhanced_geothermal_var_cf"]:
efficiency = pd.read_csv(
snakemake.input.egs_capacity_factors,
parse_dates=True,
index_col=0
snakemake.input.egs_capacity_factors, parse_dates=True, index_col=0
)
logger.info("Adding Enhanced Geothermal with time-varying capacity factors.")
else:
efficiency = pd.Series(1, overlap.index)
# if urban central heat exists, adds geothermal as CHP
as_chp = 'urban central heat' in n.buses.carrier
as_chp = "urban central heat" in n.buses.carrier
if as_chp:
logger.info("Adding Enhanced Geothermal as Combined Heat and Power.")
@ -3428,10 +3427,13 @@ def add_enhanced_geothermal(
location=bus,
)
bus_eta = pd.concat((
bus_eta = pd.concat(
(
efficiency[bus].rename(idx)
for idx in f"{bus} enhanced geothermal" + appendix
), axis=1)
),
axis=1,
)
n.madd(
"Link",
@ -3448,24 +3450,26 @@ def add_enhanced_geothermal(
n.add(
"Link",
bus + ' geothermal organic rankine cycle',
bus + " geothermal organic rankine cycle",
bus0=f"geothermal heat surface {bus}",
bus1=bus,
p_nom_extendable=True,
carrier="geothermal organic rankine cycle",
capital_cost=plant_capital_cost * efficiency_orc,
efficiency=efficiency_orc if not as_chp else efficiency_orc * 2.,
efficiency=efficiency_orc if not as_chp else efficiency_orc * 2.0,
)
if as_chp and bus + " urban central heat" in n.buses.index:
n.add(
"Link",
bus + ' geothermal heat district heat',
bus + " geothermal heat district heat",
bus0=f"geothermal heat surface {bus}",
bus1=bus + ' urban central heat',
bus1=bus + " urban central heat",
carrier="geothermal district heat",
capital_cost=plant_capital_cost * efficiency_orc * costs.at["geothermal", "district heating cost"],
efficiency=efficiency_dh * 2.,
capital_cost=plant_capital_cost
* efficiency_orc
* costs.at["geothermal", "district heating cost"],
efficiency=efficiency_dh * 2.0,
p_nom_extendable=True,
)
else:
@ -3492,7 +3496,6 @@ def add_enhanced_geothermal(
)
if __name__ == "__main__":
if "snakemake" not in globals():
from _helpers import mock_snakemake

9
scripts/solve_network.py
View File

@ -763,12 +763,13 @@ def add_pipe_retrofit_constraint(n):
def add_geothermal_chp_constraint(n):
elec_index = n.links.loc[n.links.carrier == 'geothermal organic rankine cycle'].index
heat_index = n.links.loc[n.links.carrier == 'geothermal heat district heat'].index
elec_index = n.links.loc[
n.links.carrier == "geothermal organic rankine cycle"
].index
heat_index = n.links.loc[n.links.carrier == "geothermal heat district heat"].index
p_nom_lhs = (
n.model["Link-p_nom"].loc[heat_index]
- n.model["Link-p_nom"].loc[elec_index]
n.model["Link-p_nom"].loc[heat_index] - n.model["Link-p_nom"].loc[elec_index]
)
n.model.add_constraints(