Skip to content

Commit

Permalink
Exlude create_voronoi function from mv_grid_district dataset
Browse files Browse the repository at this point in the history
The function is excluded from the dataset and implemented as a seperate
python-operator. This is only a temporary solution to prevent conflicts
while the substation module is not moved to datasets yet. The function
osmtgmod_substation is assumed to be a dependency.
  • Loading branch information
nailend committed Jul 21, 2021
1 parent be4c69a commit eb43027
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
10 changes: 9 additions & 1 deletion src/egon/data/airflow/dags/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@
autocommit=True,
)


osm_add_metadata >> substation_tables >> substation_functions
substation_functions >> hvmv_substation_extraction
substation_functions >> ehv_substation_extraction
Expand Down Expand Up @@ -341,8 +342,15 @@
etrago_input_data >> osmtgmod_pypsa
run_osmtgmod >> osmtgmod_substation

# create Voronoi for MV grid districts
create_voronoi_substation = PythonOperator(
task_id="create-voronoi-substations",
python_callable=substation.create_voronoi,
)
osmtgmod_substation >> create_voronoi_substation

# MV grid districts
mv_grid_districts = mv_grid_districts_setup(dependencies=[osmtgmod_substation])
mv_grid_districts = mv_grid_districts_setup(dependencies=[create_voronoi_substation])
mv_grid_districts.insert_into(pipeline)
define_mv_grid_districts = tasks["mv_grid_districts.define-mv-grid-districts"]

Expand Down
3 changes: 1 addition & 2 deletions src/egon/data/datasets/mv_grid_districts.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
from egon.data.processing.substation import (
EgonHvmvSubstation,
EgonHvmvSubstationVoronoi,
create_voronoi,
)

Base = declarative_base()
Expand Down Expand Up @@ -775,5 +774,5 @@ def define_mv_grid_districts():
name="MvGridDistricts",
version="0.0.0",
dependencies=[],
tasks=(create_voronoi, define_mv_grid_districts),
tasks=(define_mv_grid_districts),
)

0 comments on commit eb43027

Please sign in to comment.