Skip to content

Commit 63038d2

Browse files
author
ulf
committed
change v0.2.1010 to v0.2.10
1 parent bd42533 commit 63038d2

7 files changed

Lines changed: 61 additions & 61 deletions

File tree

dataprocessing/eGo_data_processing.py

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -50,72 +50,72 @@ def data_processing():
5050
# 'ego_dp_preprocessing_res_powerplant.sql', # Setup renewable power plant list
5151

5252
## SUBSTATION
53-
# 'ego_dp_substation_hvmv.sql', # Abstract HVMV Substations of the high voltage level from OSM
54-
# 'ego_dp_substation_ehv.sql', # Abstract EHV Substations of the extra high voltage level from OSM
55-
# 'ego_dp_substation_otg.sql', # Assign osmTGmod-id to HVMV and EHV substations
56-
# 'ego_dp_substation_hvmv_voronoi.sql', # HVMV Voronoi cells based on HVMV substations
57-
# 'ego_dp_substation_ehv_voronoi.sql', # EHV Voronoi cells based on EHV substations
53+
# 'ego_dp_substation_hvmv.sql', # Abstract HVMV Substations of the high voltage level from OSM
54+
# 'ego_dp_substation_ehv.sql', # Abstract EHV Substations of the extra high voltage level from OSM
55+
# 'ego_dp_substation_otg.sql', # Assign osmTGmod-id to HVMV and EHV substations
56+
# 'ego_dp_substation_hvmv_voronoi.sql', # HVMV Voronoi cells based on HVMV substations
57+
# 'ego_dp_substation_ehv_voronoi.sql', # EHV Voronoi cells based on EHV substations
5858

5959
## GRIDDISTRICT
60-
# 'ego_dp_mv_griddistrict.sql', # MV Griddistricts from municipalities and Voronoi cells
60+
# 'ego_dp_mv_griddistrict.sql', # MV Griddistricts from municipalities and Voronoi cells
6161

6262
## LOADAREA
63-
# 'ego_dp_loadarea_landuse.sql', # OSM landuse sector
64-
# 'ego_dp_loadarea_industry_consumer.sql', # Industry consumer
65-
# 'ego_dp_loadarea_loads.sql', # Loads from OSM landuse
66-
# 'ego_dp_loadarea_census.sql', # Loads from Census
67-
# 'ego_dp_loadarea_loadmelt.sql', # Melt OSM landuse and Zensus loads
68-
# 'ego_dp_loadarea_loadcut_griddistrict.sql', # Cut Loadarea with MV Griddistrict
69-
# 'ego_dp_loadarea_loadcut_voronoi.sql', # Cut Loadarea with MV Voronoi cells
70-
# 'ego_dp_loadarea_consumption.sql', # Allocate consumption to Loadareas
71-
# 'ego_dp_loadarea_peakload.py', # Peak loads per Loadarea (duration 10h!)
72-
# 'ego_dp_loadarea_peakload.sql', # Peak loads per Loadarea (SQL update)
73-
# 'ego_dp_loadarea_griddistrict_results.sql', # Results for MV Griddistrict
74-
# 'ego_dp_loadarea_statistic.sql', # Results and statistics for eGoDP
63+
# 'ego_dp_loadarea_landuse.sql', # OSM landuse sector
64+
# 'ego_dp_loadarea_industry_consumer.sql', # Industry consumer
65+
# 'ego_dp_loadarea_loads.sql', # Loads from OSM landuse
66+
# 'ego_dp_loadarea_census.sql', # Loads from Census
67+
# 'ego_dp_loadarea_loadmelt.sql', # Melt OSM landuse and Zensus loads
68+
# 'ego_dp_loadarea_loadcut_griddistrict.sql', # Cut Loadarea with MV Griddistrict
69+
# 'ego_dp_loadarea_loadcut_voronoi.sql', # Cut Loadarea with MV Voronoi cells
70+
# 'ego_dp_loadarea_consumption.sql', # Allocate consumption to Loadareas
71+
# 'ego_dp_loadarea_peakload.py', # Peak loads per Loadarea (duration 10h!)
72+
# 'ego_dp_loadarea_peakload.sql', # Peak loads per Loadarea (SQL update)
73+
# 'ego_dp_loadarea_griddistrict_results.sql', # Results for MV Griddistrict
74+
# 'ego_dp_loadarea_statistic.sql', # Results and statistics for eGoDP
7575

7676
## LOWVOLTAGE
77-
# 'ego_dp_lv_substation.sql', # MVLV Substation inside Loadarea
78-
# 'ego_dp_lv_substation_voronoi.sql', # MVLV Substation Voronoi
79-
# 'ego_dp_lv_griddistrict.sql', # LV Griddistrict
80-
# 'ego_dp_lv_peakload.sql', # LV OSM areas
81-
# 'ego_dp_lv_consumption_peakload.sql', # LV Consumption and Peakload
82-
83-
## REA
84-
# 'rea/ego_dp_lattice_500m.sql', # lattice (point grid) 500m
85-
# 'rea/ego_dp_lattice_50m.sql', # lattice (point grid) 50m
86-
# 'rea/ego_dp_rea_wpa_per_mvgd.sql', # wind potential area
87-
88-
# 'rea/ego_dp_rea_lattice_per_area_500m.sql', # prepare 500m lattice
89-
# 'rea/ego_dp_rea_lattice_per_area_50m.sql', # prepare 50m lattice
90-
91-
# 'rea/ego_dp_rea_setup.sql', # setup table for allocation
92-
# 'rea/ego_dp_rea_m1.sql', # M1 biomass and solar to farmyard
93-
# 'rea/ego_dp_rea_m2.sql', # M2 windfarms
77+
# 'ego_dp_lv_substation.sql', # MVLV Substation inside Loadarea
78+
# 'ego_dp_lv_substation_voronoi.sql', # MVLV Substation Voronoi
79+
# 'ego_dp_lv_griddistrict.sql', # LV Griddistrict
80+
# 'ego_dp_lv_peakload.sql', # LV OSM areas
81+
# 'ego_dp_lv_consumption_peakload.sql', # LV Consumption and Peakload
82+
#
83+
# ## REA
84+
# 'rea/ego_dp_lattice_500m.sql', # lattice (point grid) 500m
85+
# 'rea/ego_dp_lattice_50m.sql', # lattice (point grid) 50m
86+
# 'rea/ego_dp_rea_wpa_per_mvgd.sql', # wind potential area
87+
#
88+
## 'rea/ego_dp_rea_lattice_per_area_500m.sql', # prepare 500m lattice
89+
# 'rea/ego_dp_rea_lattice_per_area_50m.sql', # prepare 50m lattice
90+
#
91+
# 'rea/ego_dp_rea_setup.sql', # setup table for allocation
92+
# 'rea/ego_dp_rea_m1.sql', # M1 biomass and solar to farmyard
93+
# 'rea/ego_dp_rea_m2.sql', # M2 windfarms
9494
# 'rea/ego_dp_rea_m3.sql', # M3 wind turbines to wpa
95-
# 'rea/ego_dp_rea_m4.sql', # M4 other and rest
96-
# 'rea/ego_dp_rea_m5.sql', # M5 LV to LA
97-
# 'rea/ego_dp_rea_results.sql', # results and statistics
95+
#'rea/ego_dp_rea_m4.sql', # M4 other and rest
96+
# 'rea/ego_dp_rea_m5.sql', # M5 LV to LA
97+
# 'r#ea/ego_dp_rea_results.sql', # results and statistics
9898

9999
## POWERFLOW
100100
# 'ego_dp_powerflow_voronoi_weatherpoint.sql', # Create voronoi cells based on weather points
101101
# 'ego_dp_powerflow_hv_setup.sql', # Set schema/tables for EHV/HV powerflow calculations up
102102
# 'ego_dp_powerflow_osmtgmod_to_pypsa.sql', # Include data from osmTGmod into EHV/HV powerflow schema
103103
# 'ego_dp_powerflow_electrical_neighbour.sql', # Create border crossing lines and buses in neighbouring countries
104-
#
105-
# 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation
104+
##
105+
# 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation
106106
# 'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation
107107
# 'ego_dp_powerflow_grid_NEP2035.sql', # Copy grid to scenario NEP 2035
108108
# 'ego_dp_powerflow_assignment_generator_nep2035.sql', # Assign generators from NEP 2035 to corresponding substation
109109
# 'ego_dp_powerflow_assignment_load_nep2035.sql', # Copy loads from SQ scenario
110110
# 'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table
111-
'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict
112-
'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table
113-
'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages
114-
'ego_dp_powerflow_load_timeseries_NEP2035.sql', # Copy demand timeseries to NEP 2035 scenario
115-
116-
111+
# 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict
112+
# 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table
113+
# 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages
114+
# 'ego_dp_powerflow_load_timeseries_NEP2035.sql', # Copy demand timeseries to NEP 2035 scenario
115+
#
116+
#
117117
## VERSIONING
118-
# 'ego_dp_versioning.sql' # Versioning
118+
'ego_dp_versioning.sql' # Versioning
119119

120120
]
121121

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.2.1010',
131+
version='v0.2.10',
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.2.1010',
279+
version='v0.2.10',
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_ego_scenario_log(conn=conn,
68-
version='v0.2.1010',
68+
version='v0.2.10',
6969
io='input',
7070
schema='model_draft',
7171
table=orm_loads.__tablename__,
@@ -79,7 +79,7 @@ def demand_per_mv_grid_district():
7979
index_col='polygon_id')
8080

8181
write_ego_scenario_log(conn=conn,
82-
version='v0.2.1010',
82+
version='v0.2.10',
8383
io='input',
8484
schema='model_draft',
8585
table='ego_demand_hv_largescaleconsumer',
@@ -186,7 +186,7 @@ def demand_per_mv_grid_district():
186186
metadata.submit_comment(conn, json_str, schema, target_table)
187187

188188
write_ego_scenario_log(conn=conn,
189-
version='v0.2.1010',
189+
version='v0.2.10',
190190
io='output',
191191
schema=schema,
192192
table=target_table,

dataprocessing/python_scripts/functions/ego_scenario_log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def write_ego_scenario_log(conn, version, io, schema, table,
4141
Example
4242
-------
4343
write_ego_scenario_log(conn=conn,
44-
version='v0.2.1010',
44+
version='v0.2.10',
4545
io='output',
4646
schema='model_draft',
4747
table='ego_demand_loadarea_peak_load',

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.2.1010',
71+
version='v0.2.10',
7272
io='output',
7373
schema=schema,
7474
table=table,

dataprocessing/sql_snippets/ego_dp_loadarea_statistic.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ WHERE t1.subst_id = t2.subst_id;
255255
UPDATE model_draft.ego_grid_mv_griddistrict
256256
SET "group" = (SELECT
257257
CASE
258-
WHEN type1 = '1' AND type2 = '0' AND type3 = '1' THEN 'A' -- ländlich
258+
WHEN type1 = '1' AND type2 = '0' AND type3 = '1' THEN 'A' -- ländlich
259259
WHEN type1 = '0' AND type2 = '1' AND type3 = '1' THEN 'B'
260260
WHEN type1 = '1' AND type2 = '0' AND type3 = '0' THEN 'C'
261-
WHEN type1 = '0' AND type2 = '1' AND type3 = '0' THEN 'D' -- städtisch
261+
WHEN type1 = '0' AND type2 = '1' AND type3 = '0' THEN 'D' -- städtisch
262262
END);
263263

264264

@@ -487,7 +487,7 @@ SELECT '> 500 ha' AS name,
487487
WHERE area_ha > '500'; */
488488

489489
/*
490-
-- Schnittlängen (Umrisse)
490+
-- Schnittlängen (Umrisse)
491491
SELECT 'Raw LA' AS name,
492492
count(la.geom) AS number,
493493
ST_Perimeter(ST_Collect(la.geom))/1000000 AS perimeter_in_tkm

dataprocessing/sql_snippets/ego_dp_structure_scenariolog.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ COMMENT ON TABLE model_draft.ego_scenario IS '{
4747
"reference_date": " ",
4848
"sources": [
4949
{"name": "eGo dataprocessing", "description": " ",
50-
"url": "https://github.com/openego/data_processing", "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", "copyright": "© Reiner Lemoine Institut"} ],
50+
"url": "https://github.com/openego/data_processing", "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", "copyright": "© Reiner Lemoine Institut"} ],
5151
"spatial": [
5252
{"extend": "",
5353
"resolution": ""} ],
@@ -57,7 +57,7 @@ COMMENT ON TABLE model_draft.ego_scenario IS '{
5757
"version": "1.0",
5858
"url": "https://opendatacommons.org/licenses/odbl/1.0/",
5959
"instruction": "You are free: To Share, To Create, To Adapt; As long as you: Attribute, Share-Alike, Keep open!",
60-
"copyright": "© Reiner Lemoine Institut"} ],
60+
"copyright": "© Reiner Lemoine Institut"} ],
6161
"contributors": [
6262
{"name": "Ludee", "email": "", "date": "01.10.2016", "comment": "Create table" },
6363
{"name": "Ludee", "email": "", "date": "16.11.2016", "comment": "Add metadata" },
@@ -119,7 +119,7 @@ COMMENT ON TABLE model_draft.ego_scenario_log IS '{
119119
"language": [ "eng", "ger" ],
120120
"reference_date": " ",
121121
"sources": [
122-
{"name": "eGo dataprocessing", "description": " ", "url": "https://github.com/openego/data_processing", "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", "copyright": "© Reiner Lemoine Institut"} ],
122+
{"name": "eGo dataprocessing", "description": " ", "url": "https://github.com/openego/data_processing", "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", "copyright": "© Reiner Lemoine Institut"} ],
123123
"spatial": [
124124
{"extend": "",
125125
"resolution": ""} ],
@@ -129,7 +129,7 @@ COMMENT ON TABLE model_draft.ego_scenario_log IS '{
129129
"version": "1.0",
130130
"url": "https://opendatacommons.org/licenses/odbl/1.0/",
131131
"instruction": "You are free: To Share, To Create, To Adapt; As long as you: Attribute, Share-Alike, Keep open!",
132-
"copyright": "© Reiner Lemoine Institut"} ],
132+
"copyright": "© Reiner Lemoine Institut"} ],
133133
"contributors": [
134134
{"name": "Ludee", "email": "", "date": "01.10.2016", "comment": "Create table" },
135135
{"name": "Ludee", "email": "", "date": "12.10.2016", "comment": "Add user_name" },

0 commit comments

Comments
 (0)