Skip to content

Commit 3a7930c

Browse files
ulfmuellerulfmueller
committed
clean up
1 parent 923c90a commit 3a7930c

1 file changed

Lines changed: 47 additions & 48 deletions

File tree

‎dataprocessing/eGo_data_processing.py‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -41,45 +41,45 @@ def data_processing():
4141

4242
snippets = [
4343
## INPUT DATA CHECK (eGoPP)
44-
# 'ego_dp_structure_input_verification.sql', # Input verification (eGoPP)
44+
'ego_dp_structure_input_verification.sql', # Input verification (eGoPP)
4545

4646
## SUBSTATION
47-
# 'ego_dp_substation_hvmv.sql', # Abstract HVMV Substations of the high voltage level from OSM
48-
# 'ego_dp_substation_ehv.sql', # Abstract EHV Substations of the extra high voltage level from OSM
49-
# 'ego_dp_substation_otg.sql', # Assign osmTGmod-id to HVMV and EHV substations
50-
# 'ego_dp_substation_hvmv_voronoi.sql', # HVMV Voronoi cells based on HVMV substations
51-
# 'ego_dp_substation_ehv_voronoi.sql', # EHV Voronoi cells based on EHV substations
47+
'ego_dp_substation_hvmv.sql', # Abstract HVMV Substations of the high voltage level from OSM
48+
'ego_dp_substation_ehv.sql', # Abstract EHV Substations of the extra high voltage level from OSM
49+
'ego_dp_substation_otg.sql', # Assign osmTGmod-id to HVMV and EHV substations
50+
'ego_dp_substation_hvmv_voronoi.sql', # HVMV Voronoi cells based on HVMV substations
51+
'ego_dp_substation_ehv_voronoi.sql', # EHV Voronoi cells based on EHV substations
5252

5353
## GRIDDISTRICT
54-
# 'ego_dp_mv_griddistrict.sql', # MV GridDistricts from municipalities and Voronoi cells
55-
# 'ego_dp_substation_id_to_generator.sql', # Assign Substation ID (subst_id) to Generator (Conventional and Renewable)
54+
'ego_dp_mv_griddistrict.sql', # MV GridDistricts from municipalities and Voronoi cells
55+
'ego_dp_substation_id_to_generator.sql', # Assign Substation ID (subst_id) to Generator (Conventional and Renewable)
5656

5757
## LOADAREA
58-
# 'ego_dp_loadarea_landuse.sql', # OSM landuse sectors
59-
# 'ego_dp_loadarea_industry_consumer.sql', # OSM Industry consumer
60-
# 'ego_dp_loadarea_loads.sql', # OSM Loads from landuse
61-
# 'ego_dp_loadarea_census.sql', # Loads from Census 2011
62-
# 'ego_dp_loadarea_loadmelt.sql', # Melt loads from OSM landuse and Census 2011
63-
# 'ego_dp_loadarea_loadcut_griddistrict.sql', # Cut Loadarea with MV Griddistrict
64-
# 'ego_dp_loadarea_loadcut_voronoi.sql', # Cut Loadarea with MV Voronoi cells
65-
# 'ego_dp_loadarea_consumption.sql', # Allocate consumption to Loadareas
66-
# 'ego_dp_loadarea_peakload.sql', # Peak loads per Loadarea
67-
# 'ego_dp_loadarea_griddistrict_results.sql', # Results for MV Griddistrict
68-
# 'ego_dp_loadarea_statistic.sql', # Results and statistics for eGoDP data
58+
'ego_dp_loadarea_landuse.sql', # OSM landuse sectors
59+
'ego_dp_loadarea_industry_consumer.sql', # OSM Industry consumer
60+
'ego_dp_loadarea_loads.sql', # OSM Loads from landuse
61+
'ego_dp_loadarea_census.sql', # Loads from Census 2011
62+
'ego_dp_loadarea_loadmelt.sql', # Melt loads from OSM landuse and Census 2011
63+
'ego_dp_loadarea_loadcut_griddistrict.sql', # Cut Loadarea with MV Griddistrict
64+
'ego_dp_loadarea_loadcut_voronoi.sql', # Cut Loadarea with MV Voronoi cells
65+
'ego_dp_loadarea_consumption.sql', # Allocate consumption to Loadareas
66+
'ego_dp_loadarea_peakload.sql', # Peak loads per Loadarea
67+
'ego_dp_loadarea_griddistrict_results.sql', # Results for MV Griddistrict
68+
'ego_dp_loadarea_statistic.sql', # Results and statistics for eGoDP data
6969

7070
## LOWVOLTAGE
71-
# 'ego_dp_lv_substation.sql', # MVLV Substation (ONT)
72-
# 'ego_dp_lv_substation_voronoi.sql', # MVLV Substation Voronoi
73-
# 'ego_dp_lv_loadcut.sql', # LV Loadcut
74-
# 'ego_dp_lv_griddistrict.sql', # LV Griddistrict
75-
# 'ego_dp_lv_consumption_peakload.sql', # LV Consumption and Peakload
71+
'ego_dp_lv_substation.sql', # MVLV Substation (ONT)
72+
'ego_dp_lv_substation_voronoi.sql', # MVLV Substation Voronoi
73+
'ego_dp_lv_loadcut.sql', # LV Loadcut
74+
'ego_dp_lv_griddistrict.sql', # LV Griddistrict
75+
'ego_dp_lv_consumption_peakload.sql', # LV Consumption and Peakload
7676

7777
## REA
78-
# 'rea/ego_dp_lattice_500m.sql', # Lattice (point grid) 500m
79-
# 'rea/ego_dp_lattice_50m.sql', # Lattice (point grid) 50m
80-
# 'rea/ego_dp_rea_wpa_per_mvgd.sql', # Wind potential area (WPA)
81-
# 'rea/ego_dp_rea_lattice_per_area_500m.sql', # Prepare 500m lattice
82-
# 'rea/ego_dp_rea_lattice_per_area_50m.sql', # Prepare 50m lattice
78+
'rea/ego_dp_lattice_500m.sql', # Lattice (point grid) 500m
79+
'rea/ego_dp_lattice_50m.sql', # Lattice (point grid) 50m
80+
'rea/ego_dp_rea_wpa_per_mvgd.sql', # Wind potential area (WPA)
81+
'rea/ego_dp_rea_lattice_per_area_500m.sql', # Prepare 500m lattice
82+
'rea/ego_dp_rea_lattice_per_area_50m.sql', # Prepare 50m lattice
8383
'rea/ego_dp_rea_setup.sql', # Setup tables for REA
8484
'rea/ego_dp_rea_m1.sql', # M1 biomass and solar to OSM agricultural
8585
'rea/ego_dp_rea_m2.sql', # M2 wind farms
@@ -90,28 +90,27 @@ def data_processing():
9090

9191
## POWERFLOW
9292

93-
# 'ego_dp_powerflow_hv_setup.sql', # Set schema/tables for EHV/HV powerflow calculations up
94-
# 'ego_dp_powerflow_osmtgmod_to_pypsa.sql', # Include data from osmTGmod into EHV/HV powerflow schema
95-
# 'ego_dp_powerflow_electrical_neighbour.sql', # Create border crossing lines and buses in neighbouring countries
96-
# 'ego_dp_powerflow_fix_ehv_subnetworks.sql', # Fix topological errors in eHV grid
97-
# 'ego_dp_powerflow_grid_future_scenarios.sql', # Copy grid to future scenarios
98-
# 'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists
99-
# 'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv)
100-
# 'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario
101-
# 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation (SQ, NEP2035, eGo100)
102-
# 'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation (SQ, NEP2035, eGo100)
103-
# 'ego_dp_powerflow_assignment_storage.sql', # Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100)
104-
# 'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table
105-
# 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict
106-
# 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100)
107-
# 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages
108-
93+
'ego_dp_powerflow_hv_setup.sql', # Set schema/tables for EHV/HV powerflow calculations up
94+
'ego_dp_powerflow_osmtgmod_to_pypsa.sql', # Include data from osmTGmod into EHV/HV powerflow schema
95+
'ego_dp_powerflow_electrical_neighbour.sql', # Create border crossing lines and buses in neighbouring countries
96+
'ego_dp_powerflow_fix_ehv_subnetworks.sql', # Fix topological errors in eHV grid
97+
'ego_dp_powerflow_grid_future_scenarios.sql', # Copy grid to future scenarios
98+
'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists
99+
'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv)
100+
'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario
101+
'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation (SQ, NEP2035, eGo100)
102+
'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation (SQ, NEP2035, eGo100)
103+
'ego_dp_powerflow_assignment_storage.sql', # Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100)
104+
'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table
105+
'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict
106+
'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100)
107+
'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages
109108
## POST-PROCESSING
110-
# 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data
109+
'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data
111110

112111
## VERSIONING
113-
# 'ego_dp_versioning.sql', # Versioning
114-
# 'ego_dp_versioning_mviews.sql' , # Versioning of mviews
112+
'ego_dp_versioning.sql', # Versioning
113+
'ego_dp_versioning_mviews.sql' , # Versioning of mviews
115114

116115

117116

0 commit comments

Comments
 (0)