From c1c6dcad603fad02224ce9ae2361eb804eb46f5c Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Wed, 23 Oct 2024 15:04:24 +0200 Subject: [PATCH 1/3] add osmtgmod as a dependency for electrical_neighbours --- src/egon/data/airflow/dags/pipeline_status_quo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/egon/data/airflow/dags/pipeline_status_quo.py b/src/egon/data/airflow/dags/pipeline_status_quo.py index a93dd57dd..a76083648 100755 --- a/src/egon/data/airflow/dags/pipeline_status_quo.py +++ b/src/egon/data/airflow/dags/pipeline_status_quo.py @@ -335,7 +335,7 @@ # Deal with electrical neighbours foreign_lines = ElectricalNeighbours( - dependencies=[prepare_pypsa_eur, tyndp_data] + dependencies=[prepare_pypsa_eur, tyndp_data, osmtgmod, fix_subnetworks] ) # Import NEP (Netzentwicklungsplan) data From 86011056f0b3cfd1f9ee8d8f41cee212c500d123 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Wed, 23 Oct 2024 15:04:58 +0200 Subject: [PATCH 2/3] cast number of cables to int --- src/egon/data/datasets/electrical_neighbours.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/egon/data/datasets/electrical_neighbours.py b/src/egon/data/datasets/electrical_neighbours.py index 752dc959e..5a6032572 100644 --- a/src/egon/data/datasets/electrical_neighbours.py +++ b/src/egon/data/datasets/electrical_neighbours.py @@ -538,6 +538,7 @@ def cross_border_lines(scenario, sources, targets, central_buses): new_lines = new_lines[new_lines.bus0 != new_lines.bus1] + new_lines["cables"] = new_lines["cables"].apply(int) # Insert lines to the database new_lines.to_postgis( From c7e08191c85916f816efd9bd91c65974c44673d8 Mon Sep 17 00:00:00 2001 From: CarlosEpia Date: Fri, 8 Nov 2024 09:52:57 +0100 Subject: [PATCH 3/3] use old_bnetza_mastr --- src/egon/data/datasets/storages/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/egon/data/datasets/storages/__init__.py b/src/egon/data/datasets/storages/__init__.py index 9f2445272..a3aed51dc 100755 --- a/src/egon/data/datasets/storages/__init__.py +++ b/src/egon/data/datasets/storages/__init__.py @@ -309,7 +309,7 @@ def allocate_storage_units_sq(scn_name, storage_types): for storage_type in storage_types: # Read-in data from MaStR mastr_ph = pd.read_csv( - WORKING_DIR_MASTR_NEW / sources["mastr_storage"], + WORKING_DIR_MASTR_OLD / sources["mastr_storage"], delimiter=",", usecols=[ "Nettonennleistung",