Skip to content

Commit 1c632a5

Browse files
author
WolfBunke
authored
Merge pull request #233 from openego/features/seperate-wind-on-offshore
Features/seperate wind on offshore
2 parents 7faccf5 + 43e9013 commit 1c632a5

File tree

5 files changed

+143
-112
lines changed

5 files changed

+143
-112
lines changed

‎dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql‎

Lines changed: 27 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,27 @@ SELECT ego_scenario_log('v0.3.0','output','model_draft','ego_supply_pf_generator
178178
-- ego scenario log (version,io,schema_name,table_name,script_name,comment)
179179
SELECT ego_scenario_log('v0.3.0','input','model_draft','ego_grid_pf_hv_source','ego_dp_powerflow_assignment_generator.sql',' ');
180180

181+
UPDATE model_draft.ego_supply_pf_generator_single a
182+
SET source_name = wind.generation_subtype
183+
FROM (SELECT un_id, generation_subtype
184+
FROM model_draft.ego_supply_res_powerplant_sq_mview
185+
WHERE generation_type = 'wind') AS wind
186+
WHERE a.generator_id = wind.un_id;
187+
188+
UPDATE model_draft.ego_supply_pf_generator_single a
189+
SET source_name = wind.generation_subtype
190+
FROM (SELECT un_id, generation_subtype
191+
FROM model_draft.ego_supply_res_powerplant_nep2035_mview
192+
WHERE generation_type = 'wind') AS wind
193+
WHERE a.generator_id = wind.un_id;
181194

195+
UPDATE model_draft.ego_supply_pf_generator_single a
196+
SET source_name = wind.generation_subtype
197+
FROM (SELECT un_id, generation_subtype
198+
FROM model_draft.ego_supply_res_powerplant_ego100_mview
199+
WHERE generation_type = 'wind') AS wind
200+
WHERE a.generator_id = wind.un_id;
201+
182202
UPDATE model_draft.ego_supply_pf_generator_single a
183203
SET source = b.source_id
184204
FROM model_draft.ego_grid_pf_hv_source b
@@ -193,8 +213,8 @@ UPDATE model_draft.ego_supply_pf_generator_single a
193213
SET control=
194214
(CASE
195215
WHEN p_nom < 50 THEN 'PQ'
196-
WHEN p_nom >= 50 AND source IN (12, 13) THEN 'PQ'-- Wind or solar pp
197-
WHEN p_nom >= 50 AND source NOT IN (12, 13) THEN 'PV'
216+
WHEN p_nom >= 50 AND source IN (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar')) THEN 'PQ'-- Wind or solar pp
217+
WHEN p_nom >= 50 AND source NOT IN (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar')) THEN 'PV'
198218
END);
199219

200220

@@ -253,7 +273,7 @@ UPDATE model_draft.ego_supply_pf_generator_single a
253273
nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id
254274
FROM model_draft.ego_supply_pf_generator_single b
255275
WHERE p_nom < 50 AND source IN
256-
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar')
276+
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar'))
257277
GROUP BY b.bus, b.w_id, b.source, b.scn_name) AS result
258278
WHERE a.bus = result.bus
259279
AND a.w_id = result.w_id
@@ -269,7 +289,7 @@ UPDATE model_draft.ego_supply_pf_generator_single a
269289
nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id
270290
FROM model_draft.ego_supply_pf_generator_single b
271291
WHERE p_nom < 50 AND source NOT IN
272-
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar')
292+
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar'))
273293
GROUP BY b.bus, b.source, b.scn_name) AS result
274294
WHERE a.bus = result.bus
275295
AND a.source = result.source
@@ -280,78 +300,6 @@ UPDATE model_draft.ego_supply_pf_generator_single a
280300
SET aggr_id = nextval('model_draft.ego_supply_pf_generator_single_aggr_id')
281301
WHERE a.p_nom >= 50;
282302

283-
-- NEP 2035
284-
285-
-- source = (wind and solar) and p_nom < 50 MW
286-
UPDATE model_draft.ego_supply_pf_generator_single a
287-
SET aggr_id = result.aggr_id
288-
FROM (SELECT b.bus,
289-
b.w_id,
290-
b.source
291-
nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id
292-
FROM model_draft.ego_supply_pf_generator_single b
293-
WHERE scn_name='NEP 2035' AND p_nom < 50 AND source IN
294-
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar')
295-
GROUP BY bus, w_id, source) AS result
296-
WHERE a.bus = result.bus
297-
AND a.w_id = result.w_id
298-
AND a.source = result.source;
299-
300-
-- source <> (wind and solar) and p_nom < 50 MW
301-
UPDATE model_draft.ego_supply_pf_generator_single a
302-
SET aggr_id = result.aggr_id
303-
FROM (SELECT b.bus,
304-
b.source,
305-
nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id
306-
FROM model_draft.ego_supply_pf_generator_single b
307-
WHERE scn_name='NEP 2035' AND p_nom < 50 AND source NOT IN
308-
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar')
309-
GROUP BY b.bus, b.source) AS result
310-
WHERE a.bus = result.bus
311-
AND a.source = result.source;
312-
313-
-- all sources and p_nom >= 50MW
314-
UPDATE model_draft.ego_supply_pf_generator_single a
315-
SET aggr_id = nextval('model_draft.ego_supply_pf_generator_single_aggr_id')
316-
WHERE scn_name= 'NEP 2035' AND a.p_nom >= 50;
317-
318-
319-
320-
-- eGo 100
321-
322-
-- source = (wind and solar) and p_nom < 50 MW
323-
UPDATE model_draft.ego_supply_pf_generator_single a
324-
SET aggr_id = result.aggr_id
325-
FROM (SELECT b.bus,
326-
b.w_id,
327-
b.source
328-
nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id
329-
FROM model_draft.ego_supply_pf_generator_single b
330-
WHERE scn_name='eGo 100' AND p_nom < 50 AND source IN
331-
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar')
332-
GROUP BY bus, w_id, source) AS result
333-
WHERE a.bus = result.bus
334-
AND a.w_id = result.w_id
335-
AND a.source = result.source;
336-
337-
-- source <> (wind and solar) and p_nom < 50 MW
338-
UPDATE model_draft.ego_supply_pf_generator_single a
339-
SET aggr_id = result.aggr_id
340-
FROM (SELECT b.bus,
341-
b.source,
342-
nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id
343-
FROM model_draft.ego_supply_pf_generator_single b
344-
WHERE scn_name='eGo 100' AND p_nom < 50 AND source NOT IN
345-
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar')
346-
GROUP BY b.bus, b.source) AS result
347-
WHERE a.bus = result.bus
348-
AND a.source = result.source;
349-
350-
-- all sources and p_nom >= 50MW
351-
UPDATE model_draft.ego_supply_pf_generator_single a
352-
SET aggr_id = nextval('model_draft.ego_supply_pf_generator_single_aggr_id')
353-
WHERE scn_name= 'eGo 100' AND a.p_nom >= 50;
354-
355303
-- Delete all generators with p_nom=0
356304

357305
DELETE FROM model_draft.ego_supply_pf_generator_single WHERE p_nom IS NULL OR p_nom = 0;
@@ -390,7 +338,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_generator (
390338
WHERE a.p_nom < 50
391339
AND a.aggr_id IS NOT NULL
392340
AND source IN
393-
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar')
341+
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar'))
394342
GROUP BY a. scn_name, a.aggr_id, a.bus, a.w_id, a.source;
395343

396344
-- source <> (wind and solar) and p_nom < 50 MW
@@ -423,7 +371,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_generator (
423371
WHERE a.p_nom < 50
424372
AND a.aggr_id IS NOT NULL
425373
AND source NOT IN
426-
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar')
374+
(SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar'))
427375
GROUP BY a.scn_name, a.aggr_id, a.bus, a.source;
428376

429377
-- all sources and p_nom >= 50MW
@@ -458,7 +406,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_generator (
458406
-- set dispatch to 'variable' for wind, PV and run_of_river
459407

460408
UPDATE model_draft.ego_grid_pf_hv_generator
461-
SET dispatch = 'variable' WHERE source IN (9, 12, 13);
409+
SET dispatch = 'variable' WHERE source IN (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar', 'run_of_river'));
462410

463411

464412
-- ego scenario log (version,io,schema_name,table_name,script_name,comment)

‎dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
setup for hv powerflow
33
44
PF HV scenario settings
@@ -2086,7 +2086,8 @@ INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (9, 'run_of_river', NULL, N
20862086
INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (10, 'reservoir', NULL, NULL);
20872087
INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (11, 'pumped_storage', NULL, NULL);
20882088
INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (12, 'solar', NULL, NULL);
2089-
INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (13, 'wind', NULL, NULL);
2089+
INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (13, 'wind_onshore', NULL, NULL);
20902090
INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (14, 'geothermal', NULL, NULL);
20912091
INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (15, 'other_non_renewable', NULL, NULL);
20922092
INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (16, 'extendable_storage', NULL, NULL);
2093+
INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (17, 'wind_offshore', NULL, NULL);

0 commit comments

Comments
 (0)