Skip to content

Commit 3a0fbdc

Browse files
author
IlkaCu
authored
Merge pull request #321 from openego/release/v0.4.5
Release/v0.4.5
2 parents d0c2da7 + d552ca8 commit 3a0fbdc

64 files changed

Lines changed: 4525 additions & 889 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

dataprocessing/eGo_data_processing.py

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -41,60 +41,60 @@ 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
83-
'rea/ego_dp_rea_setup.sql', # Setup tables for REA
84-
'rea/ego_dp_rea_m1.sql', # M1 biomass and solar to OSM agricultural
85-
'rea/ego_dp_rea_m2.sql', # M2 wind farms
86-
'rea/ego_dp_rea_m3.sql', # M3 wind turbines to WPA
87-
'rea/ego_dp_rea_m4.sql', # M4 other and rest
88-
'rea/ego_dp_rea_m5.sql', # M5 LV to Loadarea
89-
'rea/ego_dp_rea_results.sql', # Results and statistics
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
83+
# 'rea/ego_dp_rea_setup.sql', # Setup tables for REA
84+
# 'rea/ego_dp_rea_m1.sql', # M1 biomass and solar to OSM agricultural
85+
# 'rea/ego_dp_rea_m2.sql', # M2 wind farms
86+
# 'rea/ego_dp_rea_m3.sql', # M3 wind turbines to WPA
87+
# 'rea/ego_dp_rea_m4.sql', # M4 other and rest
88+
# 'rea/ego_dp_rea_m5.sql', # M5 LV to Loadarea
89+
# 'rea/ego_dp_rea_results.sql', # Results and statistics
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
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
9898
'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists
9999
'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv)
100100
'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario
@@ -105,12 +105,13 @@ def data_processing():
105105
'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict
106106
'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100)
107107
'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages
108+
'ego_dp_data_check.sql', # Check powerflow data for plausibility
108109
## POST-PROCESSING
109110
'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data
110111

111112
## VERSIONING
112113
'ego_dp_versioning.sql', # Versioning
113-
'ego_dp_versioning_mviews.sql' , # Versioning of mviews
114+
# 'ego_dp_versioning_mviews.sql' , # Versioning of mviews
114115

115116

116117

dataprocessing/python_scripts/ego_dp_loadarea_peakload.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def add_sectoral_peak_load(load_areas, **kwargs):
128128
columns=columns)
129129

130130
write_ego_scenario_log(conn=conn,
131-
version='v0.4.0',
131+
version='v0.4.5',
132132
io='input',
133133
schema='model_draft',
134134
table=table,
@@ -276,7 +276,7 @@ def add_sectoral_peak_load(load_areas, **kwargs):
276276
metadata.submit_comment(conn, json_str, schema, target_table)
277277

278278
write_ego_scenario_log(conn=conn,
279-
version='v0.4.0',
279+
version='v0.4.5',
280280
io='output',
281281
schema='model_draft',
282282
table=target_table,

dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def demand_per_mv_grid_district():
6565
annual_demand_df = annual_demand_df.loc[~pd.isnull(annual_demand_df.index)]
6666

6767
write_scenario_log(conn=conn,
68-
version='v0.4.2',
68+
version='v0.4.5',
6969
project='eGoDP',
7070
io='input',
7171
schema='model_draft',
@@ -80,7 +80,7 @@ def demand_per_mv_grid_district():
8080
index_col='polygon_id')
8181

8282
write_scenario_log(conn=conn,
83-
version='v0.4.2',
83+
version='v0.4.5',
8484
project='eGoDP',
8585
io='input',
8686
schema='model_draft',
@@ -188,7 +188,7 @@ def demand_per_mv_grid_district():
188188
metadata.submit_comment(conn, json_str, schema, target_table)
189189

190190
write_scenario_log(conn=conn,
191-
version='v0.4.2',
191+
version='v0.4.5',
192192
project='eGoDP',
193193
io='output',
194194
schema=schema,

dataprocessing/python_scripts/setup_ego_mv_powerflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def create_powerflow_schema(engine, schema, tables):
6868
tools.grant_db_access(conn, schema, table, group)
6969

7070
write_ego_scenario_log(conn=conn,
71-
version='v0.4.2',
71+
version='v0.4.5',
7272
io='output',
7373
schema=schema,
7474
table=table,

0 commit comments

Comments
 (0)