Merge pull request #291 from openego/fix/subst_id

Fix/subst_id

Author: IlkaCu

dataprocessing/sql_snippets/ego_dp_substation_id_to_generator.sql

@@ -23,15 +23,15 @@ UPDATE model_draft.ego_dp_supply_conv_powerplant a
     SET     subst_id = b.subst_id
     FROM    model_draft.ego_grid_mv_griddistrict b
     WHERE   a.geom && ST_TRANSFORM(b.geom,4326)
-        AND ST_Intersects(a.geom, ST_TRANSFORM(b.geom,4326)) 
+        AND ST_Contains(ST_TRANSFORM(b.geom,4326), a.geom,) 
         AND voltage_level >= 3; 
 
 -- Identify corresponding bus with the help of ehv-Voronoi
 UPDATE model_draft.ego_dp_supply_conv_powerplant a
     SET     subst_id = b.subst_id
     FROM    model_draft.ego_grid_ehv_substation_voronoi b
     WHERE   a.geom && b.geom
-        AND ST_Intersects(a.geom, b.geom)
+        AND ST_Contains(b.geom, a.geom)
         AND voltage_level <= 2;
 
 -- Assign conventional pp with voltage_level >=2 located outside of Germany to their closest 110 kV substation
@@ -77,16 +77,21 @@ UPDATE model_draft.ego_dp_supply_res_powerplant a
     SET     subst_id = b.subst_id
     FROM    model_draft.ego_grid_mv_griddistrict b
     WHERE   a.geom && ST_TRANSFORM(b.geom,4326)
-        AND ST_Intersects(a.geom, ST_TRANSFORM(b.geom,4326))
+        AND ST_Contains(ST_TRANSFORM(b.geom,4326), a.geom)
         AND voltage_level >= 3;  
 
 -- Identify corresponding bus with the help of ehv-Voronoi
 UPDATE model_draft.ego_dp_supply_res_powerplant a
     SET     subst_id = b.subst_id
     FROM    model_draft.ego_grid_ehv_substation_voronoi b
     WHERE   a.geom && b.geom
-        AND ST_Intersects(a.geom, b.geom)
-AND voltage_level <= 2; 
+        AND ST_Contains(b.geom, a.geom)
+AND voltage_level <= 2;
+            
+/*
+The assignment and reallocation of RES generators which are located outside Germany happens in ego_dp_rea_setup.sql.
+                                            
+*/                                             
 
 -- scenario log (project,version,io,schema_name,table_name,script_name,comment)
 SELECT scenario_log('eGo_DP', 'v0.4.1','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_substation_id_to_generator.sql',' ');

dataprocessing/sql_snippets/rea/ego_dp_rea_setup.sql

@@ -36,19 +36,6 @@ ALTER TABLE model_draft.ego_dp_supply_res_powerplant
 -- scenario log (project,version,io,schema_name,table_name,script_name,comment)
 SELECT scenario_log('eGo_DP', 'v0.4.0','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_setup.sql',' ');
 
--- subst_id from mv-griddistrict
-UPDATE model_draft.ego_dp_supply_res_powerplant AS t1
-    SET subst_id = t2.subst_id
-    FROM (
-        SELECT  a.id AS id,
-                b.subst_id AS subst_id
-        FROM    model_draft.ego_dp_supply_res_powerplant AS a,
-                model_draft.ego_grid_mv_griddistrict AS b
-        WHERE   b.geom && ST_TRANSFORM(a.geom,3035) AND
-                ST_CONTAINS(b.geom,ST_TRANSFORM(a.geom,3035))
-        ) AS t2
-    WHERE   t1.id = t2.id;
-
 -- rea_flag reset
 UPDATE model_draft.ego_dp_supply_res_powerplant
     SET rea_flag = NULL,