Merge branch 'release/v0.4.1' of https://github.com/openego/data_processing into release/v0.4.1

Author: ulfmueller

dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql

@@ -220,7 +220,7 @@ UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a
 
 UPDATE model_draft.ego_grid_hv_electrical_neighbours_line 
 	SET cables = (CASE 	WHEN geom = ('0105000020E6100000010000000102000000020000008219DE771A512C40E266B10F27CB474032A946544D292A40422619390B214840') AND v_nom = 220 THEN 9
-				WHEN geom = ('0105000020E610000001000000010200000002000000CC34F5A862612040F35A1E0B14624740BBFA67BC63172040806EC383C1C64740') AND v_nom = 380 THEN 9
+				WHEN geom = ('0105000020E610000001000000010200000002000000CC34F5A862612040F35A1E0B1462474053EC681CEA172040FCA65599CEC64740') AND v_nom = 380 THEN 3
 				WHEN geom = ('0105000020E610000001000000010200000002000000CC34F5A862612040F35A1E0B146247406642DD51AD172040829D51A9C8C64740') AND v_nom = 380 THEN 9
 				ELSE cables
 			END);

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,

preprocessing/sql_snippets/ego_dp_structure_versioning.sql

@@ -5803,7 +5803,7 @@ CREATE TABLE grid.ego_line_expansion_costs
   comment text,
   source text,
   capital_costs_pypsa double precision,
-  CONSTRAINT ego_line_expansion_costs_pkey PRIMARY KEY (cost_id)
+  CONSTRAINT ego_line_expansion_costs_pkey PRIMARY KEY (version, cost_id)
 );
 
 --FK