remove wave energy generator

This commit is contained in:
Fabian Neumann 2024-01-11 09:47:09 +01:00
parent 725a0ef8c0
commit a6edce58fb
4 changed files with 3 additions and 49 deletions

View File

@ -814,7 +814,6 @@ plotting:
hydroelectricity: '#298c81'
PHS: '#51dbcc'
hydro+PHS: "#08ad97"
wave: '#a7d4cf'
# solar
solar: "#f9d002"
solar PV: "#f9d002"

View File

@ -9,7 +9,6 @@ Swiss energy statistics from Swiss Federal Office of Energy,switzerland-sfoe/,un
BASt emobility statistics,emobility/,unknown,http://www.bast.de/DE/Verkehrstechnik/Fachthemen/v2-verkehrszaehlung/Stundenwerte.html?nn=626916
BDEW heating profile,heat_load_profile_BDEW.csv,unknown,https://github.com/oemof/demandlib
heating profiles for Aarhus,heat_load_profile_DK_AdamJensen.csv,unknown,Adam Jensen MA thesis at Aarhus University
George Lavidas wind/wave costs,WindWaveWEC_GLTB.xlsx,unknown,George Lavidas
co2 budgets,co2_budget.csv,CC BY 4.0,https://arxiv.org/abs/2004.11009
existing heating potentials,existing_infrastructure/existing_heating_raw.csv,unknown,https://ec.europa.eu/energy/studies/mapping-and-analyses-current-and-future-2020-2030-heatingcooling-fuel-deployment_en?redir=1
IRENA existing VRE capacities,existing_infrastructure/{solar|onwind|offwind}_capcity_IRENA.csv,unknown,https://www.irena.org/Statistics/Download-Data

1 description file/folder licence source
9 BASt emobility statistics emobility/ unknown http://www.bast.de/DE/Verkehrstechnik/Fachthemen/v2-verkehrszaehlung/Stundenwerte.html?nn=626916
10 BDEW heating profile heat_load_profile_BDEW.csv unknown https://github.com/oemof/demandlib
11 heating profiles for Aarhus heat_load_profile_DK_AdamJensen.csv unknown Adam Jensen MA thesis at Aarhus University
George Lavidas wind/wave costs WindWaveWEC_GLTB.xlsx unknown George Lavidas
12 co2 budgets co2_budget.csv CC BY 4.0 https://arxiv.org/abs/2004.11009
13 existing heating potentials existing_infrastructure/existing_heating_raw.csv unknown https://ec.europa.eu/energy/studies/mapping-and-analyses-current-and-future-2020-2030-heatingcooling-fuel-deployment_en?redir=1
14 IRENA existing VRE capacities existing_infrastructure/{solar|onwind|offwind}_capcity_IRENA.csv unknown https://www.irena.org/Statistics/Download-Data

View File

@ -12,6 +12,9 @@ Upcoming Release
* New configuration option ``everywhere_powerplants`` to build conventional powerplants everywhere, irrespective of existing powerplants locations, in the network (https://github.com/PyPSA/pypsa-eur/pull/850).
* Remove option for wave energy as technology data is not maintained.
PyPSA-Eur 0.9.0 (5th January 2024)
==================================

View File

@ -913,47 +913,6 @@ def add_ammonia(n, costs):
)
def add_wave(n, wave_cost_factor):
# TODO: handle in Snakefile
wave_fn = "data/WindWaveWEC_GLTB.xlsx"
# in kW
capacity = pd.Series({"Attenuator": 750, "F2HB": 1000, "MultiPA": 600})
# in EUR/MW
annuity_factor = calculate_annuity(25, 0.07) + 0.03
costs = (
1e6
* wave_cost_factor
* annuity_factor
* pd.Series({"Attenuator": 2.5, "F2HB": 2, "MultiPA": 1.5})
)
sheets = pd.read_excel(
wave_fn,
sheet_name=["FirthForth", "Hebrides"],
usecols=["Attenuator", "F2HB", "MultiPA"],
index_col=0,
skiprows=[0],
parse_dates=True,
)
wave = pd.concat(
[sheets[l].divide(capacity, axis=1) for l in locations], keys=locations, axis=1
)
for wave_type in costs.index:
n.add(
"Generator",
"Hebrides " + wave_type,
bus="GB4 0", # TODO this location is hardcoded
p_nom_extendable=True,
carrier="wave",
capital_cost=costs[wave_type],
p_max_pu=wave["Hebrides", wave_type],
)
def insert_electricity_distribution_grid(n, costs):
# TODO pop_layout?
# TODO options?
@ -3698,12 +3657,6 @@ if __name__ == "__main__":
# TODO merge with opts cost adjustment below
for o in opts:
if o[:4] == "wave":
wave_cost_factor = float(o[4:].replace("p", ".").replace("m", "-"))
logger.info(
f"Including wave generators with cost factor of {wave_cost_factor}"
)
add_wave(n, wave_cost_factor)
if o[:4] == "dist":
options["electricity_distribution_grid"] = True
options["electricity_distribution_grid_cost_factor"] = float(