From b7af3ff91c10ea93572aec3bcc9f61407096431f Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Mon, 19 Aug 2024 09:22:16 +0200 Subject: [PATCH 01/11] make weather year dynamic --- src/egon/data/datasets/heat_etrago/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/egon/data/datasets/heat_etrago/__init__.py b/src/egon/data/datasets/heat_etrago/__init__.py index 9b062b5eb..c1082993c 100644 --- a/src/egon/data/datasets/heat_etrago/__init__.py +++ b/src/egon/data/datasets/heat_etrago/__init__.py @@ -368,13 +368,15 @@ def insert_central_direct_heat(scenario): # Map solar thermal collectors to weather cells join = gpd.sjoin(weather_cells, solar_thermal)[["index_right"]] + weather_year = get_sector_parameters("global", scenario)["weather_year"] + feedin = db.select_dataframe( f""" SELECT w_id, feedin FROM {sources['feedin_timeseries']['schema']}. {sources['feedin_timeseries']['table']} WHERE carrier = 'solar_thermal' - AND weather_year = 2019 + AND weather_year = {weather_year} """, index_col="w_id", ) From 984e4d537a9bc4c7e5ab3e56937c2d46a2faa036 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Mon, 19 Aug 2024 10:00:09 +0200 Subject: [PATCH 02/11] include heat values eGon100RE --- .../datasets/scenario_parameters/parameters.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/egon/data/datasets/scenario_parameters/parameters.py b/src/egon/data/datasets/scenario_parameters/parameters.py index 91e7b6bc0..fdd317303 100755 --- a/src/egon/data/datasets/scenario_parameters/parameters.py +++ b/src/egon/data/datasets/scenario_parameters/parameters.py @@ -1109,12 +1109,27 @@ def heat(scenario): } elif scenario == "eGon100RE": + costs = read_csv(2050) + parameters = { "DE_demand_reduction_residential": 0.640720648501849, "DE_demand_reduction_service": 0.390895195300713, "DE_district_heating_share": 0.19, } + parameters["marginal_cost"] = { + "central_heat_pump": read_costs( + costs, "central air-sourced heat pump", "VOM" + ), + "central_gas_chp": read_costs(costs, "central gas CHP", "VOM"), + "central_gas_boiler": read_costs( + costs, "central gas boiler", "VOM" + ), + "central_resistive_heater": read_costs( + costs, "central resistive heater", "VOM" + ), + } + elif scenario == "eGon2021": parameters = {} From 779b605740d5e787ade9ce4755c5ff52a3070f13 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Mon, 19 Aug 2024 10:23:19 +0200 Subject: [PATCH 03/11] fix bug new pandas behaviour --- src/egon/data/datasets/heat_etrago/power_to_heat.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/egon/data/datasets/heat_etrago/power_to_heat.py b/src/egon/data/datasets/heat_etrago/power_to_heat.py index 8d7cc3bb5..38421c3b7 100644 --- a/src/egon/data/datasets/heat_etrago/power_to_heat.py +++ b/src/egon/data/datasets/heat_etrago/power_to_heat.py @@ -548,7 +548,8 @@ def assign_electrical_bus(heat_pumps, carrier, scenario, multiple_per_mv_grid=Fa power_to_heat["share_demand"] = power_to_heat.groupby( "area_id" - ).demand.apply(lambda grp: grp / grp.sum()) + ).demand.apply(lambda grp: grp / grp.sum()).values + power_to_heat["capacity"] = power_to_heat["share_demand"].mul( heat_pumps.capacity[power_to_heat.area_id].values From 414b7874ec191cd5ae4c3346ca2d2a0c8110520e Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Mon, 19 Aug 2024 10:48:16 +0200 Subject: [PATCH 04/11] include heat efficiency values eGon100RE --- .../scenario_parameters/parameters.py | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/egon/data/datasets/scenario_parameters/parameters.py b/src/egon/data/datasets/scenario_parameters/parameters.py index fdd317303..db25bc0ee 100755 --- a/src/egon/data/datasets/scenario_parameters/parameters.py +++ b/src/egon/data/datasets/scenario_parameters/parameters.py @@ -1128,6 +1128,32 @@ def heat(scenario): "central_resistive_heater": read_costs( costs, "central resistive heater", "VOM" ), + "geo_thermal": 2.9, # Danish Energy Agency + "water_tank_charger": 0, # Danish Energy Agency + "water_tank_discharger": 0, # Danish Energy Agency + "rural_heat_pump": 0, # Danish Energy Agency, Technology Data for Individual Heating Plants + } + + # Insert efficiency in p.u. + parameters["efficiency"] = { + "water_tank_charger": read_costs( + costs, "water tank charger", "efficiency" + ), + "water_tank_discharger": read_costs( + costs, "water tank discharger", "efficiency" + ), + "central_resistive_heater": read_costs( + costs, "central resistive heater", "efficiency" + ), + "central_gas_boiler": read_costs( + costs, "central gas boiler", "efficiency" + ), + "rural_resistive_heater": read_costs( + costs, "decentral resistive heater", "efficiency" + ), + "rural_gas_boiler": read_costs( + costs, "decentral gas boiler", "efficiency" + ), } elif scenario == "eGon2021": From 4618e28c62ab520971736cf95e7942bacc0fc0f4 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Mon, 19 Aug 2024 11:08:46 +0200 Subject: [PATCH 05/11] include heat capital costs eGon100RE --- .../scenario_parameters/parameters.py | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/egon/data/datasets/scenario_parameters/parameters.py b/src/egon/data/datasets/scenario_parameters/parameters.py index db25bc0ee..e20f5775d 100755 --- a/src/egon/data/datasets/scenario_parameters/parameters.py +++ b/src/egon/data/datasets/scenario_parameters/parameters.py @@ -1156,6 +1156,36 @@ def heat(scenario): ), } + # Insert overnight investment costs, in EUR/MWh + parameters["overnight_cost"] = { + "central_water_tank": read_costs( + costs, "central water tank storage", "investment" + ), + "rural_water_tank": read_costs( + costs, "decentral water tank storage", "investment" + ), + } + + # Insert lifetime + parameters["lifetime"] = { + "central_water_tank": read_costs( + costs, "central water tank storage", "lifetime" + ), + "rural_water_tank": read_costs( + costs, "decentral water tank storage", "lifetime" + ), + } + + # Insert annualized capital costs + parameters["capital_cost"] = {} + + for comp in parameters["overnight_cost"].keys(): + parameters["capital_cost"][comp] = annualize_capital_costs( + parameters["overnight_cost"][comp], + parameters["lifetime"][comp], + global_settings("eGon2035")["interest_rate"], + ) + elif scenario == "eGon2021": parameters = {} From c208c162007554b232a5b0d4ef026d2c355b643a Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Mon, 19 Aug 2024 13:32:12 +0200 Subject: [PATCH 06/11] execute HeatPumps2035 only if eGon2035 in scenarios --- .../heat_supply/individual_heating.py | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/egon/data/datasets/heat_supply/individual_heating.py b/src/egon/data/datasets/heat_supply/individual_heating.py index 9a7e5afa4..e34742918 100644 --- a/src/egon/data/datasets/heat_supply/individual_heating.py +++ b/src/egon/data/datasets/heat_supply/individual_heating.py @@ -384,17 +384,28 @@ def dyn_parallel_tasks_2035(): ) ) return tasks + def heat_pumps_2035_skipped(): + print("eGon2035 is not in the list of scenarios. HeatPumps2035 dataset is skipped") - super().__init__( - name="HeatPumps2035", - version="0.0.2", - dependencies=dependencies, - tasks=( + tasks_HeatPumps2035 = set() + + scenarios = config.settings()["egon-data"]["--scenarios"] + + if "eGon2035" in scenarios: + tasks_HeatPumps2035=( delete_heat_peak_loads_2035, delete_hp_capacity_2035, delete_mvgd_ts_2035, {*dyn_parallel_tasks_2035()}, - ), + ) + else: + tasks_HeatPumps2035 = (heat_pumps_2035_skipped,) + + super().__init__( + name="HeatPumps2035", + version="0.0.2", + dependencies=dependencies, + tasks=tasks_HeatPumps2035, ) From 4a6aa4084f15282dfa89023cf3d9f1ef355c6d29 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Wed, 4 Sep 2024 11:05:30 +0200 Subject: [PATCH 07/11] execute tasks only when its scenario is required --- .../heat_supply/individual_heating.py | 76 ++++++++++++++----- 1 file changed, 55 insertions(+), 21 deletions(-) diff --git a/src/egon/data/datasets/heat_supply/individual_heating.py b/src/egon/data/datasets/heat_supply/individual_heating.py index e34742918..69b8b3002 100644 --- a/src/egon/data/datasets/heat_supply/individual_heating.py +++ b/src/egon/data/datasets/heat_supply/individual_heating.py @@ -224,6 +224,7 @@ engine = db.engine() Base = declarative_base() +scenarios = config.settings()["egon-data"]["--scenarios"] class EgonEtragoTimeseriesIndividualHeating(Base): __tablename__ = "egon_etrago_timeseries_individual_heating" @@ -280,17 +281,26 @@ def dyn_parallel_tasks_pypsa_eur_sec(): ) ) return tasks + tasks_HeatPumpsPypsaEur = set() - super().__init__( - name="HeatPumpsPypsaEurSec", - version="0.0.2", - dependencies=dependencies, - tasks=( + if "eGon100RE" in scenarios: + tasks_HeatPumpsPypsaEur=( delete_pypsa_eur_sec_csv_file, delete_mvgd_ts_100RE, delete_heat_peak_loads_100RE, {*dyn_parallel_tasks_pypsa_eur_sec()}, - ), + ) + else: + tasks_HeatPumpsPypsaEur = (PythonOperator( + task_id = "HeatPumpsPypsaEur_skipped", + python_callable = skip_task, + op_kwargs={"scn":"eGon100RE", "task":"HeatPumpsPypsaEur"}),) + + super().__init__( + name="HeatPumpsPypsaEurSec", + version="0.0.2", + dependencies=dependencies, + tasks=tasks_HeatPumpsPypsaEur, ) @@ -332,17 +342,27 @@ def dyn_parallel_tasks_2019(): ) ) return tasks + + tasks_HeatPumps2019 = set() - super().__init__( - name="HeatPumps2019", - version="0.0.2", - dependencies=dependencies, - tasks=( + if "status2019" in scenarios: + tasks_HeatPumps2019=( delete_heat_peak_loads_2019, delete_hp_capacity_2019, delete_mvgd_ts_2019, {*dyn_parallel_tasks_2019()}, - ), + ) + else: + tasks_HeatPumps2019 = (PythonOperator( + task_id = "HeatPumps2019_skipped", + python_callable = skip_task, + op_kwargs={"scn":"status2019", "task":"HeatPumps2019"}),) + + super().__init__( + name="HeatPumps2019", + version="0.0.2", + dependencies=dependencies, + tasks=tasks_HeatPumps2019, ) @@ -384,13 +404,9 @@ def dyn_parallel_tasks_2035(): ) ) return tasks - def heat_pumps_2035_skipped(): - print("eGon2035 is not in the list of scenarios. HeatPumps2035 dataset is skipped") tasks_HeatPumps2035 = set() - scenarios = config.settings()["egon-data"]["--scenarios"] - if "eGon2035" in scenarios: tasks_HeatPumps2035=( delete_heat_peak_loads_2035, @@ -399,7 +415,10 @@ def heat_pumps_2035_skipped(): {*dyn_parallel_tasks_2035()}, ) else: - tasks_HeatPumps2035 = (heat_pumps_2035_skipped,) + tasks_HeatPumps2035 = (PythonOperator( + task_id = "HeatPumps2035_skipped", + python_callable = skip_task, + op_kwargs={"scn":"eGon2035", "task":"HeatPumps2035"}),) super().__init__( name="HeatPumps2035", @@ -411,14 +430,24 @@ def heat_pumps_2035_skipped(): class HeatPumps2050(Dataset): def __init__(self, dependencies): + tasks_HeatPumps2050 = set() + + if "eGon100RE" in scenarios: + tasks_HeatPumps2050=( + delete_hp_capacity_100RE, + determine_hp_cap_buildings_eGon100RE, + ) + else: + tasks_HeatPumps2050 = (PythonOperator( + task_id = "HeatPumps2050_skipped", + python_callable = skip_task, + op_kwargs={"scn":"eGon100RE", "task":"HeatPumps2050"}),) + super().__init__( name="HeatPumps2050", version="0.0.2", dependencies=dependencies, - tasks=( - delete_hp_capacity_100RE, - determine_hp_cap_buildings_eGon100RE, - ), + tasks=tasks_HeatPumps2050, ) @@ -432,6 +461,11 @@ class BuildingHeatPeakLoads(Base): peak_load_in_w = Column(REAL) +def skip_task(scn=str, task=str): + def not_executed(): + logger.info(f"{scn} is not in the list of scenarios. {task} dataset is skipped.") + return not_executed + def adapt_numpy_float64(numpy_float64): return AsIs(numpy_float64) From 78e5f62dca3932316e30d8decec2260db9292434 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Wed, 4 Sep 2024 11:06:14 +0200 Subject: [PATCH 08/11] using black --- .../heat_supply/individual_heating.py | 67 ++++++++++++------- 1 file changed, 44 insertions(+), 23 deletions(-) diff --git a/src/egon/data/datasets/heat_supply/individual_heating.py b/src/egon/data/datasets/heat_supply/individual_heating.py index 69b8b3002..d99dafa99 100644 --- a/src/egon/data/datasets/heat_supply/individual_heating.py +++ b/src/egon/data/datasets/heat_supply/individual_heating.py @@ -226,6 +226,7 @@ scenarios = config.settings()["egon-data"]["--scenarios"] + class EgonEtragoTimeseriesIndividualHeating(Base): __tablename__ = "egon_etrago_timeseries_individual_heating" __table_args__ = {"schema": "demand"} @@ -281,20 +282,27 @@ def dyn_parallel_tasks_pypsa_eur_sec(): ) ) return tasks + tasks_HeatPumpsPypsaEur = set() if "eGon100RE" in scenarios: - tasks_HeatPumpsPypsaEur=( + tasks_HeatPumpsPypsaEur = ( delete_pypsa_eur_sec_csv_file, delete_mvgd_ts_100RE, delete_heat_peak_loads_100RE, {*dyn_parallel_tasks_pypsa_eur_sec()}, ) else: - tasks_HeatPumpsPypsaEur = (PythonOperator( - task_id = "HeatPumpsPypsaEur_skipped", - python_callable = skip_task, - op_kwargs={"scn":"eGon100RE", "task":"HeatPumpsPypsaEur"}),) + tasks_HeatPumpsPypsaEur = ( + PythonOperator( + task_id="HeatPumpsPypsaEur_skipped", + python_callable=skip_task, + op_kwargs={ + "scn": "eGon100RE", + "task": "HeatPumpsPypsaEur", + }, + ), + ) super().__init__( name="HeatPumpsPypsaEurSec", @@ -342,21 +350,24 @@ def dyn_parallel_tasks_2019(): ) ) return tasks - + tasks_HeatPumps2019 = set() if "status2019" in scenarios: - tasks_HeatPumps2019=( + tasks_HeatPumps2019 = ( delete_heat_peak_loads_2019, delete_hp_capacity_2019, delete_mvgd_ts_2019, {*dyn_parallel_tasks_2019()}, ) else: - tasks_HeatPumps2019 = (PythonOperator( - task_id = "HeatPumps2019_skipped", - python_callable = skip_task, - op_kwargs={"scn":"status2019", "task":"HeatPumps2019"}),) + tasks_HeatPumps2019 = ( + PythonOperator( + task_id="HeatPumps2019_skipped", + python_callable=skip_task, + op_kwargs={"scn": "status2019", "task": "HeatPumps2019"}, + ), + ) super().__init__( name="HeatPumps2019", @@ -408,17 +419,20 @@ def dyn_parallel_tasks_2035(): tasks_HeatPumps2035 = set() if "eGon2035" in scenarios: - tasks_HeatPumps2035=( + tasks_HeatPumps2035 = ( delete_heat_peak_loads_2035, delete_hp_capacity_2035, delete_mvgd_ts_2035, {*dyn_parallel_tasks_2035()}, ) else: - tasks_HeatPumps2035 = (PythonOperator( - task_id = "HeatPumps2035_skipped", - python_callable = skip_task, - op_kwargs={"scn":"eGon2035", "task":"HeatPumps2035"}),) + tasks_HeatPumps2035 = ( + PythonOperator( + task_id="HeatPumps2035_skipped", + python_callable=skip_task, + op_kwargs={"scn": "eGon2035", "task": "HeatPumps2035"}, + ), + ) super().__init__( name="HeatPumps2035", @@ -433,16 +447,19 @@ def __init__(self, dependencies): tasks_HeatPumps2050 = set() if "eGon100RE" in scenarios: - tasks_HeatPumps2050=( + tasks_HeatPumps2050 = ( delete_hp_capacity_100RE, determine_hp_cap_buildings_eGon100RE, ) else: - tasks_HeatPumps2050 = (PythonOperator( - task_id = "HeatPumps2050_skipped", - python_callable = skip_task, - op_kwargs={"scn":"eGon100RE", "task":"HeatPumps2050"}),) - + tasks_HeatPumps2050 = ( + PythonOperator( + task_id="HeatPumps2050_skipped", + python_callable=skip_task, + op_kwargs={"scn": "eGon100RE", "task": "HeatPumps2050"}, + ), + ) + super().__init__( name="HeatPumps2050", version="0.0.2", @@ -463,9 +480,13 @@ class BuildingHeatPeakLoads(Base): def skip_task(scn=str, task=str): def not_executed(): - logger.info(f"{scn} is not in the list of scenarios. {task} dataset is skipped.") + logger.info( + f"{scn} is not in the list of scenarios. {task} dataset is skipped." + ) + return not_executed + def adapt_numpy_float64(numpy_float64): return AsIs(numpy_float64) From 2b7808f6b410d4bc7b1087e3b0d0370b46a52fc2 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Wed, 4 Sep 2024 11:13:17 +0200 Subject: [PATCH 09/11] include interest_rate for eGon100RE --- src/egon/data/datasets/scenario_parameters/parameters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/egon/data/datasets/scenario_parameters/parameters.py b/src/egon/data/datasets/scenario_parameters/parameters.py index e20f5775d..8f99cbc6e 100755 --- a/src/egon/data/datasets/scenario_parameters/parameters.py +++ b/src/egon/data/datasets/scenario_parameters/parameters.py @@ -116,6 +116,7 @@ def global_settings(scenario): "coal": 0.335, # [t_CO2/MW_th] "other_non_renewable": 0.268, # [t_CO2/MW_th] }, + "interest_rate": 0.05, # [p.u.] } elif scenario == "eGon2021": @@ -1183,7 +1184,7 @@ def heat(scenario): parameters["capital_cost"][comp] = annualize_capital_costs( parameters["overnight_cost"][comp], parameters["lifetime"][comp], - global_settings("eGon2035")["interest_rate"], + global_settings("eGon100RE")["interest_rate"], ) elif scenario == "eGon2021": From f85ff746c2ee919fe3ed12a5146276af0429bb64 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Wed, 4 Sep 2024 11:18:43 +0200 Subject: [PATCH 10/11] increase versions --- src/egon/data/datasets/heat_supply/individual_heating.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/egon/data/datasets/heat_supply/individual_heating.py b/src/egon/data/datasets/heat_supply/individual_heating.py index d99dafa99..bf86d087e 100644 --- a/src/egon/data/datasets/heat_supply/individual_heating.py +++ b/src/egon/data/datasets/heat_supply/individual_heating.py @@ -306,7 +306,7 @@ def dyn_parallel_tasks_pypsa_eur_sec(): super().__init__( name="HeatPumpsPypsaEurSec", - version="0.0.2", + version="0.0.3", dependencies=dependencies, tasks=tasks_HeatPumpsPypsaEur, ) @@ -371,7 +371,7 @@ def dyn_parallel_tasks_2019(): super().__init__( name="HeatPumps2019", - version="0.0.2", + version="0.0.3", dependencies=dependencies, tasks=tasks_HeatPumps2019, ) @@ -436,7 +436,7 @@ def dyn_parallel_tasks_2035(): super().__init__( name="HeatPumps2035", - version="0.0.2", + version="0.0.3", dependencies=dependencies, tasks=tasks_HeatPumps2035, ) @@ -462,7 +462,7 @@ def __init__(self, dependencies): super().__init__( name="HeatPumps2050", - version="0.0.2", + version="0.0.3", dependencies=dependencies, tasks=tasks_HeatPumps2050, ) From eecd25ecd7d85dd86ed6001b76d70328c93f0e28 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Thu, 5 Sep 2024 10:48:25 +0200 Subject: [PATCH 11/11] update functions names - no pypsa-eur-sec --- src/egon/data/airflow/dags/pipeline.py | 12 ++++++------ .../datasets/heat_supply/individual_heating.py | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/egon/data/airflow/dags/pipeline.py b/src/egon/data/airflow/dags/pipeline.py index 4550a2671..05f2c4b57 100755 --- a/src/egon/data/airflow/dags/pipeline.py +++ b/src/egon/data/airflow/dags/pipeline.py @@ -55,7 +55,7 @@ from egon.data.datasets.heat_supply.individual_heating import ( HeatPumps2035, HeatPumps2050, - HeatPumpsPypsaEurSec, + HeatPumpsPypsaEur, ) from egon.data.datasets.hydrogen_etrago import ( HydrogenBusEtrago, @@ -346,8 +346,8 @@ ] ) - # Minimum heat pump capacity for pypsa-eur-sec - heat_pumps_pypsa_eur_sec = HeatPumpsPypsaEurSec( + # Minimum heat pump capacity for pypsa-eur + heat_pumps_pypsa_eur = HeatPumpsPypsaEur( dependencies=[ cts_demand_buildings, DistrictHeatingAreas, @@ -375,7 +375,7 @@ dependencies=[prepare_pypsa_eur, tyndp_data, osmtgmod, fix_subnetworks] ) - # run pypsa-eur-sec + # run pypsa-eur run_pypsaeur = RunPypsaEur( dependencies=[ prepare_pypsa_eur, @@ -593,7 +593,7 @@ DistrictHeatingAreas, heat_supply, heat_time_series, - heat_pumps_pypsa_eur_sec, + heat_pumps_pypsa_eur, power_plants, ] ) @@ -613,7 +613,7 @@ heat_pumps_2050 = HeatPumps2050( dependencies=[ run_pypsaeur, - heat_pumps_pypsa_eur_sec, + heat_pumps_pypsa_eur, heat_supply, ] ) diff --git a/src/egon/data/datasets/heat_supply/individual_heating.py b/src/egon/data/datasets/heat_supply/individual_heating.py index bf86d087e..141537454 100644 --- a/src/egon/data/datasets/heat_supply/individual_heating.py +++ b/src/egon/data/datasets/heat_supply/individual_heating.py @@ -244,9 +244,9 @@ class EgonHpCapacityBuildings(Base): hp_capacity = Column(REAL) -class HeatPumpsPypsaEurSec(Dataset): +class HeatPumpsPypsaEur(Dataset): def __init__(self, dependencies): - def dyn_parallel_tasks_pypsa_eur_sec(): + def dyn_parallel_tasks_pypsa_eur(): """Dynamically generate tasks The goal is to speed up tasks by parallelising bulks of mvgds. @@ -258,7 +258,7 @@ def dyn_parallel_tasks_pypsa_eur_sec(): set of airflow.PythonOperators The tasks. Each element is of :func:`egon.data.datasets.heat_supply.individual_heating. - determine_hp_cap_peak_load_mvgd_ts_pypsa_eur_sec` + determine_hp_cap_peak_load_mvgd_ts_pypsa_eur` """ parallel_tasks = config.datasets()["demand_timeseries_mvgd"].get( "parallel_tasks", 1 @@ -270,14 +270,14 @@ def dyn_parallel_tasks_pypsa_eur_sec(): PythonOperator( task_id=( f"individual_heating." - f"determine-hp-capacity-pypsa-eur-sec-" + f"determine-hp-capacity-pypsa-eur-" f"mvgd-bulk{i}" ), python_callable=split_mvgds_into_bulks, op_kwargs={ "n": i, "max_n": parallel_tasks, - "func": determine_hp_cap_peak_load_mvgd_ts_pypsa_eur_sec, # noqa: E501 + "func": determine_hp_cap_peak_load_mvgd_ts_pypsa_eur, # noqa: E501 }, ) ) @@ -290,7 +290,7 @@ def dyn_parallel_tasks_pypsa_eur_sec(): delete_pypsa_eur_sec_csv_file, delete_mvgd_ts_100RE, delete_heat_peak_loads_100RE, - {*dyn_parallel_tasks_pypsa_eur_sec()}, + {*dyn_parallel_tasks_pypsa_eur()}, ) else: tasks_HeatPumpsPypsaEur = ( @@ -2080,7 +2080,7 @@ def determine_hp_cap_peak_load_mvgd_ts_2019(mvgd_ids): ) -def determine_hp_cap_peak_load_mvgd_ts_pypsa_eur_sec(mvgd_ids): +def determine_hp_cap_peak_load_mvgd_ts_pypsa_eur(mvgd_ids): """ Main function to determine minimum required HP capacity in MV for pypsa-eur-sec. Further, creates heat demand time series for all buildings