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

Author: Ludee

dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql

@@ -93,7 +93,7 @@ FROM (
 	GROUP BY T2.generator_id
 ) T3 WHERE T3.generator_id = Y.generator_id;
 
---DELETE * FROM model_draft.ego_grid_pf_hv_storage;
+DELETE FROM model_draft.ego_grid_pf_hv_storage WHERE scn_name IN ('Status Quo', 'NEP 2035', 'eGo 100') AND source = 16;
 
 -- Insert battery storages to all substations (Status Quo)
 INSERT INTO model_draft.ego_grid_pf_hv_storage

dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql

@@ -244,6 +244,9 @@ INSERT into model_draft.ego_grid_pf_hv_generator
 		when source LIKE '%%uranium%%' THEN 5
 		when source LIKE '%%biomass%%' THEN 6
 		when source LIKE '%%hard_coal%%' THEN 8
+		when source LIKE '%%reservoir%%' THEN 10
+		when source LIKE '%%geothermal%%' THEN 14
+		when source
 	END AS source
 		FROM calc_renpass_gis.renpass_gis_linear_transformer A join
 		(
@@ -291,6 +294,8 @@ INSERT into model_draft.ego_grid_pf_hv_generator
 		when source LIKE '%%uranium%%' THEN 5
 		when source LIKE '%%biomass%%' THEN 6
 		when source LIKE '%%hard_coal%%' THEN 8
+		when source LIKE '%%reservoir%%' THEN 10 
+		when source LIKE '%%geothermal%%' THEN 14
 	END AS source
 		FROM calc_renpass_gis.renpass_gis_linear_transformer A join
 		(
@@ -337,6 +342,8 @@ INSERT into model_draft.ego_grid_pf_hv_generator
 		when source LIKE '%%uranium%%' THEN 5
 		when source LIKE '%%biomass%%' THEN 6
 		when source LIKE '%%hard_coal%%' THEN 8
+		when source LIKE '%%reservoir%%' THEN 10 
+		when source LIKE '%%geothermal%%' THEN 14
 	END AS source
 		FROM calc_renpass_gis.renpass_gis_linear_transformer A join
 		(
@@ -508,8 +515,10 @@ CREATE MATERIALIZED VIEW calc_renpass_gis.translate_to_pf AS
 			WHEN A.source =  6  THEN  'biomass'
 			WHEN A.source =  8  THEN  'hard_coal'
 			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 =  14 THEN  'geothermal'
 		END AS renpass_gis_source
 			FROM model_draft.ego_grid_pf_hv_generator A join
 			model_draft.ego_grid_hv_electrical_neighbours_bus B
@@ -562,8 +571,10 @@ CREATE MATERIALIZED VIEW calc_renpass_gis.translate_to_pf AS
 			WHEN A.source =  6  THEN  'biomass'
 			WHEN A.source =  8  THEN  'hard_coal'
 			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 =  14 THEN  'geothermal' 
 		END AS renpass_gis_source
 			FROM model_draft.ego_grid_pf_hv_generator A join
 			model_draft.ego_grid_hv_electrical_neighbours_bus B
@@ -616,8 +627,10 @@ CREATE MATERIALIZED VIEW calc_renpass_gis.translate_to_pf AS
 			WHEN A.source =  6  THEN  'biomass'
 			WHEN A.source =  8  THEN  'hard_coal'
 			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 =  14 THEN  'geothermal' 
 		END AS renpass_gis_source
 			FROM model_draft.ego_grid_pf_hv_generator A join
 			model_draft.ego_grid_hv_electrical_neighbours_bus B

dataprocessing/sql_snippets/ego_dp_versioning.sql

@@ -151,10 +151,50 @@ SELECT ego_scenario_log('v0.3.0','result','demand','ego_dp_loadarea','ego_dp_ver
 /* DELETE FROM supply.ego_dp_conv_powerplant
 	WHERE	version = 'v0.3.0'; */
 
-INSERT INTO supply.ego_dp_conv_powerplant
+INSERT INTO supply.ego_dp_conv_powerplant 
 	SELECT	'v0.3.0',
-		*
-	FROM	model_draft.ego_supply_conv_powerplant;
+  		id,
+  		bnetza_id,
+  		company,
+  		name,
+  		postcode,
+  		city,
+  		street,
+  		state,
+  		block,
+  		commissioned_original,
+  		commissioned,
+  		retrofit,
+  		shutdown,
+  		status,
+  		fuel,
+  		technology,
+  		type,
+  		eeg,
+  		chp,
+  		capacity,
+  		capacity_uba,
+  		chp_capacity_uba,
+  		efficiency_data,
+  		efficiency_estimate,
+  		network_node,
+  		voltage,
+  		network_operator,
+  		name_uba,
+  		lat,
+  		lon,
+  		comment,
+  		geom,
+  		voltage_level,
+  		subst_id,
+  		otg_id,
+  		un_id,
+		preversion,
+  		la_id,
+  		scenario,
+  		flag,
+  		nuts
+	FROM	model_draft.ego_dp_supply_conv_powerplant;
 
 -- ego scenario log (version,io,schema_name,table_name,script_name,comment)
 SELECT ego_scenario_log('v0.3.0','result','supply','ego_dp_conv_powerplant','ego_dp_versioning.sql','versioning');
@@ -165,8 +205,47 @@ SELECT ego_scenario_log('v0.3.0','result','supply','ego_dp_conv_powerplant','ego
 
 INSERT INTO supply.ego_dp_res_powerplant
 	SELECT	'v0.3.0',
-		*
-	FROM	model_draft.ego_supply_res_powerplant;
+  		id,
+  		start_up_date,
+  		electrical_capacity,
+  		generation_type,
+  		generation_subtype,
+  		thermal_capacity,
+  		city,
+  		postcode,
+  		address,
+  		lon,
+  		lat,
+  		gps_accuracy,
+  		validation,
+  		notification_reason,
+  		eeg_id,
+  		tso,
+  		tso_eic,
+  		dso_id,
+  		dso,
+  		voltage_level_var,
+  		network_node,
+  		power_plant_id,
+  		source,
+  		comment,
+  		geom,
+  		subst_id,
+  		otg_id,
+  		un_id,
+  		voltage_level,
+  		la_id,
+  		mvlv_subst_id,
+  		rea_sort,
+  		rea_flag,
+  		rea_geom_line,
+  		rea_geom_new,
+		preversion, 
+		flag, 
+		scenario, 
+		nuts
+
+	FROM	model_draft.ego_dp_supply_res_powerplant;
 
 -- ego scenario log (version,io,schema_name,table_name,script_name,comment)
 SELECT ego_scenario_log('v0.3.0','result','supply','ego_dp_res_powerplant','ego_dp_versioning.sql','versioning');

preprocessing/sql_snippets/ego_dp_conv_by_scenario.sql

@@ -13,8 +13,6 @@ __author__ = "wolfbunke"
 Notes:
 ------
    
-  Part I:
-           Set up Status Quo data and create standardized table of all scenarios
   Part II:
             Power plants by NEP 2035 scenario data
   Part III:
@@ -30,213 +28,6 @@ Documentation:
   
 */
 
--- ego scenario log (version,io,schema_name,table_name,script_name,comment)
-SELECT ego_scenario_log('v0.3.0','input','supply','ego_dp_supply_conv_powerplant',' .sql','');
-
-DROP TABLE IF EXISTS model_draft.ego_dp_supply_conv_powerplant CASCADE;
-CREATE TABLE model_draft.ego_dp_supply_conv_powerplant
-(
-  preversion text NOT NULL,
-  id integer NOT NULL,
-  bnetza_id text,
-  company text,
-  name text,
-  postcode text,
-  city text,
-  street text,
-  state text,
-  block text,
-  commissioned_original text,
-  commissioned double precision,
-  retrofit double precision,
-  shutdown double precision,
-  status text,
-  fuel text,
-  technology text,
-  type text,
-  eeg text,
-  chp text,
-  capacity double precision,
-  capacity_uba double precision,
-  chp_capacity_uba double precision,
-  efficiency_data double precision,
-  efficiency_estimate double precision,
-  network_node text,
-  voltage text,
-  network_operator text,
-  name_uba text,
-  lat double precision,
-  lon double precision,
-  comment text,
-  geom geometry(Point,4326),
-  voltage_level smallint,
-  subst_id bigint,
-  otg_id bigint,
-  un_id bigint,
-  la_id integer,
-  scenario text,
-  flag text,
-  nuts varchar,
-  CONSTRAINT ego_dp_supply_conv_powerplant_pkey PRIMARY KEY (preversion,id,scenario)
-)
-WITH (
-  OIDS=FALSE
-);
-
-ALTER TABLE model_draft.ego_dp_supply_conv_powerplant
-  OWNER TO oeuser;
-  
-GRANT ALL ON TABLE model_draft.ego_dp_supply_conv_powerplant TO oeuser;
-
---DROP INDEX model_draft.ego_dp_supply_res_powerplant_idx;
-CREATE INDEX ego_dp_supply_conv_powerplant_idx
-  ON model_draft.ego_dp_supply_conv_powerplant
-  USING gist
-  (geom);
--- metadata description
-
-COMMENT ON TABLE model_draft.ego_dp_supply_conv_powerplant
- IS 
-  '{
-	"title": "eGo Conventional power plants in Germany by Scenario",
-	"description": "This dataset contains an augmented and corrected power plant list based on the power plant list provided by the OPSD (BNetzA and UBA) and NEP Kraftwerksliste 2015 for the scenario B1-2035 and the ZNES scenario eGo 100 in 2050.",
-	"language": [ "eng", "ger" ],
-	"spatial": 
-		{"location": "Germany",
-		"extent": "europe",
-		"resolution": "100 m"},
-	"temporal": 
-		{"reference_date": "2016-01-01",
-		"start": "1900-01-01",
-		"end": "2049-12-31",
-		"resolution": ""},
-	"sources": [
-		{"name": "eGo data processing", 
-		"description": "Scripts with allocate Geometry by OpenStreetMap Objects or create future scenarios by high resolution geo-allocation", 
-		"url": "https://github.com/openego/data_processing", 
-		"license": "GNU Affero General Public License Version 3 (AGPL-3.0)", 
-		"copyright": "© ZNES Europa-Universität Flensburg"},
-		
-		{"name": "Open Power System Data (OPSD)",
-                "url":  "http://data.open-power-system-data.org/conventional_power_plants/2016-02-08/",
-                "license": "Creative Commons Attribution 4.0 International", 
-		"copyright": "© Open Power System Data. 2017"}, 
-
-		{"name": "Bundesnetzagentur (BNetzA)", 
-		"description": "The Federal Network Agency for Electricity, Gas, Telecommunications, Posts and Railway Data is in Germany data provider of power plant", 
-		"url": "https://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/ErneuerbareEnergien/Anlagenregister/Anlagenregister_Veroeffentlichung/Anlagenregister_Veroeffentlichungen_node.html", 
-		"license": "Creative Commons Namensnennung-Keine Bearbeitung 3.0 Deutschland Lizenz", 
-		"copyright": "© Bundesnetzagentur für Elektrizität, Gas, Telekommunikation, Post und Eisenbahnen; Pressestelle"}
-		 ],
-	"license": [
-		{"id": "ODbL-1.0",
-		"name": "Open Data Commons Open Database License 1.0",
-		"version": "1.0",
-		"url": "https://opendatacommons.org/licenses/odbl/1.0/",
-		"instruction": "You are free: To Share, To Create, To Adapt; As long as you: Attribute, Share-Alike, Keep open!",
-		"copyright": "© ZNES Europa-Universität Flensburg"} ],
-	"contributors": [
-		{"name": "wolfbunke", "email": " ", "date": "01.06.2017", "comment": "Create and restructure scripts and table"}],
-	"resources": [
-		{"name": "model_draft.ego_dp_supply_conv_powerplant",		
-		"format": "PostgreSQL",
-		"fields": [
-				{"name": "preversion", "description": "Preversion ID of data preprocessing", "unit": "" },
-				{"name": "id", "description": "Unique identifier", "unit": "" },
-				{"name": "bnetza_id", "description": "Bundesnetzagentur unit ID", "unit": " " },			
-				{"name": "company", "description": "Name of company", "unit": " " },				
-				{"name": "name", "description": "name of unit ", "unit": " " },				
-				{"name": "postcode", "description": "postcode ", "unit": " " },				
-				{"name": "city", "description": "Name of City", "unit": " " },				
-				{"name": "street", "description": "Street name, address", "unit": " " },				
-				{"name": "state", "description": "Name of federate state of location", "unit": " " },				
-				{"name": "block", "description": "Power plant block", "unit": " " },	
-				{"name": "commissioned_original", "description": "Year of commissioning (raw data)", "unit": " " },	
-				{"name": "commissioned", "description": "Year of commissioning", "unit": " " },	
-				{"name": "retrofit", "description": "Year of modernization according to UBA data", "unit": " " },	
-				{"name": "shutdown", "description": "Year of decommissioning", "unit": " " },	
-				{"name": "status", "description": "Power plant status", "unit": " " },	
-				{"name": "fuel", "description": "Used fuel or energy source", "unit": " " },	
-				{"name": "technology", "description": "Power plant technology or sort", "unit": " " },	
-				{"name": "type", "description": "Purpose of the produced power", "unit": " " },	
-				{"name": "eeg", "description":  "Status of being entitled to a renumeration", "unit": " " },	
-				{"name": "chp", "description": "Status of being able to supply heat", "unit": " " },	
-				{"name": "capacity", "description": "Power capacity", "unit": " " },	
-				{"name": "capacity_uba", "description": "Power capacity according to UBA data", "unit": " " },
-				{"name": "chp_capacity_uba", "description":  "Heat capacity according to UBA data", "unit": " " },	
-				{"name": "efficiency_data", "description": "Proportion between power output and input", "unit": " " },	
-				{"name": "efficiency_estimate", "description": "Estimated proportion between power output and input", "unit": " " },
-				{"name": "network_node", "description":  "Connection point to the electricity grid", "unit": " " },
-				{"name": "voltage", "description": "Grid or transformation level of the network node", "unit": " " },
-				{"name": "network_operator", "description": "Network operator of the grid or transformation level", "unit": " " },
-				{"name": "name_uba", "description": "Power plant name according to UBA data", "unit": " " },
-				{"name": "lat", "description": "Precise geographic coordinates - latitude", "unit": " " },
-				{"name": "lon", "description": "Precise geographic coordinates - longitude", "unit": " " },
-				{"name": "comment", "description": "Further comments", "unit": " " },
-				{"name": "geom", "description": "Geometry Point", "unit": " " },
-				{"name": "voltage_level", "description": " ", "unit": " " },
-				{"name": "subst_id", "description": "Unique identifier of related substation", "unit": "" },
-				{"name": "otg_id", "description": "Unique identifier of related substation from osmTGmod", "unit": "" },
-				{"name": "un_id", "description": "Unique identifier of RES and CONV power plants", "unit": "" },
-				{"name": "la_id", "description": "Unique identifier of RES and CONV power plants", "unit": "" },									
-				{"name": "scenario", "description": "Name of scenario", "unit": "" },
-				{"name": "flag", "description": "Flag of scenario changes of an power plant unit (repowering, decommission or commissioning).", "unit": "" },
-				{"name": "nuts", "description": "NUTS ID).", "unit": ""} ] } ],
-		"meta_version": "1.3" }';
-	  
--- select description
-SELECT obj_description('model_draft.ego_dp_supply_conv_powerplant'::regclass)::json;
-
---------------------------------------------------------------------------------
--- Part I
---          Insert conventional power plants Scenarios: Status-Quo
---------------------------------------------------------------------------------
-
-INSERT INTO model_draft.ego_dp_supply_conv_powerplant
-	SELECT 
-	  'v0.3.0'::text  as preversion,
-	  gid as id,
-	  bnetza_id,
-	  company,
-	  name,
-	  postcode,
-	  city,
-	  street,
-	  state,
-	  block,
-	  commissioned_original,
-	  commissioned,
-	  retrofit,
-	  shutdown,
-	  status,
-	  fuel,
-	  technology,
-	  type,
-	  eeg,
-	  chp,
-	  capacity,
-	  capacity_uba,
-	  chp_capacity_uba,
-	  efficiency_data,
-	  efficiency_estimate,
-	  network_node,
-	  voltage,
-	  network_operator,
-	  name_uba,
-	  lat,
-	  lon,
-	  comment,
-	  geom,
-	  voltage_level,
-	  subst_id,
-	  otg_id,
-	  un_id,
-	  NULL::int as la_id,
-	  'Status Quo'::text as scenario,
-	  NULL::text as flag,
-	  NULL::text as nuts
-	FROM
-	  model_draft.ego_supply_conv_powerplant;
 
 --------------------------------------------------------------------------------
 -- Part II