diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql index ff987666..21ef91b4 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql @@ -178,7 +178,27 @@ SELECT ego_scenario_log('v0.3.0','output','model_draft','ego_supply_pf_generator -- ego scenario log (version,io,schema_name,table_name,script_name,comment) SELECT ego_scenario_log('v0.3.0','input','model_draft','ego_grid_pf_hv_source','ego_dp_powerflow_assignment_generator.sql',' '); +UPDATE model_draft.ego_supply_pf_generator_single a + SET source_name = wind.generation_subtype + FROM (SELECT un_id, generation_subtype + FROM model_draft.ego_supply_res_powerplant_sq_mview + WHERE generation_type = 'wind') AS wind + WHERE a.generator_id = wind.un_id; + +UPDATE model_draft.ego_supply_pf_generator_single a + SET source_name = wind.generation_subtype + FROM (SELECT un_id, generation_subtype + FROM model_draft.ego_supply_res_powerplant_nep2035_mview + WHERE generation_type = 'wind') AS wind + WHERE a.generator_id = wind.un_id; +UPDATE model_draft.ego_supply_pf_generator_single a + SET source_name = wind.generation_subtype + FROM (SELECT un_id, generation_subtype + FROM model_draft.ego_supply_res_powerplant_ego100_mview + WHERE generation_type = 'wind') AS wind + WHERE a.generator_id = wind.un_id; + UPDATE model_draft.ego_supply_pf_generator_single a SET source = b.source_id FROM model_draft.ego_grid_pf_hv_source b @@ -193,8 +213,8 @@ UPDATE model_draft.ego_supply_pf_generator_single a SET control= (CASE WHEN p_nom < 50 THEN 'PQ' - WHEN p_nom >= 50 AND source IN (12, 13) THEN 'PQ'-- Wind or solar pp - WHEN p_nom >= 50 AND source NOT IN (12, 13) THEN 'PV' + 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 + 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' END); @@ -253,7 +273,7 @@ UPDATE model_draft.ego_supply_pf_generator_single a nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id FROM model_draft.ego_supply_pf_generator_single b WHERE p_nom < 50 AND source IN - (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar') + (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar')) GROUP BY b.bus, b.w_id, b.source, b.scn_name) AS result WHERE a.bus = result.bus AND a.w_id = result.w_id @@ -269,7 +289,7 @@ UPDATE model_draft.ego_supply_pf_generator_single a nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id FROM model_draft.ego_supply_pf_generator_single b WHERE p_nom < 50 AND source NOT IN - (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar') + (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar')) GROUP BY b.bus, b.source, b.scn_name) AS result WHERE a.bus = result.bus AND a.source = result.source @@ -280,78 +300,6 @@ UPDATE model_draft.ego_supply_pf_generator_single a SET aggr_id = nextval('model_draft.ego_supply_pf_generator_single_aggr_id') WHERE a.p_nom >= 50; --- NEP 2035 - --- source = (wind and solar) and p_nom < 50 MW -UPDATE model_draft.ego_supply_pf_generator_single a - SET aggr_id = result.aggr_id - FROM (SELECT b.bus, - b.w_id, - b.source - nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id - FROM model_draft.ego_supply_pf_generator_single b - WHERE scn_name='NEP 2035' AND p_nom < 50 AND source IN - (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar') - GROUP BY bus, w_id, source) AS result - WHERE a.bus = result.bus - AND a.w_id = result.w_id - AND a.source = result.source; - --- source <> (wind and solar) and p_nom < 50 MW -UPDATE model_draft.ego_supply_pf_generator_single a - SET aggr_id = result.aggr_id - FROM (SELECT b.bus, - b.source, - nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id - FROM model_draft.ego_supply_pf_generator_single b - WHERE scn_name='NEP 2035' AND p_nom < 50 AND source NOT IN - (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar') - GROUP BY b.bus, b.source) AS result - WHERE a.bus = result.bus - AND a.source = result.source; - --- all sources and p_nom >= 50MW -UPDATE model_draft.ego_supply_pf_generator_single a - SET aggr_id = nextval('model_draft.ego_supply_pf_generator_single_aggr_id') - WHERE scn_name= 'NEP 2035' AND a.p_nom >= 50; - - - --- eGo 100 - --- source = (wind and solar) and p_nom < 50 MW -UPDATE model_draft.ego_supply_pf_generator_single a - SET aggr_id = result.aggr_id - FROM (SELECT b.bus, - b.w_id, - b.source - nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id - FROM model_draft.ego_supply_pf_generator_single b - WHERE scn_name='eGo 100' AND p_nom < 50 AND source IN - (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar') - GROUP BY bus, w_id, source) AS result - WHERE a.bus = result.bus - AND a.w_id = result.w_id - AND a.source = result.source; - --- source <> (wind and solar) and p_nom < 50 MW -UPDATE model_draft.ego_supply_pf_generator_single a - SET aggr_id = result.aggr_id - FROM (SELECT b.bus, - b.source, - nextval('model_draft.ego_supply_pf_generator_single_aggr_id') as aggr_id - FROM model_draft.ego_supply_pf_generator_single b - WHERE scn_name='eGo 100' AND p_nom < 50 AND source NOT IN - (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar') - GROUP BY b.bus, b.source) AS result - WHERE a.bus = result.bus - AND a.source = result.source; - --- all sources and p_nom >= 50MW -UPDATE model_draft.ego_supply_pf_generator_single a - SET aggr_id = nextval('model_draft.ego_supply_pf_generator_single_aggr_id') - WHERE scn_name= 'eGo 100' AND a.p_nom >= 50; - -- Delete all generators with p_nom=0 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 ( WHERE a.p_nom < 50 AND a.aggr_id IS NOT NULL AND source IN - (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar') + (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar')) GROUP BY a. scn_name, a.aggr_id, a.bus, a.w_id, a.source; -- source <> (wind and solar) and p_nom < 50 MW @@ -423,7 +371,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_generator ( WHERE a.p_nom < 50 AND a.aggr_id IS NOT NULL AND source NOT IN - (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name = 'wind' OR name = 'solar') + (SELECT source_id from model_draft.ego_grid_pf_hv_source WHERE name IN('wind_onshore', 'wind_offshore', 'solar')) GROUP BY a.scn_name, a.aggr_id, a.bus, a.source; -- all sources and p_nom >= 50MW @@ -458,7 +406,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_generator ( -- set dispatch to 'variable' for wind, PV and run_of_river UPDATE model_draft.ego_grid_pf_hv_generator - SET dispatch = 'variable' WHERE source IN (9, 12, 13); + 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')); -- ego scenario log (version,io,schema_name,table_name,script_name,comment) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql index d4a68344..b2fa146a 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql @@ -1,4 +1,4 @@ -/* +/* setup for hv powerflow PF HV scenario settings @@ -2086,7 +2086,8 @@ INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (9, 'run_of_river', NULL, N INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (10, 'reservoir', NULL, NULL); INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (11, 'pumped_storage', NULL, NULL); INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (12, 'solar', NULL, NULL); -INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (13, 'wind', NULL, NULL); +INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (13, 'wind_onshore', NULL, NULL); INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (14, 'geothermal', NULL, NULL); INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (15, 'other_non_renewable', NULL, NULL); INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (16, 'extendable_storage', NULL, NULL); +INSERT INTO model_draft.ego_grid_pf_hv_source VALUES (17, 'wind_offshore', NULL, NULL); \ No newline at end of file diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql index 67ae492f..31eaa59b 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql @@ -45,7 +45,8 @@ FROM when obj_label LIKE '%%run_of_river%%' THEN 9 -- when obj_label LIKE '%%storage_phs%%' THEN 11 when obj_label LIKE '%%solar%%' THEN 12 - when obj_label LIKE '%%wind%%' THEN 13 + when obj_label LIKE '%%wind_onshore%%' THEN 13 + when obj_label LIKE '%%wind_offshore%%' THEN 17 END AS source, bus_label, obj_label, @@ -76,14 +77,15 @@ FROM source FROM model_draft.ego_supply_pf_generator_single - WHERE source IN (12, 13) + WHERE source IN (12, 13, 17) AND scn_name = 'Status Quo' GROUP BY aggr_id, w_id, source) AS gen, (SELECT w_id, CASE WHEN source LIKE '%%solar%%' THEN 12 - WHEN source LIKE '%%wind%%' THEN 13 + WHEN source LIKE '%%wind_onshore%%' THEN 13 + WHEN source LIKE '%%wind_offshore%%' THEN 17 END AS source, feedin FROM model_draft.ego_renewable_feedin) AS feedin @@ -148,7 +150,8 @@ FROM when obj_label LIKE '%%run_of_river%%' THEN 9 -- when obj_label LIKE '%%storage_phs%%' THEN 11 when obj_label LIKE '%%solar%%' THEN 12 - when obj_label LIKE '%%wind%%' THEN 13 + WHEN obj_label LIKE '%%wind_onshore%%' THEN 13 + WHEN obj_label LIKE '%%wind_offshore%%' THEN 17 END AS source, bus_label, obj_label, @@ -179,14 +182,15 @@ FROM source FROM model_draft.ego_supply_pf_generator_single - WHERE source IN (12, 13) + WHERE source IN (12, 13, 17) AND scn_name = 'NEP 2035' GROUP BY aggr_id, w_id, source) AS gen, (SELECT w_id, CASE WHEN source LIKE '%%solar%%' THEN 12 - WHEN source LIKE '%%wind%%' THEN 13 + WHEN source LIKE '%%wind_onshore%%' THEN 13 + WHEN source LIKE '%%wind_offshore%%' THEN 17 END AS source, feedin FROM model_draft.ego_renewable_feedin) AS feedin @@ -247,7 +251,8 @@ FROM when obj_label LIKE '%%run_of_river%%' THEN 9 -- when obj_label LIKE '%%storage_phs%%' THEN 11 when obj_label LIKE '%%solar%%' THEN 12 - when obj_label LIKE '%%wind%%' THEN 13 + WHEN obj_label LIKE '%%wind_onshore%%' THEN 13 + WHEN obj_label LIKE '%%wind_offshore%%' THEN 17 END AS source, bus_label, obj_label, @@ -278,14 +283,15 @@ FROM source FROM model_draft.ego_supply_pf_generator_single - WHERE source IN (12, 13) + WHERE source IN (12, 13, 17) AND scn_name = 'eGo 100' GROUP BY aggr_id, w_id, source) AS gen, (SELECT w_id, CASE WHEN source LIKE '%%solar%%' THEN 12 - WHEN source LIKE '%%wind%%' THEN 13 + WHEN source LIKE '%%wind_onshore%%' THEN 13 + WHEN source LIKE '%%wind_offshore%%' THEN 17 END AS source, feedin FROM model_draft.ego_renewable_feedin) AS feedin @@ -484,7 +490,8 @@ INSERT into model_draft.ego_grid_pf_hv_generator CASE WHEN source LIKE '%%run_of_river%%' THEN 9 WHEN source LIKE '%%solar%%' THEN 12 - WHEN source LIKE '%%wind%%' THEN 13 + WHEN source LIKE '%%wind_onshore%%' THEN 13 + WHEN source LIKE '%%wind_offshore%%' THEN 17 when source LIKE '%%reservoir%%' THEN 10 when source LIKE '%%geothermal%%' THEN 14 END AS source @@ -526,7 +533,8 @@ INSERT into model_draft.ego_grid_pf_hv_generator CASE WHEN source LIKE '%%run_of_river%%' THEN 9 WHEN source LIKE '%%solar%%' THEN 12 - WHEN source LIKE '%%wind%%' THEN 13 + WHEN source LIKE '%%wind_onshore%%' THEN 13 + WHEN source LIKE '%%wind_offshore%%' THEN 17 when source LIKE '%%reservoir%%' THEN 10 when source LIKE '%%geothermal%%' THEN 14 END AS source @@ -568,7 +576,8 @@ INSERT into model_draft.ego_grid_pf_hv_generator CASE WHEN source LIKE '%%run_of_river%%' THEN 9 WHEN source LIKE '%%solar%%' THEN 12 - WHEN source LIKE '%%wind%%' THEN 13 + WHEN source LIKE '%%wind_onshore%%' THEN 13 + WHEN source LIKE '%%wind_offshore%%' THEN 17 when source LIKE '%%reservoir%%' THEN 10 when source LIKE '%%geothermal%%' THEN 14 END AS source @@ -619,8 +628,9 @@ CREATE MATERIALIZED VIEW calc_renpass_gis.translate_to_pf AS WHEN A.source = 9 THEN 'run_of_river' WHEN A.source = 10 THEN 'reservoir' WHEN A.source = 12 THEN 'solar' - WHEN A.source = 13 THEN 'wind' + WHEN A.source = 13 THEN 'wind_onshore' WHEN A.source = 14 THEN 'geothermal' + WHEN A.source = 17 THEN 'wind_offshore' END AS renpass_gis_source FROM model_draft.ego_grid_pf_hv_generator A join model_draft.ego_grid_hv_electrical_neighbours_bus B @@ -644,7 +654,7 @@ FROM feedin.w_id, CASE WHEN feedin.source LIKE '%%solar%%' THEN 12 - WHEN feedin.source LIKE '%%wind%%' THEN 13 + WHEN feedin.source LIKE '%%wind_onshore%%' THEN 13 END AS source, feedin.feedin FROM @@ -671,7 +681,6 @@ FROM WHERE A.w_id = B.w_id AND A.source = B.source; - -- Make an array, INSERT into generator_pq_set INSERT into model_draft.ego_grid_pf_hv_generator_pq_set (scn_name, generator_id, temp_id, p_set) @@ -719,8 +728,9 @@ CREATE MATERIALIZED VIEW calc_renpass_gis.translate_to_pf AS WHEN A.source = 9 THEN 'run_of_river' WHEN A.source = 10 THEN 'reservoir' WHEN A.source = 12 THEN 'solar' - WHEN A.source = 13 THEN 'wind' + WHEN A.source = 13 THEN 'wind_onshore' WHEN A.source = 14 THEN 'geothermal' + WHEN A.source = 17 THEN 'wind_offshore' END AS renpass_gis_source FROM model_draft.ego_grid_pf_hv_generator A join model_draft.ego_grid_hv_electrical_neighbours_bus B @@ -744,7 +754,7 @@ FROM feedin.w_id, CASE WHEN feedin.source LIKE '%%solar%%' THEN 12 - WHEN feedin.source LIKE '%%wind%%' THEN 13 + WHEN feedin.source LIKE '%%wind_onshore%%' THEN 13 END AS source, feedin.feedin FROM @@ -818,8 +828,9 @@ CREATE MATERIALIZED VIEW calc_renpass_gis.translate_to_pf AS WHEN A.source = 9 THEN 'run_of_river' WHEN A.source = 10 THEN 'reservoir' WHEN A.source = 12 THEN 'solar' - WHEN A.source = 13 THEN 'wind' + WHEN A.source = 13 THEN 'wind_onshore' WHEN A.source = 14 THEN 'geothermal' + WHEN A.source = 17 THEN 'wind_offshore' END AS renpass_gis_source FROM model_draft.ego_grid_pf_hv_generator A join model_draft.ego_grid_hv_electrical_neighbours_bus B @@ -843,7 +854,7 @@ FROM feedin.w_id, CASE WHEN feedin.source LIKE '%%solar%%' THEN 12 - WHEN feedin.source LIKE '%%wind%%' THEN 13 + WHEN feedin.source LIKE '%%wind_onshore%%' THEN 13 END AS source, feedin.feedin FROM @@ -895,6 +906,42 @@ UPDATE model_draft.ego_grid_pf_hv_generator_pq_set A FROM model_draft.ren_feedin_foreign AS feedin WHERE A.generator_id = feedin.generator_id; +-- set p_max_pu for foreign offshore generators +DROP MATERIALIZED VIEW IF EXISTS model_draft.offshore_feedin_foreign; +CREATE MATERIALIZED VIEW model_draft.offshore_feedin_foreign AS +SELECT +generator_id, scn_name, feedin +FROM + (SELECT generator_id, + bus, + scn_name + FROM model_draft.ego_grid_pf_hv_generator + WHERE generator_id > 200000 + AND source = 17) + AS gen + JOIN + (SELECT bus_id, + cntr_id + FROM model_draft.ego_grid_hv_electrical_neighbours_bus) + AS enb + ON (enb.bus_id = gen.bus) + JOIN + (SELECT cntr_id, + coastdat_id + FROM model_draft.ego_neighbours_offshore_point) + AS nop + ON (nop.cntr_id = enb.cntr_id) + JOIN + (SELECT w_id, + feedin + FROM model_draft.ego_renewable_feedin) + AS erf + ON (erf.w_id = nop.coastdat_id); + +UPDATE model_draft.ego_grid_pf_hv_generator_pq_set A + SET p_max_pu = feedin.feedin + FROM model_draft.offshore_feedin_foreign AS feedin + WHERE A.generator_id = feedin.generator_id; -- DELETE DELETE FROM model_draft.ego_grid_pf_hv_load WHERE bus IN ( diff --git a/preprocessing/python_scripts/renpass_gis/simple_feedin/simple_feedin.py b/preprocessing/python_scripts/renpass_gis/simple_feedin/simple_feedin.py index 849197aa..5640925c 100644 --- a/preprocessing/python_scripts/renpass_gis/simple_feedin/simple_feedin.py +++ b/preprocessing/python_scripts/renpass_gis/simple_feedin/simple_feedin.py @@ -163,10 +163,10 @@ def main(): powerplants = {} # instatiate feedinlib models in dictionary - powerplants['windonshore'] = plants.WindPowerPlant( + powerplants['wind_onshore'] = plants.WindPowerPlant( **to_dictionary(cfg=cfg, section='WindTurbineOnshore')) - powerplants['windoffshore'] = plants.WindPowerPlant( + powerplants['wind_offshore'] = plants.WindPowerPlant( **to_dictionary(cfg=cfg, section='WindTurbineOffshore')) powerplants['solar'] = plants.Photovoltaic( @@ -186,10 +186,10 @@ def main(): print('Geometry cannot be handled: %s, %s' % (geom.x, geom.y)) continue - if type_of_generation == 'windoffshore': + if type_of_generation == 'wind_offshore': feedin = correction_offshore * powerplants[type_of_generation].\ feedin(weather=weather, installed_capacity=1) - elif type_of_generation == 'windonshore': + elif type_of_generation == 'wind_onshore': feedin = powerplants[type_of_generation].\ feedin(weather=weather, installed_capacity=1) elif type_of_generation == 'solar': diff --git a/preprocessing/sql_snippets/ego_simple-feedin_per_scenario.sql b/preprocessing/sql_snippets/ego_simple-feedin_per_scenario.sql index 3601afd3..3ee6b2f9 100644 --- a/preprocessing/sql_snippets/ego_simple-feedin_per_scenario.sql +++ b/preprocessing/sql_snippets/ego_simple-feedin_per_scenario.sql @@ -75,6 +75,33 @@ __author__ = "wolfbunke, MarlonSchlemminger" -- From climate.cosmoclmgrid B -- Where ST_Intersects(B.geom,C.geom); -- + +DROP TABLE IF EXISTS model_draft.ego_neighbours_offshore_point; + +CREATE TABLE model_draft.ego_neighbours_offshore_point +( + cntr_id text NOT NULL, + coastdat_id bigint, + geom geometry(Point,4326), + CONSTRAINT neighbours_offshore_point_pkey PRIMARY KEY (cntr_id) +); + +INSERT INTO model_draft.ego_neighbours_offshore_point (cntr_id, geom) +VALUES +('DK', ST_SetSRID(ST_MakePoint(7.59, 55.6), 4326)), +('NL', ST_SetSRID(ST_MakePoint(5.883333, 54.183333), 4326)), +('NO', ST_SetSRID(ST_MakePoint(6.327633, 58.269992), 4326)), +('FR', ST_SetSRID(ST_MakePoint(0.227, 49.892), 4326)), +('SE', ST_SetSRID(ST_MakePoint(14.993694, 55.9375), 4326)), +('PL', ST_SetSRID(ST_MakePoint(17.3333333333, 55.000), 4326)) +; + +UPDATE model_draft.ego_neighbours_offshore_point a + SET coastdat_id = climate.gid + FROM climate.cosmoclmgrid AS climate + WHERE ST_Intersects(climate.geom, a.geom) +; + DROP TABLE IF EXISTS model_draft.ego_weather_measurement_point; CREATE TABLE model_draft.ego_weather_measurement_point @@ -87,8 +114,8 @@ CREATE TABLE model_draft.ego_weather_measurement_point WITH ( OIDS=FALSE ); -ALTER TABLE model_draft.ego_weather_measurement_point - OWNER TO oeuser; +-- ALTER TABLE model_draft.ego_weather_measurement_point +-- OWNER TO oeuser; -- german points INSERT INTO model_draft.ego_weather_measurement_point (coastdat_id, type_of_generation, geom) @@ -106,7 +133,7 @@ WHERE ST_Intersects(ger.geom, coastdat.geom); INSERT INTO model_draft.ego_weather_measurement_point (coastdat_id, type_of_generation, geom) SELECT coastdat.gid, - 'windonshore', + 'wind_onshore', ST_Centroid(coastdat.geom) FROM climate.cosmoclmgrid AS coastdat, (SELECT ST_Transform(ST_Union(geom), 4326) AS geom @@ -117,12 +144,11 @@ WHERE ST_Intersects(ger.geom, coastdat.geom); INSERT INTO model_draft.ego_weather_measurement_point (coastdat_id, type_of_generation, geom) SELECT coastdat.gid, - 'windoffshore', + 'wind_offshore', ST_Centroid(coastdat.geom) FROM coastdat.cosmoclmgrid AS coastdat, (SELECT ST_Union(geom) AS geom FROM model_draft.renpass_gis_parameter_region WHERE u_region_id LIKE 'DEow%') AS offshore -WHERE ST_Intersects(offshore.geom, coastdat.geom) -AND coastdat.gid NOT IN (SELECT coastdat_id FROM model_draft.ego_weather_measurement_point); +WHERE ST_Intersects(offshore.geom, coastdat.geom); --foreign points INSERT INTO model_draft.ego_weather_measurement_point (coastdat_id, type_of_generation, geom) @@ -139,10 +165,19 @@ ON CONFLICT DO NOTHING; INSERT INTO model_draft.ego_weather_measurement_point (coastdat_id, type_of_generation, geom) SELECT coastdat.gid, - 'windonshore', + 'wind_onshore', neighbour.geom FROM coastdat.cosmoclmgrid AS coastdat, model_draft.ego_grid_hv_electrical_neighbours_bus AS neighbour WHERE ST_Intersects(neighbour.geom, coastdat.geom) -AND coastdat.gid NOT IN (SELECT coastdat_id FROM model_draft.ego_weather_measurement_point WHERE type_of_generation = 'windoffshore') ON CONFLICT DO NOTHING; + +INSERT INTO model_draft.ego_weather_measurement_point (coastdat_id, type_of_generation, geom) +SELECT + coastdat.gid, + 'wind_offshore', + neighbour.geom +FROM coastdat.cosmoclmgrid AS coastdat, + model_draft.ego_neighbours_offshore_point AS neighbour +WHERE ST_Intersects(neighbour.geom, coastdat.geom) +ON CONFLICT DO NOTHING; \ No newline at end of file