Skip to content

Commit 1add6d1

Browse files
author
WolfBunke
authored
Merge pull request #245 from openego/features/wind-onshore-calculation
Features/wind onshore calculation
2 parents 1268752 + b2b7a9f commit 1add6d1

6 files changed

Lines changed: 520 additions & 94 deletions

File tree

‎dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ CREATE TABLE model_draft.ego_supply_pf_generator_single (
3030
efficiency double precision,
3131
w_id bigint,
3232
aggr_id bigint,
33+
power_class bigint,
3334
source_name character varying,
3435
voltage_level smallint,
3536
CONSTRAINT generator_single_data_pkey PRIMARY KEY (scn_name, generator_id),
@@ -225,6 +226,16 @@ UPDATE model_draft.ego_supply_pf_generator_single a
225226
-- ego scenario log (version,io,schema_name,table_name,script_name,comment)
226227
SELECT ego_scenario_log('v0.3.0','input','climate','cosmoclmgrid','ego_dp_powerflow_assignment_generator.sql',' ');
227228

229+
UPDATE model_draft.ego_supply_pf_generator_single a
230+
SET power_class = b.power_class_id
231+
FROM model_draft.ego_power_class b
232+
WHERE a.p_nom >= b.lower_limit
233+
AND a.p_nom < b.upper_limit
234+
AND a.source IN (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore'));
235+
236+
UPDATE model_draft.ego_supply_pf_generator_single a
237+
SET power_class = 0
238+
WHERE source IN (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_offshore', 'solar'));
228239

229240
-- Create aggregate IDs in pf_generator_single
230241

@@ -243,15 +254,17 @@ UPDATE model_draft.ego_supply_pf_generator_single a
243254
FROM (SELECT b.bus,
244255
b.w_id,
245256
b.source,
257+
b.power_class,
246258
b.scn_name,
247259
nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id
248260
FROM model_draft.ego_supply_pf_generator_single b
249261
WHERE p_nom < 50 AND source IN
250262
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar'))
251-
GROUP BY b.bus, b.w_id, b.source, b.scn_name) AS result
263+
GROUP BY b.bus, b.w_id, b.source, b.power_class, b.scn_name) AS result
252264
WHERE a.bus = result.bus
253265
AND a.w_id = result.w_id
254266
AND a.source = result.source
267+
AND a.power_class = result.power_class
255268
AND a.scn_name = result.scn_name;
256269

257270
-- source <> (wind and solar) and p_nom < 50 MW
@@ -282,7 +295,7 @@ DELETE FROM model_draft.ego_supply_pf_generator_single WHERE p_nom IS NULL OR p_
282295

283296
DELETE FROM model_draft.ego_grid_pf_hv_generator WHERE scn_name IN ('Status Quo', 'NEP 2035', 'eGo 100');
284297

285-
-- source = (wind and solar) and p_nom < 50 MW
298+
-- source = wind_onshore and p_nom < 50 MW
286299
INSERT INTO model_draft.ego_grid_pf_hv_generator (
287300
scn_name,
288301
generator_id,
@@ -313,7 +326,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_generator (
313326
AND a.aggr_id IS NOT NULL
314327
AND source IN
315328
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar'))
316-
GROUP BY a. scn_name, a.aggr_id, a.bus, a.w_id, a.source;
329+
GROUP BY a. scn_name, a.aggr_id, a.bus, a.w_id, a.power_class, a.source;
317330

318331
-- source <> (wind and solar) and p_nom < 50 MW
319332
INSERT INTO model_draft.ego_grid_pf_hv_generator (

‎dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,16 @@ FROM
7474
(SELECT
7575
aggr_id AS generator_id,
7676
w_id,
77+
power_class,
7778
source
7879
FROM
7980
model_draft.ego_supply_pf_generator_single
8081
WHERE source IN (12, 13, 17)
8182
AND scn_name = 'Status Quo'
82-
GROUP BY aggr_id, w_id, source) AS gen,
83+
GROUP BY aggr_id, w_id, power_class, source) AS gen,
8384
(SELECT
8485
w_id,
86+
power_class,
8587
CASE
8688
WHEN source LIKE '%%solar%%' THEN 12
8789
WHEN source LIKE '%%wind_onshore%%' THEN 13
@@ -90,7 +92,8 @@ FROM
9092
feedin
9193
FROM model_draft.ego_renewable_feedin) AS feedin
9294
WHERE gen.source = feedin.source
93-
AND gen.w_id = feedin.w_id;
95+
AND gen.w_id = feedin.w_id
96+
AND gen.power_class = feedin.power_class;
9497

9598

9699
--
@@ -179,14 +182,16 @@ FROM
179182
(SELECT
180183
aggr_id AS generator_id,
181184
w_id,
185+
power_class,
182186
source
183187
FROM
184188
model_draft.ego_supply_pf_generator_single
185189
WHERE source IN (12, 13, 17)
186190
AND scn_name = 'NEP 2035'
187-
GROUP BY aggr_id, w_id, source) AS gen,
191+
GROUP BY aggr_id, w_id, power_class, source) AS gen,
188192
(SELECT
189193
w_id,
194+
power_class,
190195
CASE
191196
WHEN source LIKE '%%solar%%' THEN 12
192197
WHEN source LIKE '%%wind_onshore%%' THEN 13
@@ -195,7 +200,8 @@ FROM
195200
feedin
196201
FROM model_draft.ego_renewable_feedin) AS feedin
197202
WHERE gen.source = feedin.source
198-
AND gen.w_id = feedin.w_id;
203+
AND gen.w_id = feedin.w_id
204+
AND gen.power_class = feedin.power_class;
199205

200206
-- construct array per aggr_id according to source timeseries
201207
INSERT into model_draft.ego_grid_pf_hv_generator_pq_set (scn_name, generator_id, temp_id, p_set)
@@ -280,14 +286,16 @@ FROM
280286
(SELECT
281287
aggr_id AS generator_id,
282288
w_id,
289+
power_class,
283290
source
284291
FROM
285292
model_draft.ego_supply_pf_generator_single
286293
WHERE source IN (12, 13, 17)
287294
AND scn_name = 'eGo 100'
288-
GROUP BY aggr_id, w_id, source) AS gen,
295+
GROUP BY aggr_id, w_id, power_class, source) AS gen,
289296
(SELECT
290297
w_id,
298+
power_class,
291299
CASE
292300
WHEN source LIKE '%%solar%%' THEN 12
293301
WHEN source LIKE '%%wind_onshore%%' THEN 13
@@ -296,7 +304,8 @@ FROM
296304
feedin
297305
FROM model_draft.ego_renewable_feedin) AS feedin
298306
WHERE gen.source = feedin.source
299-
AND gen.w_id = feedin.w_id;
307+
AND gen.w_id = feedin.w_id
308+
AND gen.power_class = feedin.power_class;
300309

301310
-- construct array per aggr_id according to source timeseries
302311
INSERT into model_draft.ego_grid_pf_hv_generator_pq_set (scn_name, generator_id, temp_id, p_set)
@@ -662,6 +671,7 @@ FROM
662671
feedin.feedin
663672
FROM
664673
model_draft.ego_renewable_feedin AS feedin
674+
WHERE power_class IN (0, 4)
665675
) AS B,
666676
(SELECT
667677
generators.generator_id,
@@ -762,6 +772,7 @@ FROM
762772
feedin.feedin
763773
FROM
764774
model_draft.ego_renewable_feedin AS feedin
775+
WHERE power_class IN (0, 4)
765776
) AS B,
766777
(SELECT
767778
generators.generator_id,
@@ -862,6 +873,7 @@ FROM
862873
feedin.feedin
863874
FROM
864875
model_draft.ego_renewable_feedin AS feedin
876+
WHERE power_class IN (0, 4)
865877
) AS B,
866878
(SELECT
867879
generators.generator_id,

‎preprocessing/python_scripts/renpass_gis/simple_feedin/db.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class Typified(Base):
141141
Base.prepare()
142142

143143
# simplify class names
144-
Datatype, Projection, Spatial, Timeseries, Year, Point =\
144+
Datatype, Projection, Spatial, Timeseries, Year, Point=\
145145
Base.classes.datatype, Base.classes.projection, Base.classes.spatial,\
146146
Base.classes.timeseries, Base.classes.year,\
147147
Base.classes.ego_weather_measurement_point

0 commit comments

Comments
 (0)