Merge pull request #196 from openego/release/v0.3-fix

Release/v0.3 fix

Author: IlkaCu

dataprocessing/sql_snippets/ego_dp_powerflow_create_pp_mview.sql

@@ -1,4 +1,4 @@
-/*
+/*
 SQL Script to create mviews diyplaying power plants by scenario.
 
 __copyright__ = "Europa-Universität Flensburg - ZNES"
@@ -184,6 +184,7 @@ CREATE MATERIALIZED VIEW model_draft.ego_supply_res_powerplant_ego100_mview AS
 		 And preversion = 'v0.3.0'
 		 AND electrical_capacity > 0
 		 AND generation_type in ('solar','wind')
+		 AND generation_subtype not in ('wind_offshore')
 		 ORDER BY id	
 		 ) as sub
 	UNION 

dataprocessing/sql_snippets/ego_dp_versioning.sql

@@ -680,7 +680,7 @@ ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview
 -- MView for eGo 100
 DROP MATERIALIZED VIEW IF EXISTS supply.ego_dp_res_powerplant_ego100_mview CASCADE;
 CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS
-	SELECT
+	SELECT DISTINCT ON (id)
 	sub.*
 	FROM  ( 
 		SELECT DISTINCT ON (id)
@@ -699,10 +699,11 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS
 		 AND version = 'v0.3.0'
 		 AND electrical_capacity > 0
 		 AND generation_type in ('solar','wind')
+		 AND generation_subtype not in ('wind_offshore')
 		 ORDER BY id	
 		 ) as sub
 	UNION 
-	SELECT
+	SELECT DISTINCT ON (id)
 	sub2.*
 	FROM  ( 
 		SELECT  DISTINCT ON (id)
@@ -725,7 +726,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS
 		 ORDER BY id	
 	) sub2
         UNION 
-	SELECT
+	SELECT DISTINCT ON (id)
 	sub3.*
 	FROM  ( 
 		SELECT  DISTINCT ON (id)
@@ -739,6 +740,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS
 			AND version = 'v0.3.0'
 			AND generation_type not in ('biomass','gas','reservoir','run_of_river')
 			AND flag in ('commissioning', 'repowering')
+			AND generation_subtype not in ('wind_offshore')
 			Group BY id
 			Order by id)
 		 AND scenario in ('NEP 2035')

preprocessing/sql_snippets/boundaries/ego_pp_vg250_mview.sql

@@ -0,0 +1,15 @@
+-- Create MView with NUTS IDs
+
+CREATE MATERIALIZED VIEW boundaries.bkg_vg250_2_lan_nuts_view AS 
+ SELECT lan.ags_0,
+    lan.gen,
+    lan.nuts,
+    st_union(st_transform(lan.geom, 3035)) AS geom
+   FROM ( SELECT vg.ags_0,
+            vg.nuts,
+            replace(vg.gen::text, ' (Bodensee)'::text, ''::text) AS gen,
+            vg.geom
+           FROM boundaries.bkg_vg250_2_lan vg) lan
+  GROUP BY lan.ags_0, lan.gen, lan.nuts
+  ORDER BY lan.ags_0
+WITH DATA;

preprocessing/sql_snippets/ego_dp_preprocessing_conv_powerplant.sql

@@ -1,4 +1,4 @@
-/*
+/*
 Rectifies incorrect or implausible records in power plant list and adjusts it for further use
 
 __copyright__ 	= "Flensburg University of Applied Sciences, Centre for Sustainable Energy Systems"
@@ -267,6 +267,49 @@ UPDATE model_draft.ego_dp_supply_conv_powerplant
 	SET voltage_level=7
 	WHERE capacity < 0.1 /*voltage_level =7 when capacity lower than 0.1*/;
 
+
+--  Due to discrepancies between the given NEP 2035 power plant lsit
+--  and the the installed Capacities of the study NEP 2015 with scenario B2035  
+--  a correction of the capacities is done.
+
+DROP TABLE IF EXISTS 	model_draft.ego_supply_conv_nep2035_temp CASCADE;
+CREATE TABLE 		model_draft.ego_supply_conv_nep2035_temp AS
+	SELECT * 
+	FROM 
+	  model_draft.ego_dp_supply_conv_powerplant
+	WHERE scenario in ('NEP 2035');
+
+-- create index GIST (geom)
+CREATE INDEX ego_supply_conv_nep2035_temp_geom_idx
+	ON model_draft.ego_supply_conv_nep2035_temp USING gist (geom);
+
+-- grant (oeuser)
+ALTER TABLE model_draft.ego_supply_conv_nep2035_temp OWNER TO oeuser;
+
+-- Repowering units 
+UPDATE model_draft.ego_supply_conv_nep2035_temp 
+set   capacity = capacity +  round(capacity*((12700.-14477.)/12700.))
+Where fuel ='pumped_storage';
+
+UPDATE model_draft.ego_supply_conv_nep2035_temp 
+set   capacity = capacity +   round(capacity*((33500.-35390.)/33500.))
+Where fuel ='gas';
+
+UPDATE model_draft.ego_supply_conv_nep2035_temp 
+set   capacity = capacity +  round(capacity*((9100.-12240)/9100.))
+Where fuel ='lignite';
+
+UPDATE model_draft.ego_supply_conv_nep2035_temp 
+set   capacity = capacity +  round(capacity*((11000.-13860.)/11000.))
+Where fuel ='coal';
+
+Update   model_draft.ego_dp_supply_conv_powerplant A
+  set capacity =B.capacity
+FROM model_draft.ego_supply_conv_nep2035_temp  B
+WHERE A.scenario in ('NEP 2035')
+AND A.id = B.id;
+
+	
 SELECT obj_description('model_draft.ego_dp_supply_conv_powerplant' ::regclass) ::json;
 
 -- ego scenario log (version,io,schema_name,table_name,script_name,comment)

preprocessing/sql_snippets/ego_dp_preprocessing_res_powerplant.sql

@@ -205,7 +205,7 @@ Insert into model_draft.ego_dp_supply_res_powerplant
 	  'constantly'::text as flag,
 	  Null as nuts
 	FROM 
-	  model_draft.ego_dp_supply_res_powerplant
+	  model_draft.ego_supply_res_powerplant
 	 WHERE geom is not NULL;
 
 
@@ -283,11 +283,11 @@ UPDATE model_draft.ego_dp_supply_res_powerplant
 		WHEN eeg_id LIKE '%%BALTIC%%' 
 		THEN (SELECT geom from model_draft.ego_dp_supply_res_powerplant where id = 1561137)
 		WHEN eeg_id LIKE '%%RIFFE%%' 
-		THEN ST_SetSRID(ST_MakePoint(6.48, 53.69),4326)
+		THEN ST_SetSRID(ST_MakePoint(6.48, 53.69),3035)
 		WHEN eeg_id LIKE '%%ALPHAVENTUE%%' 
-		THEN ST_SetSRID(ST_MakePoint(6.598333, 54.008333),4326)
+		THEN ST_SetSRID(ST_MakePoint(6.598333, 54.008333),3035)
 		WHEN eeg_id LIKE '%%BAOEE%%' 
-		THEN ST_SetSRID(ST_MakePoint(5.975, 54.358333),4326)
+		THEN ST_SetSRID(ST_MakePoint(5.975, 54.358333),3035)
 		END)
 	WHERE postcode = '00000' OR postcode = 'keine' or postcode = 'O04WF' AND generation_subtype = 'wind_offshore';