Skip to content

Commit 49d1f53

Browse files
committed
debugging for v0.4.4
1 parent cb4f69c commit 49d1f53

6 files changed

Lines changed: 31 additions & 29 deletions

dataprocessing/eGo_data_processing.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,23 +95,23 @@ def data_processing():
9595
# 'ego_dp_powerflow_electrical_neighbour.sql', # Create border crossing lines and buses in neighbouring countries
9696
# 'ego_dp_powerflow_fix_ehv_subnetworks.sql', # Fix topological errors in eHV grid
9797
# '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-
'ego_dp_data_check.sql', # Check powerflow data for plausibility
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+
# 'ego_dp_data_check.sql', # Check powerflow data for plausibility
109109
## POST-PROCESSING
110-
'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data
110+
# 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data
111111

112112
## VERSIONING
113113
# 'ego_dp_versioning.sql', # Versioning
114-
# 'ego_dp_versioning_mviews.sql' , # Versioning of mviews
114+
'ego_dp_versioning_mviews.sql' , # Versioning of mviews
115115

116116

117117

dataprocessing/sql_snippets/ego_dp_data_check.sql

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl
156156
SELECT
157157
'v0.4.4',
158158
'Status Quo',
159-
'transformers with NULL values for buses'
160-
'model_draft.ego_grid_pf_hv_transformer',,
159+
'transformers with NULL values for buses',
160+
'model_draft.ego_grid_pf_hv_transformer',
161161
count(*) FROM model_draft.ego_grid_pf_hv_transformer
162162
WHERE scn_name = 'Status Quo' AND
163163
(bus0 IS NULL OR
@@ -272,7 +272,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl
272272
'model_draft.ego_supply_pf_generator_single',
273273
count(*) FROM model_draft.ego_supply_pf_generator_single
274274
WHERE scn_name = 'Status Quo' AND
275-
otg_id IS NULL;
275+
bus IS NULL;
276276

277277

278278
INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count)
@@ -283,7 +283,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl
283283
'model_draft.ego_supply_pf_generator_single',
284284
count(*) FROM model_draft.ego_supply_pf_generator_single
285285
WHERE scn_name = 'NEP 2035' AND
286-
otg_id IS NULL;
286+
bus IS NULL;
287287

288288
INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count)
289289
SELECT
@@ -293,7 +293,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl
293293
'model_draft.ego_supply_pf_generator_single',
294294
count(*) FROM model_draft.ego_supply_pf_generator_single
295295
WHERE scn_name = 'eGo 100' AND
296-
otg_id IS NULL;
296+
bus IS NULL;
297297

298298
-- Do all generators which are not 'reservoir', 'geothermal' or 'other_non_renewable' have defined timeseries in all three scenarios?
299299

@@ -629,7 +629,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl
629629
'all',
630630
'generators without rea_geom_new',
631631
'model_draft.ego_dp_supply_res_powerplant',
632-
count(*) FROM model_draft_ego_dp_supply_res_powerplant
632+
count(*) FROM model_draft.ego_dp_supply_res_powerplant
633633
WHERE rea_geom_new IS NULL;
634634

635635

dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
Generators which were assigned to a specific substation prior to this script need to be transformed to a data structure
33
suitable for powerflow calculation with tool developed and used in the open_eGo project. The following script transforms
44
data from the powerplant mviews and adds some parameters according to the characteristics of the generators.
@@ -413,6 +413,8 @@ UPDATE model_draft.ego_grid_pf_hv_generator
413413
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
414414
SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_assignment_generator.sql',' ');
415415

416+
DROP TABLE IF EXISTS model_draft.ego_supply_aggr_weather CASCADE;
417+
416418
CREATE TABLE model_draft.ego_supply_aggr_weather
417419
AS
418420
(WITH w_sub AS (

dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
Missing parameters necessary for calculating a linear optimal power flow (LOPF) are added to the existing data. This
33
includes marginal costs per technology, which is composed of specific operating cost, fuel costs and CO2 costs
44
according to renpass_gis, NEP 2014 scenario.

dataprocessing/sql_snippets/ego_dp_versioning.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,9 +606,9 @@ SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_aggr_weather','ego_
606606

607607
-- pf data check
608608

609-
INSERT INTO grid.ego_pf_hv_data_check
610-
SELECT *
611-
FROM model_draft.ego_grid_pf_hv_data_check;
609+
--INSERT INTO grid.ego_pf_hv_data_check
610+
-- SELECT *
611+
-- FROM model_draft.ego_grid_pf_hv_data_check;
612612

613613
-- scenario log (project,version,io,schema_name,table_name,script_name,comment)
614-
SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning');
614+
--SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning');

dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS
1717
FROM supply.ego_dp_conv_powerplant
1818
WHERE scenario = 'Status Quo'
1919
AND (shutdown IS NULL or shutdown >= 2015)
20-
AND capacity > 0
20+
AND capacity > 0;
2121
-- AND preversion = 'v0.3.0'
2222
--AND version = 'v0.4.4';
2323

@@ -33,7 +33,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS
3333
WHERE scenario = 'NEP 2035'
3434
AND capacity > 0
3535
AND fuel not in ('hydro', 'run_of_river', 'reservoir')
36-
AND (shutdown IS NULL or shutdown >= 2034)
36+
AND (shutdown IS NULL or shutdown >= 2034);
3737
--AND preversion = 'v0.3.0'
3838
--AND version = 'v0.4.4';
3939

@@ -91,7 +91,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS
9191
WHERE scenario in('NEP 2035')
9292
AND fuel = 'pumped_storage'
9393
AND capacity > 0
94-
AND (shutdown IS NULL or shutdown >= 2049)
94+
AND (shutdown IS NULL or shutdown >= 2049);
9595
--AND preversion = 'v0.3.0'
9696
--AND version = 'v0.4.4';
9797

@@ -112,7 +112,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS
112112
SELECT *
113113
FROM supply.ego_dp_res_powerplant
114114
WHERE scenario = 'Status Quo'
115-
AND electrical_capacity > 0
115+
AND electrical_capacity > 0;
116116
--AND preversion = 'v0.3.0'
117117
--AND version = 'v0.4.4';
118118

0 commit comments

Comments
 (0)