From 072e2496268eb166cb46da321c024aaf5a3712c9 Mon Sep 17 00:00:00 2001 From: MarlonSchlemminger Date: Wed, 11 Apr 2018 18:16:49 +0200 Subject: [PATCH 01/36] fix overwriting of p_max_pu --- dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql index b274abc3..754bada0 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql @@ -1,4 +1,4 @@ -/* +/* Missing parameters necessary for calculating a linear optimal power flow (LOPF) are added to the existing data. This includes marginal costs per technology, which is composed of specific operating cost, fuel costs and CO2 costs according to renpass_gis, NEP 2014 scenario. @@ -96,7 +96,8 @@ FROM ( ) AS T1 ) AS T2 GROUP BY T2.generator_id -) T3 WHERE T3.generator_id = Y.generator_id; +) T3 WHERE T3.generator_id = Y.generator_id +AND Y.p_max_pu IS NULL; DELETE FROM model_draft.ego_grid_pf_hv_storage WHERE scn_name IN ('Status Quo', 'NEP 2035', 'eGo 100') AND source = 16; From 8780cdb9961ad3c091707f5b55298a695728a02c Mon Sep 17 00:00:00 2001 From: ulfmueller Date: Mon, 11 Jun 2018 15:49:41 +0200 Subject: [PATCH 02/36] added sql scripts for creating version specific dumps for grid.ego_pf_hv-tables by creating and deleting temporary tables in model_draft --- ...version_specific_temp_ego_pf_hv_tables.sql | 14 + ...version_specific_temp_ego_pf_hv_tables.sql | 1987 +++++++++++++++++ 2 files changed, 2001 insertions(+) create mode 100644 utilities/Delete_version_specific_temp_ego_pf_hv_tables.sql create mode 100644 utilities/prepare_version_specific_temp_ego_pf_hv_tables.sql diff --git a/utilities/Delete_version_specific_temp_ego_pf_hv_tables.sql b/utilities/Delete_version_specific_temp_ego_pf_hv_tables.sql new file mode 100644 index 00000000..a2b14d58 --- /dev/null +++ b/utilities/Delete_version_specific_temp_ego_pf_hv_tables.sql @@ -0,0 +1,14 @@ +DROP TABLE model_draft.ego_grid_pf_hv_bus_v030 CASCADE; +DROP TABLE model_draft.ego_grid_pf_hv_generator_v030 CASCADE; +DROP TABLE model_draft.ego_grid_pf_hv_generator_pq_set_v030 CASCADE; +DROP TABLE model_draft.ego_grid_pf_hv_line_v030 CASCADE; +DROP TABLE model_draft.ego_grid_pf_hv_link_v030 CASCADE; +DROP TABLE model_draft.ego_grid_pf_hv_load_v030 CASCADE; +DROP TABLE model_draft.ego_grid_pf_hv_load_pq_set_v030 CASCADE; +DROP TABLE model_draft.ego_grid_pf_hv_storage_v030 CASCADE; +DROP TABLE model_draft.ego_grid_pf_hv_storage_pq_set_v030 CASCADE; +DROP TABLE model_draft.ego_grid_pf_hv_transformer_v030 CASCADE; +DROP TABLE model_draft.ego_pf_hv_source_v032 CASCADE; +DROP TABLE model_draft.ego_grid_pf_hv_temp_resolution_v032 CASCADE; +( + diff --git a/utilities/prepare_version_specific_temp_ego_pf_hv_tables.sql b/utilities/prepare_version_specific_temp_ego_pf_hv_tables.sql new file mode 100644 index 00000000..47c62769 --- /dev/null +++ b/utilities/prepare_version_specific_temp_ego_pf_hv_tables.sql @@ -0,0 +1,1987 @@ +CREATE TABLE model_draft.ego_grid_pf_hv_bus_v032 +( + scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying, + bus_id bigint NOT NULL, + v_nom double precision, + current_type text DEFAULT 'AC'::text, + v_mag_pu_min double precision DEFAULT 0, + v_mag_pu_max double precision, + geom geometry(Point,4326), + CONSTRAINT bus_v032_data_pkey PRIMARY KEY (bus_id, scn_name) +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_bus_v032 + OWNER TO oeuser; +GRANT ALL ON TABLE model_draft.ego_grid_pf_hv_bus_v032 TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_bus_v032 + IS E'{ + "title": "eGo hv powerflow - bus", + "description": "Buses relevant for eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "location": "", + "extend": "Germany", + "resolution": "" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": " ", + "url": "https://github.com/openego/data_processing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 Reiner Lemoine Institut" + }, + { + "name": "OpenStreetMap", + "description": " ", + "url": "http://www.openstreetmap.org/", + "license": "Open Database License (ODbL) v1.0", + "copyright": "\\u00a9 OpenStreetMap contributors" + } + ], + "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": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems" + }, + "contributors": [ + { + "name": "IlkaCu", + "email": "", + "date": "26.04.2017", + "comment": "Create table" + }, + { + "name": "KilianZimmerer", + "email": "", + "date": "2017-6-27", + "comment": "Update metadata to v1.3" + } + ], + "resources": [ + { + "name": "model_draft.ego_grid_pf_hv_bus", + "fromat": "sql", + "fields": [ + { + "name": "scn_name", + "description": "name of corresponding scenario", + "unit": "" + }, + { + "name": "bus_id", + "description": "unique id for bus, equivalent to id from osmtgmod", + "unit": "" + }, + { + "name": "v_nom", + "description": "nominal voltage", + "unit": "kV" + }, + { + "name": "current_type", + "description": "current type - AC or DC", + "unit": "" + }, + { + "name": "v_mag_pu_min", + "description": "Minimum desired voltage, per unit of v_nom", + "unit": "per unit" + }, + { + "name": "v_mag_pu_max", + "description": "Maximum desired voltage, per unit of v_nom", + "unit": "per unit" + }, + { + "name": "geom", + "description": "geometry of bus", + "unit": "..." + } + ] + } + ], + "metadata_version": "1.3" +}'; + + +INSERT INTO model_draft.ego_grid_pf_hv_bus_v032 + SELECT scn_name, + bus_id, + v_nom , + current_type, + v_mag_pu_min, + v_mag_pu_max, + geom + FROM grid.ego_pf_hv_bus + WHERE version = 'v0.3.2'; + + + +CREATE TABLE model_draft.ego_grid_pf_hv_generator_v032 +( + scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying, + generator_id bigint NOT NULL, + bus bigint, + dispatch text DEFAULT 'flexible'::text, + control text DEFAULT 'PQ'::text, + p_nom double precision DEFAULT 0, + p_nom_extendable boolean DEFAULT false, + p_nom_min double precision DEFAULT 0, + p_nom_max double precision, + p_min_pu_fixed double precision DEFAULT 0, + p_max_pu_fixed double precision DEFAULT 1, + sign double precision DEFAULT 1, + source bigint, + marginal_cost double precision, + capital_cost double precision, + efficiency double precision, + CONSTRAINT generator_v032_pkey PRIMARY KEY (generator_id, scn_name) +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_generator_v032 + OWNER TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_generator_v032 + IS E'{ + "title": "eGo hv powerflow - generator", + "description": "Generators relevant for eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "resolution": "", + "location": "", + "extend": "Germany" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "url": "https://github.com/openego/data_processing", + "copyright": "\\u00a9 Reiner Lemoine Institut", + "name": "eGo dataprocessing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "description": " " + }, + { + "url": "http://www.openstreetmap.org/", + "copyright": "\\u00a9 OpenStreetMap contributors", + "name": "OpenStreetMap", + "license": "Open Database License (ODbL) v1.0", + "description": " " + }, + { + "url": "http://data.open-power-system-data.org/conventional_power_plants/2016-02-08/", + "copyright": "\\u00a9 2016 Open Power System Data", + "name": "Open Power System Data (OPSD)", + "license": "MIT Licence", + "description": " " + }, + { + "url": "www.energymap.info", + "copyright": "", + "name": "EnergyMap", + "license": "", + "description": " " + }, + { + "url": "http://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Versorgungssicherheit/Erzeugungskapazitaeten/Kraftwerksliste/kraftwerksliste-node.html", + "copyright": "", + "name": "Bundesnetzagentur (BNetzA)", + "license": "", + "description": " " + } + ], + "license": { + "name": "Open Data Commons Open Database License 1.0", + "copyright": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems", + "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!", + "version": "1.0", + "id": "ODbL-1.0" + }, + "contributors": [ + { + "date": "26.04.2017", + "comment": "Create table", + "name": "IlkaCu", + "email": "" + }, + { + "date": "2017-9-12", + "comment": "Update metadata to v1.3", + "name": "KilianZimmerer", + "email": "" + } + ], + "resources": [ + { + "fields": [ + + { + "name": "scn_name", + "unit": "", + "description": "name of corresponding scenario" + }, + { + "name": "generator_id", + "unit": "", + "description": "ID of corresponding generator" + }, + { + "name": "bus", + "unit": "", + "description": "id of associated bus" + }, + { + "name": "dispatch", + "unit": "", + "description": "Controllability of active power dispatch, must be flexible or variable." + }, + { + "name": "control", + "unit": "", + "description": "P,Q,V control strategy, must be PQ, PV or Slack." + }, + { + "name": "p_nom", + "unit": "MW", + "description": "Nominal power" + }, + { + "name": "p_nom_extendable", + "unit": "", + "description": "Switch to allow capacity p_nom to be extended" + }, + { + "name": "p_nom_min", + "unit": "", + "description": "If p_nom is extendable, set its minimum value" + }, + { + "name": "p_nom_max", + "unit": "", + "description": "If p_nom is extendable, set its maximum value (e.g. limited by potential)" + }, + { + "name": "p_min_pu_fixed", + "unit": "per unit", + "description": "If control=flexible this gives the minimum output per unit of p_nom" + }, + { + "name": "p_max_pu_fixed", + "unit": "per unit", + "description": "If control=flexible this gives the maximum output per unit of p_nom, equivalent to a de-rating factor." + }, + { + "name": "sign", + "unit": "", + "description": "power sign" + }, + { + "name": "source", + "unit": "", + "description": "prime mover energy carrier" + }, + { + "name": "marginal_cost", + "unit": "EUR/MWh", + "description": "Marginal cost of production of 1 MWh" + }, + { + "name": "capital_cost", + "unit": "EUR/MW", + "description": "Capital cost of extending p_nom by 1 MW" + }, + { + "name": "efficiency", + "unit": "per unit", + "description": "Ratio between primary energy and electrical energy" + } + ], + "name": "grid.ego_pf_hv_generator", + "format": "sql" + } + ], + "metadata_version": "1.3" +}'; + + +INSERT INTO model_draft.ego_grid_pf_hv_generator_v032 + SELECT scn_name, + generator_id, + bus, + dispatch, + control, + p_nom, + p_nom_extendable, + p_nom_min, + p_nom_max, + p_min_pu_fixed, + p_max_pu_fixed, + sign, + source, + marginal_cost, + capital_cost, + efficiency + FROM grid.ego_pf_hv_generator + WHERE version = 'v0.3.2'; + + +CREATE TABLE model_draft.ego_grid_pf_hv_generator_pq_set_v032 +( + scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying, + generator_id bigint NOT NULL, + temp_id integer NOT NULL, + p_set double precision[], + q_set double precision[], + p_min_pu double precision[], + p_max_pu double precision[], + CONSTRAINT generator_pq_set__v032pkey PRIMARY KEY (generator_id, temp_id, scn_name), + CONSTRAINT generator_pq_set_temp_fkey FOREIGN KEY (temp_id) + REFERENCES model_draft.ego_grid_pf_hv_temp_resolution (temp_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_generator_pq_set_v032 + OWNER TO oeuser; +GRANT ALL ON TABLE model_draft.ego_grid_pf_hv_generator_pq_set_v032 TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_generator_pq_set_v032 + IS E'{ + "title": "eGo hv powerflow - generator time series", + "description": "Time series of generators relevant for eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "location": "", + "extend": "Germany", + "resolution": "" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": " ", + "url": "https://github.com/openego/data_processing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 Europa-Universitaet Flensburg, Center for Sustainable Energy Systems" + }, + { + "name": "oemof feedinlib", + "description": " ", + "url": "https://github.com/oemof/feedinlib", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 oemof developing group" + } + ], + "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": "\\u00a9 Europa-Universitaet Flensburg, Center for Sustainable Energy Systems" + }, + "contributors": [ + { + "name": "IlkaCu", + "email": "", + "date": "26.04.2017", + "comment": "Create table" + }, + { + "name": "KilianZimmerer", + "email": "", + "date": "2017-6-27", + "comment": "Update metadata to v1.3" + } + ], + "resources": [ + { + "name": "model_draft.ego_grid_pf_hv_generator_pq_set", + "fromat": "sql", + "fields": [ + { + "name": "scn_name", + "description": "name of corresponding scenario", + "unit": "" + }, + { + "name": "generator_id", + "description": "ID of corresponding generator", + "unit": "" + }, + { + "name": "temp_id", + "description": "ID of temporal resolution", + "unit": "" + }, + { + "name": "p_set", + "description": "active power set point (for PF)", + "unit": "MW" + }, + { + "name": "q_set", + "description": "reactive power set point (for PF)", + "unit": "MVar" + }, + { + "name": "p_min_pu", + "description": "If control=variable this gives the minimum output for each snapshot per unit of p_nom for the OPF", + "unit": "per unit" + }, + { + "name": "p_max_pu", + "description": "If control=variable this gives the maximum output for each snapshot per unit of p_nom for the OPF", + "unit": "per unit" + } + ] + } + ], + "metadata_version": "1.3" +}'; + + +INSERT INTO model_draft.ego_grid_pf_hv_generator_pq_set_v032 + SELECT scn_name, + generator_id, + temp_id, + p_set, + q_set, + p_min_pu, + p_max_pu + FROM grid.ego_pf_hv_generator_pq_set + WHERE version = 'v0.3.2'; + + + +CREATE TABLE model_draft.ego_grid_pf_hv_line_v032 +( + scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying, + line_id bigint NOT NULL, + bus0 bigint, + bus1 bigint, + x numeric DEFAULT 0, + r numeric DEFAULT 0, + g numeric DEFAULT 0, + b numeric DEFAULT 0, + s_nom numeric DEFAULT 0, + s_nom_extendable boolean DEFAULT false, + s_nom_min double precision DEFAULT 0, + s_nom_max double precision, + capital_cost double precision, + length double precision, + cables integer, + frequency numeric, + terrain_factor double precision DEFAULT 1, + geom geometry(MultiLineString,4326), + topo geometry(LineString,4326), + CONSTRAINT line_data_v032_pkey PRIMARY KEY (line_id, scn_name) +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_line_v032 + OWNER TO oeuser; +GRANT ALL ON TABLE model_draft.ego_grid_pf_hv_line_v032 TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_line_v032 + IS E'{ + "title": "eGo hv powerflow - lines", + "description": "lines in eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "location": "", + "extend": "Germany", + "resolution": "" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": " ", + "url": "https://github.com/openego/data_processing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems" + }, + { + "name": "OpenStreetMap", + "description": " ", + "url": "http://www.openstreetmap.org/", + "license": "Open Database License (ODbL) v1.0", + "copyright": "\\u00a9 OpenStreetMap contributors" + }, + { + "name": "osmTGmod", + "description": " ", + "url": "https://github.com/openego/osmTGmod", + "license": "Apache License 2.0", + "copyright": "\\u00a9 Wuppertal Institut" + } + ], + "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": "© DLR Institute for Networked Energy Systems" + }, + "contributors": [ + { + "name": "IlkaCu", + "email": "", + "date": "26.04.2017", + "comment": "Create table" + }, + { + "name": "KilianZimmerer", + "email": "", + "date": "2017-6-27", + "comment": "Update metadata to v1.3" + } + ], + "resources": [ + { + "name": "model_draft.ego_grid_pf_hv_line", + "fromat": "sql", + "fields": [ + { + "name": "scn_name", + "description": "name of corresponding scenario", + "unit": "" + }, + { + "name": "line_id", + "description": "ID of line", + "unit": "" + }, + { + "name": "bus0", + "description": "name of first bus to which branch is attached", + "unit": "" + }, + { + "name": "bus1", + "description": "name of second bus to which branch is attached", + "unit": "" + }, + { + "name": "x", + "description": "Series reactance", + "unit": "Ohm" + }, + { + "name": "r", + "description": "Series resistance", + "unit": "Ohm" + }, + { + "name": "g", + "description": "Shunt conductivity", + "unit": "Siemens" + }, + { + "name": "b", + "description": "Shunt susceptance", + "unit": "Siemens" + }, + { + "name": "s_nom", + "description": "Limit of apparent power which can pass through branch", + "unit": "MVA" + }, + { + "name": "s_nom_extendable", + "description": "Switch to allow capacity s_nom to be extended", + "unit": "" + }, + { + "name": "s_nom_min", + "description": "If s_nom is extendable, set its minimum value", + "unit": "MVA" + }, + { + "name": "s_nom_max", + "description": "If s_nom is extendable in OPF, set its maximum value", + "unit": "MVA" + }, + { + "name": "capital_cost", + "description": "capital cost of extending s_nom by 1 MVA", + "unit": "EUR/MVA" + }, + { + "name": "length", + "description": "length of line", + "unit": "km" + }, + { + "name": "cables", + "description": "...", + "unit": "" + }, + { + "name": "frequency", + "description": "frequency of line", + "unit": "" + }, + { + "name": "terrain_factor", + "description": "...", + "unit": "" + }, + { + "name": "geom", + "description": "geometry that depict the real route of the line", + "unit": "" + }, + { + "name": "topo", + "description": "topology that depicts a direct connection between both busses", + "unit": "..." + } + ] + } + ], + "metadata_version": "1.3" +}'; + + +INSERT INTO model_draft.ego_grid_pf_hv_line_v032 + SELECT + scn_name, + line_id, + bus0, + bus1, + x, + r, + g, + b, + s_nom, + s_nom_extendable, + s_nom_min, + s_nom_max, + capital_cost, + length, + cables, + frequency, + terrain_factor, + geom, + topo + FROM grid.ego_pf_hv_line + WHERE version = 'v0.3.2'; + + +CREATE TABLE model_draft.ego_grid_pf_hv_link_v032 +( + scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying, + link_id bigint NOT NULL, + bus0 bigint, + bus1 bigint, + efficiency double precision DEFAULT 1, + marginal_cost double precision DEFAULT 0, + p_nom numeric DEFAULT 0, + p_nom_extendable boolean DEFAULT false, + p_nom_min double precision DEFAULT 0, + p_nom_max double precision, + capital_cost double precision, + length double precision, + terrain_factor double precision DEFAULT 1, + geom geometry(MultiLineString,4326), + topo geometry(LineString,4326), + CONSTRAINT hv_link_data_v032_pkey PRIMARY KEY (link_id, scn_name) +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_link_v032 + OWNER TO oeuser; +GRANT ALL ON TABLE model_draft.ego_grid_pf_hv_link_v032 TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_link_v032 + IS E'{ + "title": "eGo hv powerflow - links", + "description": "links in eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "location": "", + "extend": "Germany", + "resolution": "" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": " ", + "url": "https://github.com/openego/data_processing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems" + }, + { + "name": "OpenStreetMap", + "description": " ", + "url": "http://www.openstreetmap.org/", + "license": "Open Database License (ODbL) v1.0", + "copyright": "\\u00a9 OpenStreetMap contributors" + } + ], + "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": "\\u00a9 Flensburg University of Applied Sciences, Centre for Sustainable Energy Systems" + }, + "contributors": [ + { + "name": "IlkaCu", + "email": "", + "date": "08.02.2018", + "comment": "Create table" + } + ], + "resources": [ + { + "name": "model_draft.ego_grid_pf_hv_link", + "fromat": "sql", + "fields": [ + { + "name": "scn_name", + "description": "name of corresponding scenario", + "unit": "" + }, + { + "name": "link_id", + "description": "ID of line", + "unit": "" + }, + { + "name": "bus0", + "description": "name of first bus to which branch is attached", + "unit": "" + }, + { + "name": "bus1", + "description": "name of second bus to which branch is attached", + "unit": "" + }, + { + "name": "efficiency", + "description": "efficiency of power transfer from bus0 to bus1", + "unit": "" + }, + { + "name": "p_nom", + "description": "limit of active power which can pass through link", + "unit": "MVA" + }, + { + "name": "p_nom_extendable", + "description": "switch to allow capacity p_nom to be extended in OPF", + "unit": "" + }, + { + "name": "p_nom_min", + "description": "minimum value, if p_nom is extendable", + "unit": "MVA" + }, + { + "name": "p_nom_max", + "description": "maximum value, if p_nom is extendable", + "unit": "MVA" + }, + { + "name": "capital_cost", + "description": "capital cost of extending p_nom by 1 MVA", + "unit": "EUR/MVA" + }, + { + "name": "length", + "description": "length of line", + "unit": "km" + }, + { + "name": "terrain_factor", + "description": "...", + "unit": "" + }, + { + "name": "geom", + "description": "geometry that depict the real route of the line", + "unit": "" + }, + { + "name": "topo", + "description": "topology that depicts a direct connection between both busses", + "unit": "..." + } + ] + } + ], + "metadata_version": "1.3" +}'; + + +INSERT INTO model_draft.ego_grid_pf_hv_link_v032 + SELECT + scn_name, + link_id, + bus0 , + bus1 , + efficiency, + marginal_cost, + p_nom , + p_nom_extendable, + p_nom_min , + p_nom_max, + capital_cost, + length, + terrain_factor, + geom, + topo + FROM grid.ego_pf_hv_link + WHERE version = 'v0.3.2'; + + +CREATE TABLE model_draft.ego_grid_pf_hv_load_v032 +( + scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying, + load_id bigint NOT NULL, + bus bigint, + sign double precision DEFAULT '-1'::integer, + e_annual double precision, + CONSTRAINT load_data_v032_pkey PRIMARY KEY (load_id, scn_name) +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_load_v032 + OWNER TO oeuser; +GRANT ALL ON TABLE model_draft.ego_grid_pf_hv_load_v032 TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_load_v032 + IS E'{ + "title": "eGo hv powerflow - loads", + "description": "loads in eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "location": "", + "extend": "Germany", + "resolution": "" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": " ", + "url": "https://github.com/openego/data_processing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems" + }, + { + "name": "OpenStreetMap", + "description": " ", + "url": "http://www.openstreetmap.org/", + "license": "Open Database License (ODbL) v1.0", + "copyright": "\\u00a9 OpenStreetMap contributors" + }, + { + "name": "L\\u00e4nderarbeitskreis Energiebilanzen", + "description": " ", + "url": "http://www.lak-energiebilanzen.de/seiten/energiebilanzenLaender.cfm", + "license": " ", + "copyright": " " + }, + { + "name": "Bayerisches Landesamt f\\u00fcr Statistik und Datenverarbeitung", + "description": " ", + "url": "http://www.stmwi.bayern.de/fileadmin/user_upload/stmwivt/Themen/Energie_und_Rohstoffe/Dokumente_und_Cover/Energiebilanz/2014/B-03_bilanzjo_mgh_2014-03-07.pdf", + "license": " ", + "copyright": " " + }, + { + "name": "Hessisches Statistisches Landesamt", + "description": " ", + "url": "http://www.statistik-hessen.de/publikationen/download/277/index.html", + "license": " ", + "copyright": " " + }, + { + "name": "Statistisches Amt Mecklenburg-Vorpommern", + "description": " ", + "url": "https://www.destatis.de/GPStatistik/servlets/MCRFileNodeServlet/MVHeft_derivate_00000168/E453_2011_00a.pdf;jsessionid=CD300CD3A06FF85FDEA864FF4D91D880", + "license": " ", + "copyright": " " + }, + { + "name": "Nieders\\u00e4chsisches Ministerium f\\u00fcr Umwelt, Energie und Klimaschutz", + "description": " ", + "url": "http://www.umwelt.niedersachsen.de/energie/daten/co2bilanzen/niedersaechsische-energie--und-co2-bilanzen-2009-6900.html", + "license": " ", + "copyright": " " + }, + { + "name": "Statistische Berichte Energiebilanz und CO2-Bilanz in Nordrhein-Westfalen 2011", + "description": " ", + "url": "https://webshop.it.nrw.de", + "license": " ", + "copyright": " " + }, + { + "name": "Statistisches Landesamt Sachsen-Anhalt", + "description": " ", + "url": "http://www.stala.sachsen-anhalt.de/download/stat_berichte/6E402_j_2011.pdf", + "license": " ", + "copyright": " " + }, + { + "name": "Th\\u00fcringer Landesamt f\\u00fcr Statistik", + "description": " ", + "url": "http://www.statistik.thueringen.de/webshop/pdf/2011/05402_2011_00.pdf", + "license": " ", + "copyright": " " + } + ], + "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": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems" + }, + "contributors": [ + { + "name": "IlkaCu", + "email": "", + "date": "26.04.2017", + "comment": "Create table" + }, + { + "name": "KilianZimmerer", + "email": "", + "date": "2017-6-27", + "comment": "Update metadata to v1.3" + } + ], + "resources": [ + { + "name": "model_draft.ego_grid_pf_hv_load", + "fromat": "sql", + "fields": [ + { + "name": "scn_name", + "description": "name of corresponding scenario", + "unit": "" + }, + { + "name": "load_id", + "description": "unique id", + "unit": "" + }, + { + "name": "bus", + "description": "id of associated bus", + "unit": "" + }, + { + "name": "sign", + "description": "power sign", + "unit": "" + }, + { + "name": "e_annual", + "description": "annual electricity consumption", + "unit": "GWh" + } + ] + } + ], + "metadata_version": "1.3" +}'; + +INSERT INTO model_draft.ego_grid_pf_hv_load_v032 + SELECT + scn_name, + load_id, + bus , + sign , + e_annual + FROM grid.ego_pf_hv_load + WHERE version = 'v0.3.2'; + + +CREATE TABLE model_draft.ego_grid_pf_hv_load_pq_set_v032 +( + scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying, + load_id bigint NOT NULL, + temp_id integer NOT NULL, + p_set double precision[], + q_set double precision[], + CONSTRAINT load_pq_set_v032_pkey PRIMARY KEY (load_id, temp_id, scn_name), + CONSTRAINT load_pq_set_temp_fkey FOREIGN KEY (temp_id) + REFERENCES model_draft.ego_grid_pf_hv_temp_resolution (temp_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_load_pq_set_v032 + OWNER TO oeuser; +GRANT ALL ON TABLE model_draft.ego_grid_pf_hv_load_pq_set_v032 TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_load_pq_set_v032 + IS E'{ + "title": "eGo hv powerflow - loads", + "description": "loads in eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "location": "", + "extend": "Germany", + "resolution": "" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": " ", + "url": "https://github.com/openego/data_processing/blob/master/dataprocessing/python_scripts/demand_per_mv_grid_district.py", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 Reiner Lemoine Institut" + } + ], + "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": "\\u00a9 Reiner Lemoine Institut" + }, + "contributors": [ + { + "name": "IlkaCu", + "email": "", + "date": "26.04.2017", + "comment": "Create table" + }, + { + "name": "KilianZimmerer", + "email": "", + "date": "2017-6-27", + "comment": "Update metadata to v1.3" + } + ], + "resources": [ + { + "name": "model_draft.ego_grid_pf_hv_load_pq_set", + "fromat": "sql", + "fields": [ + { + "name": "scn_name", + "description": "name of corresponding scenario", + "unit": "" + }, + { + "name": "load_id", + "description": "unique id", + "unit": "" + }, + { + "name": "temp_id", + "description": "id of temporal resolution", + "unit": "" + }, + { + "name": "p_set", + "description": "active power set point", + "unit": "MW" + }, + { + "name": "q_set", + "description": "reactive power set point", + "unit": "MVar" + } + ] + } + ], + "metadata_version": "1.3" +}'; + +INSERT INTO model_draft.ego_grid_pf_hv_load_pq_set_v032 + SELECT + scn_name, + load_id, + temp_id, + p_set, + q_set + FROM grid.ego_pf_hv_load_pq_set + WHERE version = 'v0.3.2'; + + +CREATE TABLE model_draft.ego_grid_pf_hv_storage_v032 +( + scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying, + storage_id bigint NOT NULL, + bus bigint, + dispatch text DEFAULT 'flexible'::text, + control text DEFAULT 'PQ'::text, + p_nom double precision DEFAULT 0, + p_nom_extendable boolean DEFAULT false, + p_nom_min double precision DEFAULT 0, + p_nom_max double precision, + p_min_pu_fixed double precision DEFAULT 0, + p_max_pu_fixed double precision DEFAULT 1, + sign double precision DEFAULT 1, + source bigint, + marginal_cost double precision, + capital_cost double precision, + efficiency double precision, + soc_initial double precision, + soc_cyclic boolean DEFAULT false, + max_hours double precision, + efficiency_store double precision, + efficiency_dispatch double precision, + standing_loss double precision, + CONSTRAINT storage_data_v032_pkey PRIMARY KEY (storage_id, scn_name), + CONSTRAINT storage_data_source_fkey FOREIGN KEY (source) + REFERENCES model_draft.ego_grid_pf_hv_source (source_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_storage_v032 + OWNER TO oeuser; +GRANT ALL ON TABLE model_draft.ego_grid_pf_hv_storage_v032 TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_storage_v032 + IS E'{ + "title": "eGo hv powerflow - storage", + "description": "Storages relevant for eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "location": "", + "extend": "Germany", + "resolution": "" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": " ", + "url": "https://github.com/openego/data_processing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 Reiner Lemoine Institut" + }, + { + "name": "OpenStreetMap", + "description": " ", + "url": "http://www.openstreetmap.org/", + "license": "Open Database License (ODbL) v1.0", + "copyright": "\\u00a9 OpenStreetMap contributors" + }, + { + "name": "Open Power System Data (OPSD)", + "description": " ", + "url": "http://data.open-power-system-data.org/conventional_power_plants/2016-02-08/", + "license": "MIT Licence", + "copyright": "\\u00a9 2016 Open Power System Data" + }, + { + "name": "Bundesnetzagentur (BNetzA)", + "description": " ", + "url": "http://www.bundesnetzagentur.de/DE/Sachgebiete/ElektrizitaetundGas/Unternehmen_Institutionen/Versorgungssicherheit/Erzeugungskapazitaeten/Kraftwerksliste/kraftwerksliste-node.html", + "license": "", + "copyright": "" + } + ], + "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": "\\u00a9 Europa-Universitaet Flensburg, Center for Sustainable Energy Systems" + }, + "contributors": [ + { + "name": "IlkaCu", + "email": "", + "date": "26.04.2017", + "comment": "Create table" + }, + { + "name": "KilianZimmerer", + "email": "", + "date": "2017-6-27", + "comment": "Update metadata to v1.3" + } + ], + "resources": [ + { + "name": "model_draft.ego_grid_pf_hv_storage", + "fromat": "sql", + "fields": [ + { + "name": "scn_name", + "description": "name of corresponding scenario", + "unit": "" + }, + { + "name": "storage_id", + "description": "ID of corresponding storage", + "unit": "" + }, + { + "name": "bus", + "description": "id of associated bus", + "unit": "" + }, + { + "name": "dispatch", + "description": "Controllability of active power dispatch, must be flexible or variable.", + "unit": "" + }, + { + "name": "control", + "description": "P,Q,V control strategy, must be PQ, PV or Slack.", + "unit": "" + }, + { + "name": "p_nom", + "description": "Nominal power", + "unit": "MW" + }, + { + "name": "p_nom_extendable", + "description": "Switch to allow capacity p_nom to be extended", + "unit": "" + }, + { + "name": "p_nom_min", + "description": "If p_nom is extendable, set its minimum value", + "unit": "" + }, + { + "name": "p_nom_max", + "description": "If p_nom is extendable, set its maximum value (e.g. limited by potential)", + "unit": "" + }, + { + "name": "p_min_pu_fixed", + "description": "If control=flexible this gives the minimum output per unit of p_nom", + "unit": "per unit" + }, + { + "name": "p_max_pu_fixed", + "description": "If control=flexible this gives the maximum output per unit of p_nom, equivalent to a de-rating factor.", + "unit": "per unit" + }, + { + "name": "sign", + "description": "power sign", + "unit": "" + }, + { + "name": "source", + "description": "prime mover energy carrier", + "unit": "" + }, + { + "name": "marginal_cost", + "description": "Marginal cost of production of 1 MWh", + "unit": "EUR/MWh" + }, + { + "name": "capital_cost", + "description": "Capital cost of extending p_nom by 1 MW", + "unit": "EUR/MW" + }, + { + "name": "efficiency", + "description": "Ratio between primary energy and electrical energy", + "unit": "per unit" + }, + { + "name": "soc_initial", + "description": "State of charge before the snapshots in the OPF.", + "unit": "MWh" + }, + { + "name": "soc_cyclic", + "description": "Switch: if True, then state_of_charge_initial is ignored and the initial state of charge is set to the final state of charge for the group of snapshots in the OPF", + "unit": "" + }, + { + "name": "max_hours", + "description": "Maximum state of charge capacity in terms of hours at full output capacity p_nom", + "unit": "hours" + }, + { + "name": "efficiency_store", + "description": "Efficiency of storage on the way into the storage", + "unit": "per unit" + }, + { + "name": "efficiency_dispatch", + "description": "Efficiency of storage on the way out of the storage", + "unit": "per unit" + }, + { + "name": "standing_loss", + "description": "Losses per hour to state of charge", + "unit": "per unit" + } + ] + } + ], + "metadata_version": "1.3" +}'; + + +INSERT INTO model_draft.ego_grid_pf_hv_storage_v032 + SELECT + scn_name, + storage_id, + bus , + dispatch , + control , + p_nom , + p_nom_extendable , + p_nom_min , + p_nom_max , + p_min_pu_fixed , + p_max_pu_fixed , + sign , + source , + marginal_cost , + capital_cost , + efficiency , + soc_initial , + soc_cyclic , + max_hours , + efficiency_store , + efficiency_dispatch , + standing_loss + FROM grid.ego_pf_hv_storage + WHERE version = 'v0.3.2'; + + + +CREATE TABLE model_draft.ego_grid_pf_hv_storage_pq_set_v032 +( + scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying, + storage_id bigint NOT NULL, + temp_id integer NOT NULL, + p_set double precision[], + q_set double precision[], + p_min_pu double precision[], + p_max_pu double precision[], + soc_set double precision[], + inflow double precision[], + CONSTRAINT storage_pq_set_v032_pkey PRIMARY KEY (storage_id, temp_id, scn_name), + CONSTRAINT storage_pq_set_temp_fkey FOREIGN KEY (temp_id) + REFERENCES model_draft.ego_grid_pf_hv_temp_resolution (temp_id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_storage_pq_set_v032 + OWNER TO oeuser; +GRANT ALL ON TABLE model_draft.ego_grid_pf_hv_storage_pq_set_v032 TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_storage_pq_set_v032 + IS E'{ + "title": "eGo hv powerflow - storage time series", + "description": "Time series of storages relevant for eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "location": "", + "extend": "Germany", + "resolution": "" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": " ", + "url": "https://github.com/openego/data_processing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 Europa-Universitaet Flensburg, Center for Sustainable Energy Systems" + }, + { + "name": "oemof feedinlib", + "description": " ", + "url": "https://github.com/oemof/feedinlib", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 oemof developing group" + } + ], + "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": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems" + }, + "contributors": [ + { + "name": "IlkaCu", + "email": "", + "date": "26.04.2017", + "comment": "Create table" + }, + { + "name": "KilianZimmerer", + "email": "", + "date": "2017-6-27", + "comment": "Update metadata to v1.3" + } + ], + "resources": [ + { + "name": "model_draft.ego_grid_pf_hv_storage_pq_set", + "fromat": "sql", + "fields": [ + { + "name": "scn_name", + "description": "name of corresponding scenario", + "unit": "" + }, + { + "name": "storage_id", + "description": "ID of corresponding storage", + "unit": "" + }, + { + "name": "temp_id", + "description": "ID of temporal resolution", + "unit": "" + }, + { + "name": "p_set", + "description": "active power set point (for PF)", + "unit": "MW" + }, + { + "name": "q_set", + "description": "reactive power set point (for PF)", + "unit": "MVar" + }, + { + "name": "p_min_pu", + "description": "If control=variable this gives the minimum output for each snapshot per unit of p_nom for the OPF", + "unit": "per unit" + }, + { + "name": "p_max_pu", + "description": "If control=variable this gives the maximum output for each snapshot per unit of p_nom for the OPF", + "unit": "per unit" + }, + { + "name": "soc_set", + "description": "State of charge set points for snapshots in the OPF", + "unit": "MWh" + }, + { + "name": "inflow", + "description": "Inflow to the state of charge, e.g. due to river inflow in hydro reservoir", + "unit": "MW" + } + ] + } + ], + "metadata_version": "1.3" +}'; + + +INSERT INTO model_draft.ego_grid_pf_hv_storage_pq_set_v032 + SELECT + scn_name, + storage_id, + temp_id, + p_set, + q_set, + p_min_pu, + p_max_pu, + soc_set, + inflow + FROM grid.ego_pf_hv_storage_pq_set + WHERE version = 'v0.3.2'; + + + + +CREATE TABLE model_draft.ego_grid_pf_hv_transformer_v032 +( + scn_name character varying NOT NULL DEFAULT 'Status Quo'::character varying, + trafo_id bigint NOT NULL, + bus0 bigint, + bus1 bigint, + x numeric DEFAULT 0, + r numeric DEFAULT 0, + g numeric DEFAULT 0, + b numeric DEFAULT 0, + s_nom double precision DEFAULT 0, + s_nom_extendable boolean DEFAULT false, + s_nom_min double precision DEFAULT 0, + s_nom_max double precision, + tap_ratio double precision, + phase_shift double precision, + capital_cost double precision DEFAULT 0, + geom geometry(MultiLineString,4326), + topo geometry(LineString,4326), + CONSTRAINT transformer_data_v032_pkey PRIMARY KEY (trafo_id, scn_name) +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_transformer_v032 + OWNER TO oeuser; +GRANT ALL ON TABLE model_draft.ego_grid_pf_hv_transformer_v032 TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_transformer_v032 + IS E'{ + "title": "eGo hv powerflow - transformer", + "description": "transformer in eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "location": "", + "extend": "Germany", + "resolution": "" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": " ", + "url": "https://github.com/openego/data_processing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems" + }, + { + "name": "OpenStreetMap", + "description": " ", + "url": "http://www.openstreetmap.org/", + "license": "Open Database License (ODbL) v1.0", + "copyright": "\\u00a9 OpenStreetMap contributors" + }, + { + "name": "osmTGmod", + "description": " ", + "url": "https://github.com/openego/osmTGmod", + "license": "Apache License 2.0", + "copyright": "\\u00a9 Wuppertal Institut" + } + ], + "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": "© DLR Institute for Networked Energy Systems" + }, + "contributors": [ + { + "name": "IlkaCu", + "email": "", + "date": "26.04.2017", + "comment": "Create table" + }, + { + "name": "KilianZimmerer", + "email": "", + "date": "2017-6-27", + "comment": "Update metadata to v1.3" + } + ], + "resources": [ + { + "name": "model_draft.ego_grid_pf_hv_transformer", + "fromat": "sql", + "fields": [ + { + "name": "scn_name", + "description": "name of corresponding scenario", + "unit": "" + }, + { + "name": "trafo_id", + "description": "ID of line", + "unit": "" + }, + { + "name": "bus0", + "description": "name of first bus to which branch is attached", + "unit": "" + }, + { + "name": "bus1", + "description": "name of second bus to which branch is attached", + "unit": "" + }, + { + "name": "x", + "description": "Series reactance", + "unit": "Ohm" + }, + { + "name": "r", + "description": "Series resistance", + "unit": "Ohm" + }, + { + "name": "g", + "description": "Shunt conductivity", + "unit": "Siemens" + }, + { + "name": "b", + "description": "Shunt susceptance", + "unit": "Siemens" + }, + { + "name": "s_nom", + "description": "Limit of apparent power which can pass through branch", + "unit": "MVA" + }, + { + "name": "s_nom_extendable", + "description": "Switch to allow capacity s_nom to be extended", + "unit": "" + }, + { + "name": "s_nom_min", + "description": "If s_nom is extendable, set its minimum value", + "unit": "MVA" + }, + { + "name": "s_nom_max", + "description": "If s_nom is extendable in OPF, set its maximum value", + "unit": "MVA" + }, + { + "name": "tap_ratio", + "description": "Ratio of per unit voltages at each bus", + "unit": "" + }, + { + "name": "phase_shift", + "description": "Voltage phase angle shift", + "unit": "degrees" + }, + { + "name": "capital_cost", + "description": "capital cost of extending s_nom by 1 MVA", + "unit": "EUR/MVA" + }, + { + "name": "geom", + "description": "geometry that depict the real route of the line", + "unit": "" + }, + { + "name": "topo", + "description": "topology that depicts a direct connection between both busses", + "unit": "..." + } + ] + } + ], + "metadata_version": "1.3" +}'; + + +INSERT INTO model_draft.ego_grid_pf_hv_transformer_v032 + SELECT + scn_name , + trafo_id , + bus0 , + bus1 , + x , + r , + g , + b , + s_nom , + s_nom_extendable , + s_nom_min , + s_nom_max , + tap_ratio, + phase_shift , + capital_cost , + geom, + topo + FROM grid.ego_pf_hv_transformer + WHERE version = 'v0.3.2'; + + + +CREATE TABLE model_draft.ego_grid_pf_hv_source_v032 +( + source_id bigint NOT NULL, + name text, + co2_emissions double precision, + commentary text, + CONSTRAINT source_v032_pkey PRIMARY KEY (source_id) +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_source_v032 + OWNER TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_source_v032 + IS E'{ + "title": "eGo hv powerflow - sources", + "description": "sources in eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "resolution": "", + "location": "", + "extend": "Germany" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "url": "https://github.com/openego/data_processing", + "copyright": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems", + "name": "eGo dataprocessing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "description": " " + } + ], + "license": { + "name": "Open Data Commons Open Database License 1.0", + "copyright": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems", + "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!", + "version": "1.0", + "id": "ODbL-1.0" + }, + "contributors": [ + { + "date": "26.04.2017", + "comment": "Create table", + "name": "IlkaCu", + "email": "" + }, + { + "date": "2017-9-12", + "comment": "Update metadata to v1.3", + "name": "KilianZimmerer", + "email": "" + } + ], + "resources": [ + { + "fields": [ + { + "name": "version", + "unit": "", + "description": "version id" + }, + { + "name": "source_id", + "unit": "", + "description": "unique source id" + }, + { + "name": "name", + "unit": "", + "description": "source name" + }, + { + "name": "co2_emissions", + "unit": "tonnes/MWh", + "description": "technology specific CO2 emissions " + }, + { + "name": "commentary", + "unit": "", + "description": "..." + } + ], + "name": "grid.ego_pf_hv_source", + "format": "sql" + } + ], + "metadata_version": "1.3" +}'; + + +INSERT INTO model_draft.ego_grid_pf_hv_source_v032 + SELECT + source_id, + name, + co2_emissions, + commentary + from grid.ego_pf_hv_source + WHERE version = 'v0.3.2'; + + +CREATE TABLE model_draft.ego_grid_pf_hv_temp_resolution_v032 +( + temp_id bigint NOT NULL, + timesteps bigint NOT NULL, + resolution text, + start_time timestamp without time zone, + CONSTRAINT temp_resolution_v032_pkey PRIMARY KEY (temp_id) +) +WITH ( + OIDS=FALSE +); +ALTER TABLE model_draft.ego_grid_pf_hv_temp_resolution_v032 + OWNER TO oeuser; +COMMENT ON TABLE model_draft.ego_grid_pf_hv_temp_resolution_v032 + IS E'{ + "title": "eGo hv powerflow - temp_resolution", + "description": "Temporal resolution in eGo hv powerflow", + "language": [ "eng" ], + "spatial": { + "resolution": "", + "location": "", + "extend": "" + }, + "temporal": { + "reference_date": " ", + "start": "", + "end": "", + "resolution": "" + }, + "sources": [ + { + "url": "https://github.com/openego/data_processing", + "copyright": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems", + "name": "eGo dataprocessing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "description": " " + } + ], + "license": { + "name": "Open Data Commons Open Database License 1.0", + "copyright": "\\u00a9 Flensburg University of Applied Sciences, Center for Sustainable Energy Systems", + "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!", + "version": "1.0", + "id": "ODbL-1.0" + }, + "contributors": [ + { + "date": "26.04.2017", + "comment": "Create table", + "name": "IlkaCu", + "email": "" + }, + { + "date": "2017-9-12", + "comment": "Update metadata to v1.3", + "name": "KilianZimmerer", + "email": "" + } + ], + "resources": [ + { + "fields": [ + { + "name": "version", + "unit": "", + "description": "version id" + }, + { + "name": "temp_id", + "unit": "", + "description": "unique id" + }, + { + "name": "timesteps", + "unit": "", + "description": "timestep" + }, + { + "name": "resolution", + "unit": "", + "description": "temporal resolution" + }, + { + "name": "start_time", + "unit": "", + "description": "start time with style: YYYY-MM-DD HH:MM:SS" + } + ], + "name": "grid.ego_pf_hv_temp_resolution", + "format": "sql" + } + ], + "metadata_version": "1.3" +}'; + + + +INSERT INTO model_draft.ego_grid_pf_hv_temp_resolution_v032 + SELECT + temp_id, + timesteps, + resolution, + start_time + from grid.ego_pf_hv_temp_resolution + WHERE version = 'v0.3.2'; \ No newline at end of file From b1f177d6808338b1a922d11a884683b9e86b215b Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Thu, 5 Jul 2018 14:34:05 +0200 Subject: [PATCH 03/36] Change capacity of foregin lines to border crossing lines and change line from Bentwisch to Denmark as DC-link. --- .../ego_dp_powerflow_electrical_neighbour.sql | 346 +++++++++++------- 1 file changed, 213 insertions(+), 133 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql index c04751b3..5960b44d 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql @@ -1,4 +1,4 @@ - + /* The electricity grid model extracted from osmTGmod is limited to the German territory. This script adds border crossing lines and corresponding buses and transformers to all neighbouring countries which have a direct electrical connection @@ -47,7 +47,7 @@ CREATE TABLE model_draft.ego_grid_hv_electrical_neighbours_bus geom geometry(Point,4326)); ALTER TABLE model_draft.ego_grid_hv_electrical_neighbours_bus - OWNER TO oeuser; + OWNER TO clara; INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_bus (bus_id, cntr_id, v_nom, current_type) @@ -64,7 +64,7 @@ SELECT nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), base_kv, geom, cntr_id -FROM grid.otg_ehvhv_bus_data WHERE cntr_id NOT IN ('DE', 'BE', 'NO') ; +FROM grid.otg_ehvhv_bus_data WHERE cntr_id NOT IN ('DE', 'BE', 'NO'); UPDATE model_draft.ego_grid_hv_electrical_neighbours_bus @@ -91,7 +91,7 @@ UPDATE model_draft.ego_grid_hv_electrical_neighbours_bus a -DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE geom IS NULL; +DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE geom IS NULL OR v_nom = 750; UPDATE model_draft.ego_grid_hv_electrical_neighbours_bus SET v_nom = (CASE v_nom WHEN 132 THEN 220 @@ -105,7 +105,7 @@ SELECT bus_i, base_kv, geom, cntr_id -FROM grid.otg_ehvhv_bus_data WHERE cntr_id NOT IN ('DE', 'BE', 'NO') ; +FROM grid.otg_ehvhv_bus_data WHERE cntr_id NOT IN ('DE', 'BE', 'NO') OR (geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40' AND base_kv = 380) ; UPDATE model_draft.ego_grid_hv_electrical_neighbours_bus SET v_nom = (CASE v_nom WHEN 132 THEN 220 @@ -120,9 +120,17 @@ SET bus_id = (SELECT DISTINCT ON (bus_i) bus_i FROM grid.otg_ehvhv_bus_data WHE geom = '0101000020E6100000A444C3ABCE9A254079A450D5E2F24A40' WHERE cntr_id = 'SE' AND geom = '0101000020E61000004C93AD8960072A40DBBD816ED4B14B40'; +UPDATE model_draft.ego_grid_hv_electrical_neighbours_bus +SET v_nom = 400 +WHERE (cntr_id = 'DK' AND geom ='0101000020E6100000AFB9FEB858EC2740621AE148FB474B40') OR (geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40') AND v_nom = 380; + +--- Insert buses for DC-lines INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_bus (bus_id, v_nom, geom, cntr_id, central_bus) -VALUES (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 450, '0101000020E6100000A444C3ABCE9A254079A450D5E2F24A40', 'SE', FALSE), - (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 450, '0101000020E6100000781E63B01D002E40A292E70A7AB74E40', 'SE', TRUE); +VALUES (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 450, '0101000020E6100000A444C3ABCE9A254079A450D5E2F24A40', 'SE', FALSE), + (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 450, '0101000020E6100000781E63B01D002E40A292E70A7AB74E40', 'SE', TRUE), + (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 400, '0101000020E6100000A01CB9F93CB22240376BAAA0021E4C40', 'DK', TRUE), --- Center of DK + (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 400, '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40', 'DE', FALSE), --- Bentwisch HGÜ + (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 400, '0101000020E610000060BB9D50CA422840B5CD3AA107124B40', 'DE', FALSE); --- between Bentwisch and DK DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_bus a USING model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE a.cntr_id = b.cntr_id AND a.geom = b.geom AND a.v_nom = b.v_nom AND a.ctid > b.ctid OR a.cntr_id IS NULL OR a.v_nom IS NULL; @@ -159,7 +167,7 @@ CREATE TABLE model_draft.ego_grid_hv_electrical_neighbours_line ); ALTER TABLE model_draft.ego_grid_hv_electrical_neighbours_line - OWNER TO oeuser; + OWNER TO clara; INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_line (line_id, bus1, v_nom, cntr_id_2, cntr_id_1) @@ -169,86 +177,74 @@ SELECT nextval('model_draft.ego_grid_hv_electrical_neighbours_line_id'), 'DE', cntr_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus -WHERE central_bus = FALSE AND current_type = 'AC'; - +WHERE central_bus = FALSE AND current_type = 'AC' AND cntr_id != 'DE' ; UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a -SET cables = 6; +SET bus0 = (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE a.cntr_id_1 = b.cntr_id AND a.v_nom = b.v_nom AND central_bus = TRUE); - -INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_line (line_id, cntr_id_1, cntr_id_2, v_nom, cables) + +--- Insert lines between electrical neigbours in respect to entso-e +INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_line (line_id, cntr_id_1, cntr_id_2, v_nom, cables, s_nom) SELECT nextval('model_draft.ego_grid_hv_electrical_neighbours_line_id'), country1 , country2, - voltage, - 3*circiuts + (CASE WHEN voltage = 110 THEN 110 + WHEN voltage IN (150, 132, 220) THEN 220 + WHEN voltage IN (300, 380) THEN 380 + END), + 3*circiuts, + (CASE WHEN voltage = 110 THEN circiuts * 260 + WHEN voltage IN (150, 132, 220) THEN circiuts * 520 + WHEN voltage IN (300, 380) THEN circiuts * 1790 + END) FROM model_draft.ego_grid_pp_entsoe_line -WHERE country1 != country2 AND country1 IN (SELECT cntr_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus) AND country2 IN (SELECT cntr_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus) AND dc = false AND under_construction = false; - +WHERE country1 != country2 AND country1 IN (SELECT cntr_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus) AND country2 IN (SELECT cntr_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus) AND dc = false AND under_construction = false AND country1 != 'DE' AND country2 != 'DE'; -UPDATE model_draft.ego_grid_hv_electrical_neighbours_line - SET v_nom = (CASE v_nom WHEN 132 THEN 220 - WHEN 150 THEN 220 - WHEN 300 THEN 380 - ELSE v_nom END); - - + +--- Set cables and s_nom of lines in foregin countrys to values of border crossing lines UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a - SET bus0 = (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE a.cntr_id_1 = b.cntr_id AND a.v_nom = b.v_nom AND central_bus = TRUE); - +SET cables = (SELECT sum(b.cables) FROM model_draft.ego_grid_pf_hv_line b WHERE b.scn_name = 'Status Quo' AND b.bus0 = a.bus1 + AND b.bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE central_bus = TRUE)), + s_nom = (SELECT sum(b.s_nom) FROM model_draft.ego_grid_pf_hv_line b WHERE b.scn_name = 'Status Quo' AND b.bus0 = a.bus1 + AND b.bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE central_bus = TRUE)) +WHERE a.cntr_id_2 = 'DE'; UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a - SET bus1 = (CASE WHEN bus1 IS NULL THEN (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus b - WHERE a.cntr_id_2 = b.cntr_id AND a.v_nom = b.v_nom AND central_bus = TRUE) ELSE bus1 END); - -UPDATE model_draft.ego_grid_hv_electrical_neighbours_line - SET topo = (SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1))), - frequency = 50; - - -UPDATE model_draft.ego_grid_hv_electrical_neighbours_line - SET length = (SELECT ST_Length(topo, true))/1000; - - -UPDATE model_draft.ego_grid_hv_electrical_neighbours_line - - SET geom = (SELECT ST_Multi(topo)); +SET cables = (SELECT sum(b.cables) FROM model_draft.ego_grid_pf_hv_line b WHERE b.scn_name = 'Status Quo' AND b.bus1 = a.bus1 + AND (SELECT DISTINCT ON (geom) geom FROM model_draft.ego_grid_pf_hv_bus WHERE bus_id = b.bus0) NOT IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE central_bus = TRUE)), + s_nom = (SELECT sum(b.s_nom) FROM model_draft.ego_grid_pf_hv_line b WHERE b.scn_name = 'Status Quo' AND b.bus1 = a.bus1 + AND (SELECT DISTINCT ON (geom) geom FROM model_draft.ego_grid_pf_hv_bus WHERE bus_id = b.bus0) NOT IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE central_bus = TRUE)) +WHERE a.cntr_id_2 = 'DE' AND cables is null ; +--- Set bus0 to central bus of country 1 UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a - SET cables = (SELECT SUM(cables) FROM model_draft.ego_grid_hv_electrical_neighbours_line b WHERE a.geom = b.geom AND a.v_nom = b.v_nom) ; +SET bus0 = (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE a.cntr_id_1 = b.cntr_id AND a.v_nom = b.v_nom AND central_bus = TRUE); +--- Lines between electrical neighours: Set bus1 to central bus of country 2 +UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a +SET bus1 = (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE a.cntr_id_2 = b.cntr_id AND a.v_nom = b.v_nom AND central_bus = TRUE) +WHERE a.cntr_id_2 != 'DE'; -UPDATE model_draft.ego_grid_hv_electrical_neighbours_line - SET cables = (CASE WHEN geom = ('0105000020E6100000010000000102000000020000008219DE771A512C40E266B10F27CB474032A946544D292A40422619390B214840') AND v_nom = 220 THEN 9 - WHEN geom = ('0105000020E610000001000000010200000002000000CC34F5A862612040F35A1E0B1462474053EC681CEA172040FCA65599CEC64740') AND v_nom = 380 THEN 3 - WHEN geom = ('0105000020E610000001000000010200000002000000CC34F5A862612040F35A1E0B146247406642DD51AD172040829D51A9C8C64740') AND v_nom = 380 THEN 9 - ELSE cables - END); - - -DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_line a USING model_draft.ego_grid_hv_electrical_neighbours_line b - WHERE a.geom = b.geom AND a.v_nom = b.v_nom AND a.ctid < b.ctid; - +--- Set topo, frequency, length and geom +UPDATE model_draft.ego_grid_hv_electrical_neighbours_line +SET topo = (SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1))), + frequency = 50, + length = (SELECT ST_Length((SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1))), true))/1000, + geom = (SELECT (ST_Multi(ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1))))); +--- Set electrical parameters to standard-values of transmission lines UPDATE model_draft.ego_grid_hv_electrical_neighbours_line - SET x = (CASE WHEN v_nom = 110 THEN 0.31415 *1.2 / (cables/3) * length +SET x = (CASE WHEN v_nom = 110 THEN 0.31415 *1.2 / (cables/3) * length WHEN v_nom = 220 THEN 0.31415 /(cables/3) * length WHEN v_nom = 380 THEN 0.31415 * 0.8 /(cables/3) * length END), - r = (CASE WHEN v_nom = 110 THEN 0.109 / (cables/3) * length - WHEN v_nom = 220 THEN 0.109 /(cables/3) * length + r = (CASE WHEN v_nom = 110 THEN 0.109 / (cables/3) * length + WHEN v_nom = 220 THEN 0.109 /(cables/3) * length WHEN v_nom = 380 THEN 0.028 /(cables/3) * length - END), - - s_nom = (CASE WHEN v_nom = 110 THEN 260 * (cables/3) - WHEN v_nom = 220 THEN 520 * (cables/3) - WHEN v_nom = 380 THEN 1790 *(cables/3) END); - DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_line WHERE cables IS NULL; -DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE ((bus_id NOT IN (SELECT bus0 FROM model_draft.ego_grid_hv_electrical_neighbours_line)) AND (bus_id NOT IN (SELECT bus1 FROM model_draft.ego_grid_hv_electrical_neighbours_line))); DROP TABLE IF EXISTS model_draft.ego_grid_hv_electrical_neighbours_transformer CASCADE; @@ -282,84 +278,112 @@ CREATE TABLE model_draft.ego_grid_hv_electrical_neighbours_transformer CONSTRAINT neighbour_transformer_pkey PRIMARY KEY (trafo_id, scn_name) ); ALTER TABLE model_draft.ego_grid_hv_electrical_neighbours_transformer - OWNER TO oeuser; + OWNER TO clara; +--- Insert transformers to connect central buses INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_transformer (trafo_id, bus0, cntr_id, v1, geom_point) - (SELECT nextval('model_draft.ego_grid_hv_electrical_neighbours_transformer_id'), bus_id, cntr_id, v_nom, geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus a - - WHERE cntr_id != 'DE' AND central_bus = TRUE); - +(SELECT nextval('model_draft.ego_grid_hv_electrical_neighbours_transformer_id'), + bus_id, + cntr_id, + v_nom, + geom +FROM model_draft.ego_grid_hv_electrical_neighbours_bus a +WHERE cntr_id != 'DE' AND central_bus = TRUE); + +--- Set second bus and voltage level on higher voltage side UPDATE model_draft.ego_grid_hv_electrical_neighbours_transformer a - SET bus1 = (CASE WHEN v1 = 110 THEN (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE v_nom = 220 AND a.cntr_id = b.cntr_id AND a.geom_point = b.geom) - WHEN v1 = 220 THEN (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE v_nom = 380 AND a.cntr_id = b.cntr_id AND a.geom_point = b.geom) END ), +SET bus1 = (CASE WHEN v1 = 110 THEN (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE v_nom = 220 AND a.cntr_id = b.cntr_id AND a.geom_point = b.geom) + WHEN v1 = 220 THEN (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE v_nom = 380 AND a.cntr_id = b.cntr_id AND a.geom_point = b.geom) END ), - v2 = (CASE WHEN v1 = 110 THEN 220 + v2 = (CASE WHEN v1 = 110 THEN 220 ELSE 380 END); DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_transformer WHERE bus1 IS NULL; - DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_transformer WHERE bus1 IN (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE central_bus = FALSE); - +--- Calculate sum of lines at each voltage level UPDATE model_draft.ego_grid_hv_electrical_neighbours_transformer a - SET s1 = (SELECT SUM(b.s_nom) FROM model_draft.ego_grid_hv_electrical_neighbours_line b WHERE (a.cntr_id = b.cntr_id_1 OR a.cntr_id = b.cntr_id_2) AND v1 = b.v_nom); - - -UPDATE model_draft.ego_grid_hv_electrical_neighbours_transformer a - SET s2 = (SELECT SUM(b.s_nom) FROM model_draft.ego_grid_hv_electrical_neighbours_line b WHERE (a.cntr_id = b.cntr_id_1 OR a.cntr_id = b.cntr_id_2) AND v2 = b.v_nom); - +SET s1 = (SELECT SUM(b.s_nom) FROM model_draft.ego_grid_hv_electrical_neighbours_line b WHERE (a.cntr_id = b.cntr_id_1 OR a.cntr_id = b.cntr_id_2) AND v1 = b.v_nom), + s2 = (SELECT SUM(b.s_nom) FROM model_draft.ego_grid_hv_electrical_neighbours_line b WHERE (a.cntr_id = b.cntr_id_1 OR a.cntr_id = b.cntr_id_2) AND v2 = b.v_nom); +--- Choose minimum sum of incomming lines as transformer size UPDATE model_draft.ego_grid_hv_electrical_neighbours_transformer - SET s_min = (CASE WHEN s1 < s2 THEN s1 - WHEN s2 <= s1 THEN s2 - WHEN s2 IS NULL THEN s1 - END); +SET s_min = (CASE WHEN s1 < s2 THEN s1 + WHEN s2 <= s1 THEN s2 + WHEN s2 IS NULL THEN s1 + WHEN s1 IS NULL THEN s2 + END); - +--- Choose transformer of existsing network in respect to calculated size UPDATE model_draft.ego_grid_hv_electrical_neighbours_transformer - SET s_nom = (CASE WHEN s_min <= 600 THEN 600 - WHEN s_min > 600 AND s_min <= 1200 THEN 1200 - WHEN s_min > 1200 AND s_min <= 1600 THEN 1600 - WHEN s_min > 1600 AND s_min <= 2100 THEN 2100 - WHEN s_min > 2100 AND s_min <= 2600 THEN 2600 - WHEN s_min > 2600 AND s_min <= 4800 THEN 4800 - WHEN s_min > 4800 AND s_min <= 6000 THEN 6000 - WHEN s_min > 6000 AND s_min <= 7200 THEN 7200 - WHEN s_min > 7200 AND s_min <= 8000 THEN 8000 - WHEN s_min > 8000 AND s_min <= 9000 THEN 9000 - END); +SET s_nom = (CASE WHEN s_min <= 600 THEN 600 + WHEN s_min > 600 AND s_min <= 1200 THEN 1200 + WHEN s_min > 1200 AND s_min <= 1600 THEN 1600 + WHEN s_min > 1600 AND s_min <= 2100 THEN 2100 + WHEN s_min > 2100 AND s_min <= 2600 THEN 2600 + WHEN s_min > 2600 AND s_min <= 4800 THEN 4800 + WHEN s_min > 4800 AND s_min <= 6000 THEN 6000 + WHEN s_min > 6000 AND s_min <= 7200 THEN 7200 + WHEN s_min > 7200 AND s_min <= 8000 THEN 8000 + WHEN s_min > 8000 AND s_min <= 9000 THEN 9000 + WHEN s_min > 9000 AND s_min <= 13000 THEN 13000 + WHEN s_min > 13000 AND s_min <= 20000 THEN 20000 + WHEN s_min > 20000 AND s_min <= 33000 THEN 33000 + END); - +--- Set electrical parameters of existing transformers UPDATE model_draft.ego_grid_hv_electrical_neighbours_transformer - SET x = (CASE s_nom WHEN 1200 THEN 4.84 - WHEN 4800 THEN 1.21 - WHEN 2100 THEN 9.62667148 - WHEN 1600 THEN 3.63 - WHEN 600 THEN 9.68 - WHEN 6000 THEN 3.249 - WHEN 7200 THEN 2.80777136 - WHEN 2600 THEN 2.23384392 - WHEN 8000 THEN 2.43675 - WHEN 9000 THEN 2.166 - END), +SET x = (CASE s_nom WHEN 1200 THEN 0.0001 + WHEN 4800 THEN 0.000025 + WHEN 2100 THEN 0.00006667 + WHEN 1600 THEN 0.000075000000000000000000 + WHEN 600 THEN 0.00020000000000000000 + WHEN 6000 THEN 0.000022500000000000000000 + WHEN 7200 THEN 0.000019444400000000000000 + WHEN 2600 THEN 0.000046153800000000000000 + WHEN 8000 THEN 0.000016875000000000000000 + WHEN 9000 THEN 0.000015000000000000000000 + WHEN 13000 THEN 0.000010384600000000000000 + WHEN 20000 THEN 0.000006750000000000000000 + WHEN 33000 THEN 0.000004090910000000000000 + END), - tap_ratio = 1, + tap_ratio = 1, - phase_shift = 0, - - topo = (SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1))); + phase_shift = 0, + topo = (SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1))); +--- Insert transformers to DC-line-buses INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_transformer (tap_ratio, phase_shift, trafo_id, bus0, bus1, topo, s_nom, x) -VALUES (1, 0, nextval('model_draft.ego_grid_hv_electrical_neighbours_transformer_id'), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 450 AND central_bus = TRUE), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND v_nom = 380 AND central_bus = TRUE), '0102000020E6100000020000006D1E63B01D002E409E92E70A7AB74E406D1E63B01D002E409E92E70A7AB74E40', 1200, 4.84 ), - - (1, 0, nextval('model_draft.ego_grid_hv_electrical_neighbours_transformer_id'), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 450 AND geom = '0101000020E6100000A444C3ABCE9A254079A450D5E2F24A40' ), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 380 AND geom = '0101000020E6100000A444C3ABCE9A254079A450D5E2F24A40'), '0102000020E6100000020000004C93AD8960072A40DBBD816ED4B14B404C93AD8960072A40DBBD816ED4B14B40', 1200, 4.84 ); +VALUES (1, 0, nextval('model_draft.ego_grid_hv_electrical_neighbours_transformer_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 450 AND central_bus = TRUE), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND v_nom = 380 AND central_bus = TRUE), + '0102000020E6100000020000006D1E63B01D002E409E92E70A7AB74E406D1E63B01D002E409E92E70A7AB74E40', + 1200, 0.0001 ), + + (1, 0, nextval('model_draft.ego_grid_hv_electrical_neighbours_transformer_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 450 AND geom = '0101000020E6100000A444C3ABCE9A254079A450D5E2F24A40' ), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 380 AND geom = '0101000020E6100000A444C3ABCE9A254079A450D5E2F24A40'), + '0102000020E6100000020000004C93AD8960072A40DBBD816ED4B14B404C93AD8960072A40DBBD816ED4B14B40', + 1200, 0.0001 ), + + --- Bentwisch HGÜ + (1, 0, nextval('model_draft.ego_grid_hv_electrical_neighbours_transformer_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40'), + (SELECT bus_i FROM grid.otg_ehvhv_bus_data WHERE base_kv = 380 AND osm_name = 'Bentwisch HGÜ'), + '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4032A490CBF66D2840DBDB2B66D70C4B40', + 1200, 0.0001 ), + + (1, 0, nextval('model_draft.ego_grid_hv_electrical_neighbours_transformer_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND cntr_id = 'DK' AND central_bus = TRUE ), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 380 AND cntr_id = 'DK' AND central_bus = TRUE), + '0102000020E610000002000000A01CB9F93CB22240376BAAA0021E4C40A01CB9F93CB22240376BAAA0021E4C40', + 1200, 0.0001 ); UPDATE model_draft.ego_grid_hv_electrical_neighbours_transformer - SET geom = (SELECT ST_Multi(topo)); - +SET geom = (SELECT ST_Multi(topo)); DROP TABLE IF EXISTS model_draft.ego_grid_hv_electrical_neighbours_link CASCADE; @@ -390,34 +414,92 @@ WITH ( ); ALTER TABLE model_draft.ego_grid_hv_electrical_neighbours_link - OWNER TO oeuser; - -INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_link (link_id, bus0, bus1, p_nom) -VALUES (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND central_bus = TRUE AND v_nom = 450), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND central_bus = FALSE AND v_nom = 450), 600), - (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND central_bus = FALSE AND v_nom = 450), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND central_bus = TRUE AND v_nom = 450), 600); + OWNER TO clara; + +--- Insert border-crossing and foregin DC-links +INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_link (link_id, bus0, bus1, p_nom, length) +VALUES (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND central_bus = TRUE AND v_nom = 450), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND central_bus = FALSE AND v_nom = 450), + 600, + 262), + + (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND central_bus = FALSE AND v_nom = 450), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND central_bus = TRUE AND v_nom = 450), + 600, + 262), + + (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = TRUE AND v_nom = 400), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = FALSE AND v_nom = 400), + 600, --- source: Kontek - ABB + 115),--- source: Kontek - ABB + + (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = FALSE AND v_nom = 400), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = TRUE AND v_nom = 400), + 600,--- source: Kontek - ABB + 115);--- source: Kontek - ABB UPDATE model_draft.ego_grid_hv_electrical_neighbours_link - SET topo = (SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1 AND scn_name = 'Status Quo'))); - +SET topo = (SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1 AND scn_name = 'Status Quo'))); UPDATE model_draft.ego_grid_hv_electrical_neighbours_link - SET length = (SELECT ST_Length(topo, true))/1000; - +SET geom = (SELECT ST_Multi(topo)), + efficiency = 0.987*0.974^(length/1000); + +--- Insert links from Bentwisch HGÜ to DK (they will replace lines) +INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_link (link_id, bus0, bus1, p_nom, length, geom, topo, efficiency) +VALUES (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND cntr_id = 'DK' AND central_bus = FALSE), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40'), + 600, + 48.12, + ('0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40'), + (SELECT topo FROM grid.otg_ehvhv_branch_data WHERE geom ='0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40'), + 0.987*0.974^(48.12/1000)), + + (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND cntr_id = 'DK' AND central_bus = FALSE), + 600, + 48.12, + ('0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40'), + (SELECT topo FROM grid.otg_ehvhv_branch_data WHERE geom ='0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40'), + 0.987*0.974^(48.12/1000)), + + (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40'), + 600, + 7.46, + (SELECT geom FROM grid.otg_ehvhv_branch_data WHERE topo = '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40' AND branch_voltage = 380000), + '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40', + 0.987*0.974^(7.46/1000)), + + (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40'), + 600, + 7.46, + (SELECT geom FROM grid.otg_ehvhv_branch_data WHERE topo = '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40' AND branch_voltage = 380000), + '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40', + 0.987*0.974^(7.46/1000)); -UPDATE model_draft.ego_grid_hv_electrical_neighbours_link - SET geom = (SELECT ST_Multi(topo)), - efficiency = 0.987*0.974^(length/1000); DELETE FROM model_draft.ego_grid_pf_hv_link WHERE geom IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_link); +DELETE FROM model_draft.ego_grid_pf_hv_line WHERE geom IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_link); + DELETE FROM model_draft.ego_grid_pf_hv_line WHERE geom IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_line); DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_line a USING model_draft.ego_grid_hv_electrical_neighbours_link b WHERE a.geom = b.geom; -DELETE FROM model_draft.ego_grid_pf_hv_bus a USING model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE a.geom = b.geom AND b.central_bus = TRUE OR a.v_nom = 450 OR a.geom = '0101000020E6100000AFB9FEB858EC2740621AE148FB474B40'; +DELETE FROM model_draft.ego_grid_pf_hv_bus a USING model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE a.geom = b.geom AND b.central_bus = TRUE OR a.v_nom IN (400, 450) OR a.geom IN('0101000020E6100000AFB9FEB858EC2740621AE148FB474B40','0101000020E610000060BB9D50CA422840B5CD3AA107124B40'); INSERT INTO model_draft.ego_grid_pf_hv_bus (scn_name, bus_id, v_nom, geom, current_type) -SELECT 'Status Quo',bus_id, v_nom, geom, current_type FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id != 'DE' AND central_bus = TRUE OR v_nom = 450 OR geom = '0101000020E6100000AFB9FEB858EC2740621AE148FB474B40'; +SELECT 'Status Quo',bus_id, v_nom, geom, current_type FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id != 'DE' AND central_bus = TRUE OR v_nom IN (400, 450) OR geom IN('0101000020E6100000AFB9FEB858EC2740621AE148FB474B40','0101000020E610000060BB9D50CA422840B5CD3AA107124B40'); DELETE FROM model_draft.ego_grid_pf_hv_transformer WHERE geom IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_transformer) OR bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo' ); @@ -432,5 +514,3 @@ SELECT 'Status Quo', trafo_id, bus0, bus1, x, s_nom, geom, tap_ratio, phase_shif - - From 7454417757b6d0cd757d7317918792f11e82df66 Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Fri, 6 Jul 2018 09:35:46 +0200 Subject: [PATCH 04/36] Update number of cables and s_nom manually in special cases Add possibility to avoid subnetworks from DC-link to DK Set user to oeuser --- .../ego_dp_powerflow_electrical_neighbour.sql | 46 +++++++++++++++++-- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql index 5960b44d..34e28d4c 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql @@ -47,7 +47,7 @@ CREATE TABLE model_draft.ego_grid_hv_electrical_neighbours_bus geom geometry(Point,4326)); ALTER TABLE model_draft.ego_grid_hv_electrical_neighbours_bus - OWNER TO clara; + OWNER TO oeuser; INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_bus (bus_id, cntr_id, v_nom, current_type) @@ -120,6 +120,7 @@ SET bus_id = (SELECT DISTINCT ON (bus_i) bus_i FROM grid.otg_ehvhv_bus_data WHE geom = '0101000020E6100000A444C3ABCE9A254079A450D5E2F24A40' WHERE cntr_id = 'SE' AND geom = '0101000020E61000004C93AD8960072A40DBBD816ED4B14B40'; +--- Update voltage level of DC-buses to Denmark UPDATE model_draft.ego_grid_hv_electrical_neighbours_bus SET v_nom = 400 WHERE (cntr_id = 'DK' AND geom ='0101000020E6100000AFB9FEB858EC2740621AE148FB474B40') OR (geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40') AND v_nom = 380; @@ -167,7 +168,7 @@ CREATE TABLE model_draft.ego_grid_hv_electrical_neighbours_line ); ALTER TABLE model_draft.ego_grid_hv_electrical_neighbours_line - OWNER TO clara; + OWNER TO oeuser; INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_line (line_id, bus1, v_nom, cntr_id_2, cntr_id_1) @@ -216,6 +217,8 @@ SET cables = (SELECT sum(b.cables) FROM model_draft.ego_grid_pf_hv_line b WHER AND (SELECT DISTINCT ON (geom) geom FROM model_draft.ego_grid_pf_hv_bus WHERE bus_id = b.bus0) NOT IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE central_bus = TRUE)) WHERE a.cntr_id_2 = 'DE' AND cables is null ; + + --- Set bus0 to central bus of country 1 UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a SET bus0 = (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE a.cntr_id_1 = b.cntr_id AND a.v_nom = b.v_nom AND central_bus = TRUE); @@ -232,6 +235,22 @@ SET topo = (SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electr length = (SELECT ST_Length((SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1))), true))/1000, geom = (SELECT (ST_Multi(ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1))))); +--- Update s_nom and cables when grid topology leads to over- or underestimation +UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a +SET cables = 9, + s_nom = 1590 +WHERE geom = '0105000020E6100000010000000102000000020000008219DE771A512C40E266B10F27CB4740F0D23C36B8E32A4052572D9F9B374840' AND s_nom = 550; + +UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a +SET cables = 6, + s_nom = 520 +WHERE geom = '0105000020E6100000010000000102000000020000008219DE771A512C40E266B10F27CB4740E5D308A293662840C0907AF42BD24740' AND s_nom = 800; + +UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a +SET cables = 12, + s_nom = 1040 +WHERE geom = '0105000020E6100000010000000102000000020000008219DE771A512C40E266B10F27CB4740565DD1F764672840609099B0A2D14740' AND cables = 15; + --- Set electrical parameters to standard-values of transmission lines UPDATE model_draft.ego_grid_hv_electrical_neighbours_line SET x = (CASE WHEN v_nom = 110 THEN 0.31415 *1.2 / (cables/3) * length @@ -278,7 +297,7 @@ CREATE TABLE model_draft.ego_grid_hv_electrical_neighbours_transformer CONSTRAINT neighbour_transformer_pkey PRIMARY KEY (trafo_id, scn_name) ); ALTER TABLE model_draft.ego_grid_hv_electrical_neighbours_transformer - OWNER TO clara; + OWNER TO oeuser; --- Insert transformers to connect central buses INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_transformer (trafo_id, bus0, cntr_id, v1, geom_point) @@ -414,7 +433,7 @@ WITH ( ); ALTER TABLE model_draft.ego_grid_hv_electrical_neighbours_link - OWNER TO clara; + OWNER TO oeuser; --- Insert border-crossing and foregin DC-links INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_link (link_id, bus0, bus1, p_nom, length) @@ -441,6 +460,25 @@ VALUES (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = TRUE AND v_nom = 400), 600,--- source: Kontek - ABB 115);--- source: Kontek - ABB + +/* To avoid DC-subnetworks from buses only connected via DC-link set only one link between Bentwisch HGÜ and center of Denmark +delete: lines from Bentwisch HGÜ to border of DK, buses connecting them; Update last lines to copy only the ones that are needed +undo instertig --- Insert links from Bentwisch HGÜ to DK (they will replace lines); insert DC.buses (between Bentwisch and HGÜ) +do: keep 400kV bus in Bentwisch HGÜ and update upper lines to : + +(nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = TRUE AND v_nom = 400), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE geom = '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40' AND v_nom = 400), + 600, --- source: Kontek - ABB + 170),--- source: Kontek - ABB + +(nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE geom = '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40' AND v_nom = 400), + (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = TRUE AND v_nom = 400), + 600,--- source: Kontek - ABB + 115);--- source: Kontek - ABB + +*/ UPDATE model_draft.ego_grid_hv_electrical_neighbours_link SET topo = (SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1 AND scn_name = 'Status Quo'))); From 1ba69671ac434e294266405b2d0a8e0d0a16a778 Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Wed, 11 Jul 2018 11:52:12 +0200 Subject: [PATCH 05/36] Adjust capacity of underground cables between Denmark and Sweden. --- .../ego_dp_powerflow_electrical_neighbour.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql index 34e28d4c..b8b05add 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql @@ -251,6 +251,16 @@ SET cables = 12, s_nom = 1040 WHERE geom = '0105000020E6100000010000000102000000020000008219DE771A512C40E266B10F27CB4740565DD1F764672840609099B0A2D14740' AND cables = 15; +--- Adjust capacity of underground cables between Sweden and Denmark +UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a +SET s_nom = 925 +WHERE cntr_id_1 = 'DK' AND cntr_id_2 = 'SE' AND v_nom = 380; + +UPDATE model_draft.ego_grid_hv_electrical_neighbours_line a +SET s_nom = 550 +WHERE cntr_id_1 = 'DK' AND cntr_id_2 = 'SE' AND v_nom = 220; + + --- Set electrical parameters to standard-values of transmission lines UPDATE model_draft.ego_grid_hv_electrical_neighbours_line SET x = (CASE WHEN v_nom = 110 THEN 0.31415 *1.2 / (cables/3) * length From dbf52d35c97424f2530c45a7041bcfcca99bba10 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Mon, 16 Jul 2018 11:53:58 +0200 Subject: [PATCH 06/36] owner to oeuser --- .../sql_snippets/ego_dp_powerflow_assignment_generator.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql index 6b35630f..f1745781 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql @@ -431,6 +431,8 @@ AS ROW_NUMBER () OVER (ORDER BY aggr_id) as row_number FROM w_sub); + +ALTER MATERIALIZED VIEW VIEW model_draft.ego_supply_aggr_weather_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_aggr_weather_mview','ego_dp_powerflow_assignment_generator.sql',' '); From 19389ea375687022b828366a701ad7991ce4e81d Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Mon, 16 Jul 2018 16:24:49 +0200 Subject: [PATCH 07/36] Create ego_dp_data_check.sql --- utilities/ego_dp_data_check.sql | 654 ++++++++++++++++++++++++++++++++ 1 file changed, 654 insertions(+) create mode 100644 utilities/ego_dp_data_check.sql diff --git a/utilities/ego_dp_data_check.sql b/utilities/ego_dp_data_check.sql new file mode 100644 index 00000000..8b1b5532 --- /dev/null +++ b/utilities/ego_dp_data_check.sql @@ -0,0 +1,654 @@ +/* +This script provides a data check for the PF data set generated by the open_eGo data processing. + +__copyright__ = "Flensburg University of Applied Sciences, Centre for Sustainable Energy Systems" +__license__ = "GNU Affero General Public License Version 3 (AGPL-3.0)" +__url__ = "https://github.com/openego/data_processing/blob/master/LICENSE" +__author__ = "IlkaCu" +*/ + + + + +DROP TABLE IF EXISTS model_draft.ego_grid_pf_hv_data_check; + +CREATE TABLE model_draft.ego_grid_pf_hv_data_check ( + test_id serial, + version character varying NOT NULL, + scn_name character varying NOT NULL, + test character varying, + table_name character varying, + count int, + CONSTRAINT hv_data_check_pkey PRIMARY KEY (version, scn_name, test)); + +ALTER TABLE model_draft.ego_grid_pf_hv_data_check + owner to oeuser; + + +------------------- +-- grid topology +------------------- + + +-- Do all lines have defined buses in all three scenarios? + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'lines with undefined buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'Status Quo' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo')); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'lines with undefined buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'NEP 2035' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035')); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'lines with undefined buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'eGo 100' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100')); + +-- Do any lines have NULL values in the bus columns? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'lines with NULL values for buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'Status Quo' AND + (bus0 IS NULL OR + bus1 IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'lines with NULL values for buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'NEP 2035' AND + (bus0 IS NULL OR + bus1 IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'lines with NULL values for buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'eGo 100' AND + (bus0 IS NULL OR + bus1 IS NULL); + + + + +-- Do all lines have defined buses in all three scenarios? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'transformers with undefined buses', + 'model_draft.ego_grid_pf_hv_transformer', + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'Status Quo' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo')); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'transformers with undefined buses', + 'model_draft.ego_grid_pf_hv_transformer', + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'NEP 2035' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035')); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'transformers with undefined buses', + 'model_draft.ego_grid_pf_hv_transformer', + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'eGo 100' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100')); + + +-- Do any transformers have NULL values in the bus columns? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'transformers with NULL values for buses' + 'model_draft.ego_grid_pf_hv_transformer',, + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'Status Quo' AND + (bus0 IS NULL OR + bus1 IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'transformers with NULL values for buses', + 'model_draft.ego_grid_pf_hv_transformer', + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'NEP 2035' AND + (bus0 IS NULL OR + bus1 IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'transformers with NULL values for buses', + 'model_draft.ego_grid_pf_hv_transformer', + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'eGo 100' AND + (bus0 IS NULL OR + bus1 IS NULL); + + +-- Are any EHV substations mistakenly assigned to 110 kV level in the final data model? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'EHV substation as 110 kV bus', + 'model_draft.ego_grid_pf_hv_bus', + count(*) FROM model_draft.ego_grid_pf_hv_bus + WHERE scn_name = 'Status Quo' AND + v_nom >110 AND + bus_id IN (SELECT otg_id FROM model_draft.ego_grid_hvmv_substation); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'EHV substation as 110 kV bus', + 'model_draft.ego_grid_pf_hv_bus', + count(*) FROM model_draft.ego_grid_pf_hv_bus + WHERE scn_name = 'NEP 2035' AND + v_nom >110 AND + bus_id IN (SELECT otg_id FROM model_draft.ego_grid_hvmv_substation); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'EHV substation as 110 kV bus', + 'model_draft.ego_grid_pf_hv_bus', + count(*) FROM model_draft.ego_grid_pf_hv_bus + WHERE scn_name = 'eGo 100' AND + v_nom >110 AND + bus_id IN (SELECT otg_id FROM model_draft.ego_grid_hvmv_substation); + +------------------- +-- generators and time series +------------------- + +-- Do all generators have defined buses? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'generators without defined buses', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'Status Quo' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo') + OR bus IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'generators without defined buses', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'NEP 2035' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035') + OR bus IS NULL); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'generators without defined buses', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'eGo 100' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100') + OR bus IS NULL); + + +-- Do all generators in table pf_generator_single have an otg_id assigned? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'pf_generator_single without defined buses', + 'model_draft.ego_supply_pf_generator_single', + count(*) FROM model_draft.ego_supply_pf_generator_single + WHERE scn_name = 'Status Quo' AND + otg_id IS NULL; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'pf_generator_single without defined buses', + 'model_draft.ego_supply_pf_generator_single', + count(*) FROM model_draft.ego_supply_pf_generator_single + WHERE scn_name = 'NEP 2035' AND + otg_id IS NULL; + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'pf_generator_single without defined buses', + 'model_draft.ego_supply_pf_generator_single', + count(*) FROM model_draft.ego_supply_pf_generator_single + WHERE scn_name = 'eGo 100' AND + otg_id IS NULL; + +-- Do all generators which are not 'reservoir', 'geothermal' or 'other_non_renewable' have defined timeseries in all three scenarios? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'generators (source != 14, 15, 10) without time series', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'Status Quo' AND + generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator_pq_set WHERE scn_name = 'Status Quo') AND + source NOT IN (14, 15, 10); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'generators (source != 14, 15, 10) without time series', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'NEP 2035' AND + generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator_pq_set WHERE scn_name = 'NEP 2035') AND + source NOT IN (14, 15, 10); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'generators (source != 14, 15, 10) without time series', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'eGo 100' AND + generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator_pq_set WHERE scn_name = 'eGo 100') AND + source NOT IN (14, 15, 10); + +-- Do all generator time series have defined generators in the data model? + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'time series without defined generators', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE scn_name = 'Status Quo' AND + (generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator WHERE scn_name = 'Status Quo') + OR generator_id IS NULL); + + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'time series without defined generators', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE scn_name = 'NEP 2035' AND + (generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator WHERE scn_name = 'NEP 2035') + OR generator_id IS NULL); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'time series without defined generators', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE scn_name = 'eGo 100' AND + (generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator WHERE scn_name = 'eGo 100') + OR generator_id IS NULL); + +-- Do any generators have timeseries with more than 8760 entries? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'generator time series with more than 8760 entries', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE array_length(p_set, 1) > 8760 AND scn_name = 'Status Quo'; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'generator time series with more than 8760 entries', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE array_length(p_set, 1) > 8760 AND scn_name = 'NEP 2035'; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'generator time series with more than 8760 entries', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE array_length(p_set, 1) > 8760 AND scn_name = 'eGo 100'; + + +-- Is the control set for all generators complete? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'generator control incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE control IS NULL AND scn_name = 'Status Quo'; + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'generator control incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE control IS NULL AND scn_name = 'NEP 2035'; + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'generator control incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE control IS NULL AND scn_name = 'eGo 100'; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'all', + 'generator control incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_supply_pf_generator_single + WHERE control IS NULL; + + +-- Are there any generators without source? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'generator source incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE source IS NULL AND scn_name = 'Status Quo'; + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'generator source incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE source IS NULL AND scn_name = 'NEP 2035'; + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'generator source incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE source IS NULL AND scn_name = 'eGo 100'; + + +------------------- +-- loads and time series +------------------- + +-- Do all loads have defined buses? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'loads without defined buses', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'Status Quo' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo') + OR bus IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'loads without defined buses', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'NEP 2035' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035') + OR bus IS NULL); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'loads without defined buses', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'eGo 100' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100') + OR bus IS NULL); + + +-- Do all loads have defined timeseries in all three scenarios? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'loads without time series', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'Status Quo' AND + load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load_pq_set WHERE scn_name = 'Status Quo'); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'loads without time series', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'NEP 2035' AND + load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load_pq_set WHERE scn_name = 'NEP 2035'); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'loads without time series', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'eGo 100' AND + load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load_pq_set WHERE scn_name = 'eGo 100'); + +-- Do all load time series have defined loads in the data model? + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'time series without defined loads', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE scn_name = 'Status Quo' AND + (load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load WHERE scn_name = 'Status Quo') + OR load_id IS NULL); + + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'time series without defined loads', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE scn_name = 'NEP 2035' AND + (load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load WHERE scn_name = 'NEP 2035') + OR load_id IS NULL); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'time series without defined loads', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE scn_name = 'eGo 100' AND + (load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load WHERE scn_name = 'eGo 100') + OR load_id IS NULL); + +-- Do any loads have timeseries with more than 8760 entries? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'load time series with more than 8760 entries', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE array_length(p_set, 1) > 8760 AND scn_name = 'Status Quo'; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'load time series with more than 8760 entries', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE array_length(p_set, 1) > 8760 AND scn_name = 'NEP 2035'; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'load time series with more than 8760 entries', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE array_length(p_set, 1) > 8760 AND scn_name = 'eGo 100'; + +---------------- +-- REA +---------------- + +-- Were all renewable generators reallocated by the REA scripts? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'all', + 'generators without rea_geom_new', + 'model_draft.ego_dp_supply_res_powerplant', + count(*) FROM model_draft_ego_dp_supply_res_powerplant + WHERE rea_geom_new IS NULL; + + +---------------- +-- MV grid districts +---------------- + +-- Are there any mv grid districts without assigned generators? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'all', + 'mv grid districts without generators', + 'model_draft.ego_grid_mv_griddistrict', + count(*) FROM model_draft.ego_grid_mv_griddistrict + WHERE subst_id NOT IN + (SELECT subst_id FROM model_draft.ego_grid_hvmv_substation WHERE otg_id IN + (SELECT bus FROM model_draft.ego_grid_pf_hv_generator)); + + +---------------- +-- Electrical neighbours +---------------- + +-- Are all electrical neighbours included in the data set? + +-- Are generators and generator time series assigned to all electrical neighbours? + +-- Are loads and load time series assigned to all electrical neighbours? From a48eda06f3c04ddc1c84fc68b59fe79921d7ab49 Mon Sep 17 00:00:00 2001 From: maltesc Date: Mon, 16 Jul 2018 16:39:14 +0200 Subject: [PATCH 08/36] generator single subset changed form mview to table --- .../ego_dp_powerflow_assignment_generator.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql index f1745781..f38e0cc4 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql @@ -1,4 +1,4 @@ -/* +/* Generators which were assigned to a specific substation prior to this script need to be transformed to a data structure suitable for powerflow calculation with tool developed and used in the open_eGo project. The following script transforms data from the powerplant mviews and adds some parameters according to the characteristics of the generators. @@ -413,7 +413,7 @@ UPDATE model_draft.ego_grid_pf_hv_generator -- scenario log (project,version,io,schema_name,table_name,script_name,comment) SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_assignment_generator.sql',' '); -CREATE MATERIALIZED VIEW model_draft.ego_supply_aggr_weather_mview +CREATE TABLE model_draft.ego_supply_aggr_weather AS (WITH w_sub AS ( SELECT DISTINCT @@ -432,7 +432,7 @@ AS FROM w_sub); -ALTER MATERIALIZED VIEW VIEW model_draft.ego_supply_aggr_weather_mview OWNER TO oeuser; +ALTER TABLE model_draft.ego_supply_aggr_weather OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_aggr_weather_mview','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_aggr_weather','ego_dp_powerflow_assignment_generator.sql',' '); From 4956b7803a7ce7ad42367f7c0338f2da0354734b Mon Sep 17 00:00:00 2001 From: WolfBunke Date: Tue, 17 Jul 2018 14:37:28 +0200 Subject: [PATCH 09/36] remove version clause --- .../sql_snippets/ego_dp_versioning_mviews.sql | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql index ade134ec..24ce1200 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql @@ -18,8 +18,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS WHERE scenario = 'Status Quo' AND (shutdown IS NULL or shutdown >= 2015) AND capacity > 0 - AND preversion = 'v0.3.0' - AND version = 'v0.4.2'; + -- AND preversion = 'v0.3.0' + -- AND version = 'v0.4.2'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview OWNER TO oeuser; @@ -33,8 +33,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS AND capacity > 0 AND fuel not in ('hydro', 'run_of_river', 'reservoir') AND (shutdown IS NULL or shutdown >= 2034) - AND preversion = 'v0.3.0' - AND version = 'v0.4.2'; + --AND preversion = 'v0.3.0' + -- AND version = 'v0.4.2'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview OWNER TO oeuser; @@ -90,8 +90,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS AND fuel = 'pumped_storage' AND capacity > 0 AND (shutdown IS NULL or shutdown >= 2049) - AND preversion = 'v0.3.0' - AND version = 'v0.4.2'; + --AND preversion = 'v0.3.0' + --AND version = 'v0.4.2'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview OWNER TO oeuser; @@ -110,8 +110,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario = 'Status Quo' AND electrical_capacity > 0 - AND preversion = 'v0.3.0' - AND version = 'v0.4.2'; + --AND preversion = 'v0.3.0' + --AND version = 'v0.4.2'; ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview OWNER TO oeuser; @@ -134,8 +134,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' - And preversion = 'v0.3.0' - AND version = 'v0.4.2' + --And preversion = 'v0.3.0' + -- AND version = 'v0.4.2' AND electrical_capacity > 0 ORDER BY id ) as sub @@ -155,8 +155,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS Group BY id Order by id) AND scenario in ('NEP 2035') - And preversion = 'v0.3.0' - AND version = 'v0.4.2' + --And preversion = 'v0.3.0' + --AND version = 'v0.4.2' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -178,13 +178,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_res_powerplant - WHERE version = 'v0.4.2' + --WHERE version = 'v0.4.2' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' - AND preversion = 'v0.3.0' - AND version = 'v0.4.2' + -- AND preversion = 'v0.3.0' + --AND version = 'v0.4.2' AND electrical_capacity > 0 AND generation_type in ('solar','wind') AND generation_subtype not in ('wind_offshore') @@ -203,13 +203,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario in ('eGo 100') AND generation_type not in ('gas') - AND version = 'v0.4.2' + --AND version = 'v0.4.2' AND flag in ('commissioning', 'repowering') Group BY id Order by id) AND scenario in ('eGo 100') - And preversion = 'v0.3.0' - AND version = 'v0.4.2' + --And preversion = 'v0.3.0' + --AND version = 'v0.4.2' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -225,15 +225,15 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS SELECT id FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - AND version = 'v0.4.2' + --AND version = 'v0.4.2' 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') - And preversion = 'v0.3.0' - AND version = 'v0.4.2' + --And preversion = 'v0.3.0' + --AND version = 'v0.4.2' AND electrical_capacity > 0 ORDER BY id ) sub3 From c998aeb661f45a505e8b09a584fc80d0faeafc5c Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Tue, 17 Jul 2018 14:43:28 +0200 Subject: [PATCH 10/36] include supply.ego_aggr_weather --- .../ego_dp_structure_versioning.sql | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/preprocessing/sql_snippets/ego_dp_structure_versioning.sql b/preprocessing/sql_snippets/ego_dp_structure_versioning.sql index e1eb2175..8d12dcaf 100644 --- a/preprocessing/sql_snippets/ego_dp_structure_versioning.sql +++ b/preprocessing/sql_snippets/ego_dp_structure_versioning.sql @@ -5934,3 +5934,101 @@ SELECT obj_description('grid.ego_line_expansion_costs' ::regclass) ::json; -- ego scenario log (version,io,schema_name,table_name,script_name,comment) SELECT scenario_log('eGo_DP', 'v0.4.0','result','grid','ego_line_expansion_costs','ego_dp_structure_versioning.sql','hv pf line expansion costs'); + +-- generator single subset + +CREATE TABLE supply.ego_aggr_weather +( + version text, + aggr_id bigint, + w_id bigint, + scn_name character varying, + bus bigint, + row_number bigint, + CONSTRAINT ego_aggr_weather_pkey PRIMARY KEY (version, aggr_id, w_id) +); +ALTER TABLE supply.ego_aggr_weather + OWNER TO oeuser; + +-- metadata + +COMMENT ON TABLE supply.ego_aggr_weather IS '{ + "title": "eGo subset generator_single", + "description": "A subset of table generator_single", + "language": [ "eng" ], + "spatial": { + "location": "none", + "extend": "none", + "resolution": "none" + }, + "temporal": { + "reference_date": "none", + "start": "none", + "end": "none", + "resolution": "none" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": "open_eGo dataprocessing code", + "url": "https://github.com/openego/data_processing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "eGo dataprocessing © Flensburg University of Applied Sciences, Centre for Sustainable Energy Systems © Europa-Universität Flensburg, Centre for Sustainable Energy Systems © Reiner Lemoine Institut © DLR Institute for Networked Energy Systems" + } + ], + "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": "© Europa-Universität, Center for Sustainable Energy Systems" + }, + "contributors": [ + { + "name": "maltesc", + "email": "", + "date": "2018-07-17", + "comment": "Create table" + } + ], + "resources": [ + { + "fields": [ + { + "name": "version", + "description": "version number", + "unit": "" + }, + { + "name": "aggr_id", + "unit": "", + "description": "unique id for generator aggregates" + }, + { + "name": "w_id", + "unit": "", + "description": "unique id for weather cells" + }, + { + "name": "scn_name", + "unit": " ", + "description": "scenario name" + }, + { + "name": "bus", + "unit": "", + "description": "bus id" + }, + { + "name": "row_number", + "unit": "", + "description": "row number" + } + ], + "name": "supply.ego_aggr_weather", + "format": "sql" + } + ], + "metadata_version": "1.3" +}'; From a2e861e07d157f587f7cb9f5e3ea172ad674b01b Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Tue, 17 Jul 2018 16:41:10 +0200 Subject: [PATCH 11/36] include versioning of supply.ego_aggr_weather --- dataprocessing/sql_snippets/ego_dp_versioning.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dataprocessing/sql_snippets/ego_dp_versioning.sql b/dataprocessing/sql_snippets/ego_dp_versioning.sql index 0c1cbbbe..0f878920 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning.sql @@ -594,3 +594,13 @@ INSERT INTO supply.ego_power_class -- scenario log (project,version,io,schema_name,table_name,script_name,comment) SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_power_class','ego_dp_versioning.sql','versioning'); + +-- subset of generator single to match aggr_id and w_id +INSERT INTO supply.ego_aggr_weather + SELECT 'v0.4.2', + * + FROM model_draft.ego_supply_aggr_weather; + +-- scenario log (project,version,io,schema_name,table_name,script_name,comment) +SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_aggr_weather','ego_dp_versioning.sql','versioning'); + From 3f112f4588eba09be39c00d73513642427e5cd77 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Tue, 17 Jul 2018 17:27:15 +0200 Subject: [PATCH 12/36] change pkey --- preprocessing/sql_snippets/ego_dp_structure_versioning.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/preprocessing/sql_snippets/ego_dp_structure_versioning.sql b/preprocessing/sql_snippets/ego_dp_structure_versioning.sql index 8d12dcaf..4c87a678 100644 --- a/preprocessing/sql_snippets/ego_dp_structure_versioning.sql +++ b/preprocessing/sql_snippets/ego_dp_structure_versioning.sql @@ -5936,6 +5936,7 @@ SELECT obj_description('grid.ego_line_expansion_costs' ::regclass) ::json; SELECT scenario_log('eGo_DP', 'v0.4.0','result','grid','ego_line_expansion_costs','ego_dp_structure_versioning.sql','hv pf line expansion costs'); -- generator single subset +DROP TABLE IF EXISTS supply.ego_aggr_weather; CREATE TABLE supply.ego_aggr_weather ( @@ -5945,7 +5946,7 @@ CREATE TABLE supply.ego_aggr_weather scn_name character varying, bus bigint, row_number bigint, - CONSTRAINT ego_aggr_weather_pkey PRIMARY KEY (version, aggr_id, w_id) + CONSTRAINT ego_aggr_weather_pkey PRIMARY KEY (version, row_number) ); ALTER TABLE supply.ego_aggr_weather OWNER TO oeuser; From 06ac752ff0cf220d640e8bcce02963c23bc359e4 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Wed, 18 Jul 2018 14:59:02 +0200 Subject: [PATCH 13/36] minor changes --- utilities/ego_dp_data_check.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/utilities/ego_dp_data_check.sql b/utilities/ego_dp_data_check.sql index 8b1b5532..59c1ddf3 100644 --- a/utilities/ego_dp_data_check.sql +++ b/utilities/ego_dp_data_check.sql @@ -368,30 +368,30 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl SELECT 'v0.4.2', 'Status Quo', - 'generator time series with more than 8760 entries', + 'generator time series with more or less than 8760 entries', 'model_draft.ego_grid_pf_hv_generator_pq_set', count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set - WHERE array_length(p_set, 1) > 8760 AND scn_name = 'Status Quo'; + WHERE array_length(p_set, 1) != 8760 AND scn_name = 'Status Quo'; INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT 'v0.4.2', 'NEP 2035', - 'generator time series with more than 8760 entries', + 'generator time series with more or less than 8760 entries', 'model_draft.ego_grid_pf_hv_generator_pq_set', count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set - WHERE array_length(p_set, 1) > 8760 AND scn_name = 'NEP 2035'; + WHERE array_length(p_set, 1) != 8760 AND scn_name = 'NEP 2035'; INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT 'v0.4.2', 'eGo 100', - 'generator time series with more than 8760 entries', + 'generator time series with more or less than 8760 entries', 'model_draft.ego_grid_pf_hv_generator_pq_set', count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set - WHERE array_length(p_set, 1) > 8760 AND scn_name = 'eGo 100'; + WHERE array_length(p_set, 1) != 8760 AND scn_name = 'eGo 100'; -- Is the control set for all generators complete? From ad3f12b0b07b12158b34f226da44f9d3271ee7d3 Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Wed, 18 Jul 2018 16:10:00 +0200 Subject: [PATCH 14/36] Minor changes. --- .../ego_dp_powerflow_electrical_neighbour.sql | 100 ++++++------------ 1 file changed, 30 insertions(+), 70 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql index b8b05add..8cc2444d 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql @@ -121,17 +121,21 @@ SET bus_id = (SELECT DISTINCT ON (bus_i) bus_i FROM grid.otg_ehvhv_bus_data WHE WHERE cntr_id = 'SE' AND geom = '0101000020E61000004C93AD8960072A40DBBD816ED4B14B40'; --- Update voltage level of DC-buses to Denmark -UPDATE model_draft.ego_grid_hv_electrical_neighbours_bus +/*UPDATE model_draft.ego_grid_hv_electrical_neighbours_bus SET v_nom = 400 WHERE (cntr_id = 'DK' AND geom ='0101000020E6100000AFB9FEB858EC2740621AE148FB474B40') OR (geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40') AND v_nom = 380; +*/ +DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE (cntr_id = 'DK' AND geom ='0101000020E6100000AFB9FEB858EC2740621AE148FB474B40') + OR (geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40') AND v_nom = 380; + --- Insert buses for DC-lines INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_bus (bus_id, v_nom, geom, cntr_id, central_bus) VALUES (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 450, '0101000020E6100000A444C3ABCE9A254079A450D5E2F24A40', 'SE', FALSE), (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 450, '0101000020E6100000781E63B01D002E40A292E70A7AB74E40', 'SE', TRUE), (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 400, '0101000020E6100000A01CB9F93CB22240376BAAA0021E4C40', 'DK', TRUE), --- Center of DK - (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 400, '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40', 'DE', FALSE), --- Bentwisch HGÜ - (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 400, '0101000020E610000060BB9D50CA422840B5CD3AA107124B40', 'DE', FALSE); --- between Bentwisch and DK + (nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 400, '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40', 'DE', FALSE); --- Bentwisch HGÜ + ---(nextval('model_draft.ego_grid_hv_electrical_neighbours_bus_id'), 400, '0101000020E610000060BB9D50CA422840B5CD3AA107124B40', 'DE', FALSE); --- between Bentwisch and DK DELETE FROM model_draft.ego_grid_hv_electrical_neighbours_bus a USING model_draft.ego_grid_hv_electrical_neighbours_bus b WHERE a.cntr_id = b.cntr_id AND a.geom = b.geom AND a.v_nom = b.v_nom AND a.ctid > b.ctid OR a.cntr_id IS NULL OR a.v_nom IS NULL; @@ -457,88 +461,44 @@ VALUES (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND central_bus = FALSE AND v_nom = 450), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'SE' AND central_bus = TRUE AND v_nom = 450), 600, - 262), - - (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = TRUE AND v_nom = 400), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = FALSE AND v_nom = 400), - 600, --- source: Kontek - ABB - 115),--- source: Kontek - ABB - - (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = FALSE AND v_nom = 400), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = TRUE AND v_nom = 400), - 600,--- source: Kontek - ABB - 115);--- source: Kontek - ABB - -/* To avoid DC-subnetworks from buses only connected via DC-link set only one link between Bentwisch HGÜ and center of Denmark -delete: lines from Bentwisch HGÜ to border of DK, buses connecting them; Update last lines to copy only the ones that are needed -undo instertig --- Insert links from Bentwisch HGÜ to DK (they will replace lines); insert DC.buses (between Bentwisch and HGÜ) -do: keep 400kV bus in Bentwisch HGÜ and update upper lines to : + 262); -(nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), +INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_link (link_id, bus0, bus1, p_nom, length, geom) +VALUES (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = TRUE AND v_nom = 400), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE geom = '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40' AND v_nom = 400), 600, --- source: Kontek - ABB - 170),--- source: Kontek - ABB + 170, --- source: Kontek - ABB + (SELECT ST_Union((SELECT ST_Multi(ST_MakeLine('0101000020E6100000AFB9FEB858EC2740621AE148FB474B40', '0101000020E6100000A01CB9F93CB22240376BAAA0021E4C40'))), + ST_Union('0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40', + (SELECT geom FROM grid.otg_ehvhv_branch_data WHERE topo = '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40' AND branch_voltage = 380000))) + )), -(nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), + (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE geom = '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40' AND v_nom = 400), (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE cntr_id = 'DK' AND central_bus = TRUE AND v_nom = 400), 600,--- source: Kontek - ABB - 115);--- source: Kontek - ABB - -*/ - -UPDATE model_draft.ego_grid_hv_electrical_neighbours_link -SET topo = (SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1 AND scn_name = 'Status Quo'))); - + 170,--- source: Kontek - ABB + (SELECT ST_Union((SELECT ST_Multi(ST_MakeLine('0101000020E6100000AFB9FEB858EC2740621AE148FB474B40', '0101000020E6100000A01CB9F93CB22240376BAAA0021E4C40'))), + ST_Union('0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40', + (SELECT geom FROM grid.otg_ehvhv_branch_data WHERE topo = '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40' AND branch_voltage = 380000))) + )); + UPDATE model_draft.ego_grid_hv_electrical_neighbours_link -SET geom = (SELECT ST_Multi(topo)), +SET topo = (SELECT ST_MakeLine((SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus0), (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE bus_id = bus1 AND scn_name = 'Status Quo'))), efficiency = 0.987*0.974^(length/1000); ---- Insert links from Bentwisch HGÜ to DK (they will replace lines) -INSERT INTO model_draft.ego_grid_hv_electrical_neighbours_link (link_id, bus0, bus1, p_nom, length, geom, topo, efficiency) -VALUES (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND cntr_id = 'DK' AND central_bus = FALSE), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40'), - 600, - 48.12, - ('0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40'), - (SELECT topo FROM grid.otg_ehvhv_branch_data WHERE geom ='0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40'), - 0.987*0.974^(48.12/1000)), - - (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40'), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND cntr_id = 'DK' AND central_bus = FALSE), - 600, - 48.12, - ('0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40'), - (SELECT topo FROM grid.otg_ehvhv_branch_data WHERE geom ='0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40'), - 0.987*0.974^(48.12/1000)), - - (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40'), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40'), - 600, - 7.46, - (SELECT geom FROM grid.otg_ehvhv_branch_data WHERE topo = '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40' AND branch_voltage = 380000), - '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40', - 0.987*0.974^(7.46/1000)), - - (nextval('model_draft.ego_grid_hv_electrical_neighbours_link_id'), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000032A490CBF66D2840DBDB2B66D70C4B40'), - (SELECT bus_id FROM model_draft.ego_grid_hv_electrical_neighbours_bus WHERE v_nom = 400 AND geom = '0101000020E610000060BB9D50CA422840B5CD3AA107124B40'), - 600, - 7.46, - (SELECT geom FROM grid.otg_ehvhv_branch_data WHERE topo = '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40' AND branch_voltage = 380000), - '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40', - 0.987*0.974^(7.46/1000)); +UPDATE model_draft.ego_grid_hv_electrical_neighbours_link +SET geom = (SELECT ST_Multi(topo)) +WHERE geom IS NULL; DELETE FROM model_draft.ego_grid_pf_hv_link WHERE geom IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_link); -DELETE FROM model_draft.ego_grid_pf_hv_line WHERE geom IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_link); +--- Delete lines from Bentwisch HGÜ to Denmark that have been replaced with link +DELETE FROM model_draft.ego_grid_pf_hv_line WHERE geom IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_link) OR +geom IN ('0105000020E610000001000000010200000002000000AFB9FEB858EC2740621AE148FB474B4060BB9D50CA422840B5CD3AA107124B40', + (SELECT geom FROM grid.otg_ehvhv_branch_data WHERE topo = '0102000020E61000000200000032A490CBF66D2840DBDB2B66D70C4B4060BB9D50CA422840B5CD3AA107124B40' AND branch_voltage = 380000)); DELETE FROM model_draft.ego_grid_pf_hv_line WHERE geom IN (SELECT geom FROM model_draft.ego_grid_hv_electrical_neighbours_line); From 28ae2f4feba8b32913e3f7c6139668004a212ac0 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Wed, 18 Jul 2018 16:33:53 +0200 Subject: [PATCH 15/36] Include ego_dp_data_check.sql in sql_snippets --- .../sql_snippets/ego_dp_data_check.sql | 653 ++++++++++++++++++ 1 file changed, 653 insertions(+) create mode 100644 dataprocessing/sql_snippets/ego_dp_data_check.sql diff --git a/dataprocessing/sql_snippets/ego_dp_data_check.sql b/dataprocessing/sql_snippets/ego_dp_data_check.sql new file mode 100644 index 00000000..7a66324a --- /dev/null +++ b/dataprocessing/sql_snippets/ego_dp_data_check.sql @@ -0,0 +1,653 @@ +/* +This script provides a data check for the PF data set generated by the open_eGo data processing. +__copyright__ = "Flensburg University of Applied Sciences, Centre for Sustainable Energy Systems" +__license__ = "GNU Affero General Public License Version 3 (AGPL-3.0)" +__url__ = "https://github.com/openego/data_processing/blob/master/LICENSE" +__author__ = "IlkaCu" +*/ + + + + +DROP TABLE IF EXISTS model_draft.ego_grid_pf_hv_data_check; + +CREATE TABLE model_draft.ego_grid_pf_hv_data_check ( + test_id serial, + version character varying NOT NULL, + scn_name character varying NOT NULL, + test character varying, + table_name character varying, + count int, + CONSTRAINT hv_data_check_pkey PRIMARY KEY (version, scn_name, test)); + +ALTER TABLE model_draft.ego_grid_pf_hv_data_check + owner to oeuser; + + +------------------- +-- grid topology +------------------- + + +-- Do all lines have defined buses in all three scenarios? + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'lines with undefined buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'Status Quo' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo')); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'lines with undefined buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'NEP 2035' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035')); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'lines with undefined buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'eGo 100' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100')); + +-- Do any lines have NULL values in the bus columns? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'lines with NULL values for buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'Status Quo' AND + (bus0 IS NULL OR + bus1 IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'lines with NULL values for buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'NEP 2035' AND + (bus0 IS NULL OR + bus1 IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'lines with NULL values for buses', + 'model_draft.ego_grid_pf_hv_line', + count(*) FROM model_draft.ego_grid_pf_hv_line + WHERE scn_name = 'eGo 100' AND + (bus0 IS NULL OR + bus1 IS NULL); + + + + +-- Do all lines have defined buses in all three scenarios? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'transformers with undefined buses', + 'model_draft.ego_grid_pf_hv_transformer', + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'Status Quo' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo')); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'transformers with undefined buses', + 'model_draft.ego_grid_pf_hv_transformer', + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'NEP 2035' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035')); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'transformers with undefined buses', + 'model_draft.ego_grid_pf_hv_transformer', + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'eGo 100' AND + (bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100') OR + bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100')); + + +-- Do any transformers have NULL values in the bus columns? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'transformers with NULL values for buses' + 'model_draft.ego_grid_pf_hv_transformer',, + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'Status Quo' AND + (bus0 IS NULL OR + bus1 IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'transformers with NULL values for buses', + 'model_draft.ego_grid_pf_hv_transformer', + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'NEP 2035' AND + (bus0 IS NULL OR + bus1 IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'transformers with NULL values for buses', + 'model_draft.ego_grid_pf_hv_transformer', + count(*) FROM model_draft.ego_grid_pf_hv_transformer + WHERE scn_name = 'eGo 100' AND + (bus0 IS NULL OR + bus1 IS NULL); + + +-- Are any EHV substations mistakenly assigned to 110 kV level in the final data model? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'EHV substation as 110 kV bus', + 'model_draft.ego_grid_pf_hv_bus', + count(*) FROM model_draft.ego_grid_pf_hv_bus + WHERE scn_name = 'Status Quo' AND + v_nom >110 AND + bus_id IN (SELECT otg_id FROM model_draft.ego_grid_hvmv_substation); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'EHV substation as 110 kV bus', + 'model_draft.ego_grid_pf_hv_bus', + count(*) FROM model_draft.ego_grid_pf_hv_bus + WHERE scn_name = 'NEP 2035' AND + v_nom >110 AND + bus_id IN (SELECT otg_id FROM model_draft.ego_grid_hvmv_substation); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'EHV substation as 110 kV bus', + 'model_draft.ego_grid_pf_hv_bus', + count(*) FROM model_draft.ego_grid_pf_hv_bus + WHERE scn_name = 'eGo 100' AND + v_nom >110 AND + bus_id IN (SELECT otg_id FROM model_draft.ego_grid_hvmv_substation); + +------------------- +-- generators and time series +------------------- + +-- Do all generators have defined buses? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'generators without defined buses', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'Status Quo' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo') + OR bus IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'generators without defined buses', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'NEP 2035' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035') + OR bus IS NULL); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'generators without defined buses', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'eGo 100' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100') + OR bus IS NULL); + + +-- Do all generators in table pf_generator_single have an otg_id assigned? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'pf_generator_single without defined buses', + 'model_draft.ego_supply_pf_generator_single', + count(*) FROM model_draft.ego_supply_pf_generator_single + WHERE scn_name = 'Status Quo' AND + otg_id IS NULL; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'pf_generator_single without defined buses', + 'model_draft.ego_supply_pf_generator_single', + count(*) FROM model_draft.ego_supply_pf_generator_single + WHERE scn_name = 'NEP 2035' AND + otg_id IS NULL; + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'pf_generator_single without defined buses', + 'model_draft.ego_supply_pf_generator_single', + count(*) FROM model_draft.ego_supply_pf_generator_single + WHERE scn_name = 'eGo 100' AND + otg_id IS NULL; + +-- Do all generators which are not 'reservoir', 'geothermal' or 'other_non_renewable' have defined timeseries in all three scenarios? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'generators (source != 14, 15, 10) without time series', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'Status Quo' AND + generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator_pq_set WHERE scn_name = 'Status Quo') AND + source NOT IN (14, 15, 10); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'generators (source != 14, 15, 10) without time series', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'NEP 2035' AND + generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator_pq_set WHERE scn_name = 'NEP 2035') AND + source NOT IN (14, 15, 10); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'generators (source != 14, 15, 10) without time series', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE scn_name = 'eGo 100' AND + generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator_pq_set WHERE scn_name = 'eGo 100') AND + source NOT IN (14, 15, 10); + +-- Do all generator time series have defined generators in the data model? + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'time series without defined generators', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE scn_name = 'Status Quo' AND + (generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator WHERE scn_name = 'Status Quo') + OR generator_id IS NULL); + + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'time series without defined generators', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE scn_name = 'NEP 2035' AND + (generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator WHERE scn_name = 'NEP 2035') + OR generator_id IS NULL); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'time series without defined generators', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE scn_name = 'eGo 100' AND + (generator_id NOT IN (SELECT generator_id FROM model_draft.ego_grid_pf_hv_generator WHERE scn_name = 'eGo 100') + OR generator_id IS NULL); + +-- Do any generators have timeseries with more than 8760 entries? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'generator time series with more or less than 8760 entries', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE array_length(p_set, 1) != 8760 AND scn_name = 'Status Quo'; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'generator time series with more or less than 8760 entries', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE array_length(p_set, 1) != 8760 AND scn_name = 'NEP 2035'; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'generator time series with more or less than 8760 entries', + 'model_draft.ego_grid_pf_hv_generator_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_generator_pq_set + WHERE array_length(p_set, 1) != 8760 AND scn_name = 'eGo 100'; + + +-- Is the control set for all generators complete? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'generator control incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE control IS NULL AND scn_name = 'Status Quo'; + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'generator control incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE control IS NULL AND scn_name = 'NEP 2035'; + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'generator control incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE control IS NULL AND scn_name = 'eGo 100'; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'all', + 'generator control incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_supply_pf_generator_single + WHERE control IS NULL; + + +-- Are there any generators without source? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'generator source incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE source IS NULL AND scn_name = 'Status Quo'; + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'generator source incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE source IS NULL AND scn_name = 'NEP 2035'; + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'generator source incomplete', + 'model_draft.ego_grid_pf_hv_generator', + count(*) FROM model_draft.ego_grid_pf_hv_generator + WHERE source IS NULL AND scn_name = 'eGo 100'; + + +------------------- +-- loads and time series +------------------- + +-- Do all loads have defined buses? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'loads without defined buses', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'Status Quo' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'Status Quo') + OR bus IS NULL); + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'loads without defined buses', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'NEP 2035' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'NEP 2035') + OR bus IS NULL); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'loads without defined buses', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'eGo 100' AND + (bus NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE scn_name = 'eGo 100') + OR bus IS NULL); + + +-- Do all loads have defined timeseries in all three scenarios? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'loads without time series', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'Status Quo' AND + load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load_pq_set WHERE scn_name = 'Status Quo'); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'loads without time series', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'NEP 2035' AND + load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load_pq_set WHERE scn_name = 'NEP 2035'); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'loads without time series', + 'model_draft.ego_grid_pf_hv_load', + count(*) FROM model_draft.ego_grid_pf_hv_load + WHERE scn_name = 'eGo 100' AND + load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load_pq_set WHERE scn_name = 'eGo 100'); + +-- Do all load time series have defined loads in the data model? + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'time series without defined loads', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE scn_name = 'Status Quo' AND + (load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load WHERE scn_name = 'Status Quo') + OR load_id IS NULL); + + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'time series without defined loads', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE scn_name = 'NEP 2035' AND + (load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load WHERE scn_name = 'NEP 2035') + OR load_id IS NULL); + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'time series without defined loads', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE scn_name = 'eGo 100' AND + (load_id NOT IN (SELECT load_id FROM model_draft.ego_grid_pf_hv_load WHERE scn_name = 'eGo 100') + OR load_id IS NULL); + +-- Do any loads have timeseries with more than 8760 entries? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'Status Quo', + 'load time series with more than 8760 entries', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE array_length(p_set, 1) > 8760 AND scn_name = 'Status Quo'; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'NEP 2035', + 'load time series with more than 8760 entries', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE array_length(p_set, 1) > 8760 AND scn_name = 'NEP 2035'; + + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'eGo 100', + 'load time series with more than 8760 entries', + 'model_draft.ego_grid_pf_hv_load_pq_set', + count(*) FROM model_draft.ego_grid_pf_hv_load_pq_set + WHERE array_length(p_set, 1) > 8760 AND scn_name = 'eGo 100'; + +---------------- +-- REA +---------------- + +-- Were all renewable generators reallocated by the REA scripts? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'all', + 'generators without rea_geom_new', + 'model_draft.ego_dp_supply_res_powerplant', + count(*) FROM model_draft_ego_dp_supply_res_powerplant + WHERE rea_geom_new IS NULL; + + +---------------- +-- MV grid districts +---------------- + +-- Are there any mv grid districts without assigned generators? + +INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) + SELECT + 'v0.4.2', + 'all', + 'mv grid districts without generators', + 'model_draft.ego_grid_mv_griddistrict', + count(*) FROM model_draft.ego_grid_mv_griddistrict + WHERE subst_id NOT IN + (SELECT subst_id FROM model_draft.ego_grid_hvmv_substation WHERE otg_id IN + (SELECT bus FROM model_draft.ego_grid_pf_hv_generator)); + + +---------------- +-- Electrical neighbours +---------------- + +-- Are all electrical neighbours included in the data set? + +-- Are generators and generator time series assigned to all electrical neighbours? + +-- Are loads and load time series assigned to all electrical neighbours? From 5aa7616c1c846d72ae514fdf359ab924526b7374 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Wed, 18 Jul 2018 16:37:12 +0200 Subject: [PATCH 16/36] include scenario_log --- dataprocessing/sql_snippets/ego_dp_data_check.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dataprocessing/sql_snippets/ego_dp_data_check.sql b/dataprocessing/sql_snippets/ego_dp_data_check.sql index 7a66324a..170e1c73 100644 --- a/dataprocessing/sql_snippets/ego_dp_data_check.sql +++ b/dataprocessing/sql_snippets/ego_dp_data_check.sql @@ -22,6 +22,15 @@ CREATE TABLE model_draft.ego_grid_pf_hv_data_check ( ALTER TABLE model_draft.ego_grid_pf_hv_data_check owner to oeuser; + +-- metadata +COMMENT ON TABLE model_draft.ego_grid_pf_hv_data_check IS '{ + "comment": "eGoDP - Temporary table", + "version": "v0.4.2", + "published": "none" }'; + +-- select description +SELECT obj_description('model_draft.ego_demand_la_zensus' ::regclass) ::json; ------------------- @@ -651,3 +660,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl -- Are generators and generator time series assigned to all electrical neighbours? -- Are loads and load time series assigned to all electrical neighbours? + + +-- scenario log (project,version,io,schema_name,table_name,script_name,comment) +SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_data_check','ego_dp_data_check.sql',' '); From 4b6fd40d7753783a2537e2265173c449d39917e9 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Wed, 18 Jul 2018 16:41:05 +0200 Subject: [PATCH 17/36] include data check --- dataprocessing/eGo_data_processing.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dataprocessing/eGo_data_processing.py b/dataprocessing/eGo_data_processing.py index 00c7445a..edc41ea4 100644 --- a/dataprocessing/eGo_data_processing.py +++ b/dataprocessing/eGo_data_processing.py @@ -105,6 +105,7 @@ def data_processing(): 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100) 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages + 'ego_dp_data_check.sql', # Check powerflow data for plausibility ## POST-PROCESSING 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data From d1d62c266a05a462b36d93671053d02895223a08 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Wed, 18 Jul 2018 16:55:24 +0200 Subject: [PATCH 18/36] create table grid.ego_pf_hv_data_check --- .../ego_dp_structure_versioning.sql | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/preprocessing/sql_snippets/ego_dp_structure_versioning.sql b/preprocessing/sql_snippets/ego_dp_structure_versioning.sql index 4c87a678..9904cb0a 100644 --- a/preprocessing/sql_snippets/ego_dp_structure_versioning.sql +++ b/preprocessing/sql_snippets/ego_dp_structure_versioning.sql @@ -6033,3 +6033,103 @@ COMMENT ON TABLE supply.ego_aggr_weather IS '{ ], "metadata_version": "1.3" }'; + +-- data check for pf data +DROP TABLE IF EXISTS grid.ego_pf_hv_data_check; + +CREATE TABLE grid.ego_pf_hv_data_check +( + test_id integer NOT NULL, + version character varying NOT NULL, + scn_name character varying NOT NULL, + test character varying NOT NULL, + table_name character varying, + count integer, + CONSTRAINT hv_grid_data_check_pkey PRIMARY KEY (version, test_id) +); + +ALTER TABLE grid.ego_pf_hv_data_check + OWNER TO oeuser; + + -- metadata + +COMMENT ON TABLE grid.ego_pf_hv_data_check IS '{ + "title": "eGo pf data check", + "description": "A plausibility check for powerflow data", + "language": [ "eng" ], + "spatial": { + "location": "none", + "extend": "none", + "resolution": "none" + }, + "temporal": { + "reference_date": "none", + "start": "none", + "end": "none", + "resolution": "none" + }, + "sources": [ + { + "name": "eGo dataprocessing", + "description": "open_eGo dataprocessing code", + "url": "https://github.com/openego/data_processing", + "license": "GNU Affero General Public License Version 3 (AGPL-3.0)", + "copyright": "eGo dataprocessing © Flensburg University of Applied Sciences, Centre for Sustainable Energy Systems © Europa-Universität Flensburg, Centre for Sustainable Energy Systems © Reiner Lemoine Institut © DLR Institute for Networked Energy Systems" + } + ], + "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": "© Flensburg University of Applied Sciences, Center for Sustainable Energy Systems" + }, + "contributors": [ + { + "name": "ilka_cussmann", + "email": "ilka.cussmann@hs-flensburg.de", + "date": "2018-07-18", + "comment": "Create table" + } + ], + "resources": [ + { + "fields": [ + { + "name": "test_id", + "description": "unique ID for the specific test", + "unit": "" + }, + { + "name": "version", + "unit": "", + "description": "version number" + }, + { + "name": "scn_name", + "unit": "", + "description": "scenario name" + }, + { + "name": "test", + "unit": " ", + "description": "description of executed test" + }, + { + "name": "table_name", + "unit": "", + "description": "name of tested table" + }, + { + "name": "count", + "unit": "", + "description": "number of buggy entries" + } + ], + "name": "grid.ego_pf_hv_data_check", + "format": "sql" + } + ], + "metadata_version": "1.3" +}'; From 9503b1786db79c7d6a22628e13609557b5c1af6e Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Wed, 18 Jul 2018 17:03:18 +0200 Subject: [PATCH 19/36] Include versioning of ego_grid_pf_hv_data_check --- dataprocessing/sql_snippets/ego_dp_versioning.sql | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dataprocessing/sql_snippets/ego_dp_versioning.sql b/dataprocessing/sql_snippets/ego_dp_versioning.sql index 0f878920..a590ff2d 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning.sql @@ -604,3 +604,11 @@ INSERT INTO supply.ego_aggr_weather -- scenario log (project,version,io,schema_name,table_name,script_name,comment) SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_aggr_weather','ego_dp_versioning.sql','versioning'); +-- pf data check + +INSERT INTO grid.ego_pf_hv_data_check + SELECT * + FROM model_draft.ego_grid_pf_hv_data_check; + +-- scenario log (project,version,io,schema_name,table_name,script_name,comment) +SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning'); From 31d3432ed762f2b0a956b37eeefab3844130a316 Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Thu, 19 Jul 2018 15:36:40 +0200 Subject: [PATCH 20/36] Fix x-value of transformer. --- .../sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql index 4ccd8d56..239095ba 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql @@ -1,4 +1,4 @@ -DROP SEQUENCE IF EXISTS model_draft.ego_grid_hv_fix_errors_bus_id CASCADE; +DROP SEQUENCE IF EXISTS model_draft.ego_grid_hv_fix_errors_bus_id CASCADE; CREATE SEQUENCE model_draft.ego_grid_hv_fix_errors_bus_id; SELECT setval('model_draft.ego_grid_hv_fix_errors_bus_id', (max(bus_id)+1)) FROM model_draft.ego_grid_pf_hv_bus; @@ -111,7 +111,7 @@ SELECT nextval('model_draft.ego_grid_hv_fix_errors_transformer_id'), (SELECT DISTINCT ON (bus_id) bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE v_nom = 220 AND geom = '0101000020E6100000D38040358C8525403935408972F44A40'), (SELECT DISTINCT ON (bus_id) bus_id FROM model_draft.ego_grid_pf_hv_bus WHERE v_nom = 380 AND geom = '0101000020E6100000D38040358C8525403935408972F44A40'), 600, - 9.68, + 0.0002, 0, 1, '0102000020E610000002000000D38040358C8525403935408972F44A40D38040358C8525403935408972F44A40', From cfc4e460a74547b5425808d5f050e23fc300372a Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Tue, 24 Jul 2018 11:58:50 +0200 Subject: [PATCH 21/36] change version number to v0.4.4 --- .../ego_dp_loadarea_peakload.py | 4 +- .../ego_dp_powerflow_griddistrict_demand.py | 6 +- .../python_scripts/setup_ego_mv_powerflow.py | 2 +- .../sql_snippets/ego_dp_data_check.sql | 106 ++++----- .../sql_snippets/ego_dp_loadarea_census.sql | 16 +- .../ego_dp_loadarea_consumption.sql | 8 +- .../ego_dp_loadarea_griddistrict_results.sql | 24 +- .../ego_dp_loadarea_industry_consumer.sql | 20 +- .../sql_snippets/ego_dp_loadarea_landuse.sql | 14 +- .../ego_dp_loadarea_loadcut_griddistrict.sql | 58 ++--- .../ego_dp_loadarea_loadcut_voronoi.sql | 44 ++-- .../sql_snippets/ego_dp_loadarea_loadmelt.sql | 30 +-- .../sql_snippets/ego_dp_loadarea_loads.sql | 14 +- .../sql_snippets/ego_dp_loadarea_peakload.sql | 6 +- .../ego_dp_loadarea_statistic.sql | 40 ++-- .../ego_dp_lv_consumption_peakload.sql | 8 +- .../sql_snippets/ego_dp_lv_griddistrict.sql | 32 +-- .../sql_snippets/ego_dp_lv_loadcut.sql | 26 +-- .../sql_snippets/ego_dp_lv_substation.sql | 20 +- .../ego_dp_lv_substation_voronoi.sql | 8 +- .../sql_snippets/ego_dp_mv_griddistrict.sql | 108 ++++----- .../ego_dp_powerflow_assignment_generator.sql | 10 +- .../ego_dp_powerflow_assignment_load.sql | 4 +- .../ego_dp_powerflow_assignment_otgid.sql | 4 +- .../ego_dp_powerflow_assignment_storage.sql | 2 +- .../ego_dp_powerflow_assignment_unid.sql | 6 +- .../ego_dp_powerflow_create_pp_mview.sql | 12 +- .../ego_dp_powerflow_fix_ehv_subnetworks.sql | 6 +- ...ego_dp_powerflow_grid_future_scenarios.sql | 6 +- .../ego_dp_powerflow_hv_setup.sql | 28 +-- .../ego_dp_powerflow_lopf_data.sql | 6 +- .../ego_dp_powerflow_osmtgmod_to_pypsa.sql | 6 +- .../ego_dp_powerflow_timeseries_demand.sql | 4 +- .../ego_dp_powerflow_timeseries_generator.sql | 2 +- .../ego_dp_structure_input_verification.sql | 36 +-- .../sql_snippets/ego_dp_substation_ehv.sql | 40 ++-- .../sql_snippets/ego_dp_substation_hvmv.sql | 42 ++-- .../ego_dp_substation_hvmv_voronoi.sql | 14 +- .../ego_dp_substation_id_to_generator.sql | 4 +- .../sql_snippets/ego_dp_substation_otg.sql | 10 +- ...dp_supply_dp_powerflow_create_pp_mview.sql | 40 ++-- .../sql_snippets/ego_dp_versioning.sql | 220 +++++++++--------- .../sql_snippets/ego_dp_versioning_mviews.sql | 40 ++-- .../ego_dp_versioning_overview.sql | 60 ++--- .../ego_pp_nep2035_grid_variations.sql | 8 +- .../sql_snippets/rea/ego_dp_conv.sql | 4 +- .../sql_snippets/rea/ego_dp_lattice_500m.sql | 6 +- .../sql_snippets/rea/ego_dp_lattice_50m.sql | 6 +- .../rea/ego_dp_rea_lattice_per_area_500m.sql | 16 +- .../rea/ego_dp_rea_lattice_per_area_50m.sql | 8 +- .../sql_snippets/rea/ego_dp_rea_m1.sql | 28 +-- .../sql_snippets/rea/ego_dp_rea_m2.sql | 18 +- .../sql_snippets/rea/ego_dp_rea_m3.sql | 14 +- .../sql_snippets/rea/ego_dp_rea_m4.sql | 14 +- .../sql_snippets/rea/ego_dp_rea_m5.sql | 16 +- .../sql_snippets/rea/ego_dp_rea_results.sql | 14 +- .../sql_snippets/rea/ego_dp_rea_setup.sql | 24 +- .../rea/ego_dp_rea_wpa_per_mvgd.sql | 12 +- 58 files changed, 692 insertions(+), 692 deletions(-) diff --git a/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py b/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py index 988687e8..8968dbfc 100755 --- a/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py +++ b/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py @@ -128,7 +128,7 @@ def add_sectoral_peak_load(load_areas, **kwargs): columns=columns) write_ego_scenario_log(conn=conn, - version='v0.4.0', + version='v0.4.4', io='input', schema='model_draft', table=table, @@ -276,7 +276,7 @@ def add_sectoral_peak_load(load_areas, **kwargs): metadata.submit_comment(conn, json_str, schema, target_table) write_ego_scenario_log(conn=conn, - version='v0.4.0', + version='v0.4.4', io='output', schema='model_draft', table=target_table, diff --git a/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py b/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py index 7a593f37..d078d55f 100644 --- a/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py +++ b/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py @@ -65,7 +65,7 @@ def demand_per_mv_grid_district(): annual_demand_df = annual_demand_df.loc[~pd.isnull(annual_demand_df.index)] write_scenario_log(conn=conn, - version='v0.4.2', + version='v0.4.4', project='eGoDP', io='input', schema='model_draft', @@ -80,7 +80,7 @@ def demand_per_mv_grid_district(): index_col='polygon_id') write_scenario_log(conn=conn, - version='v0.4.2', + version='v0.4.4', project='eGoDP', io='input', schema='model_draft', @@ -188,7 +188,7 @@ def demand_per_mv_grid_district(): metadata.submit_comment(conn, json_str, schema, target_table) write_scenario_log(conn=conn, - version='v0.4.2', + version='v0.4.4', project='eGoDP', io='output', schema=schema, diff --git a/dataprocessing/python_scripts/setup_ego_mv_powerflow.py b/dataprocessing/python_scripts/setup_ego_mv_powerflow.py index d03adb68..5c3bde91 100644 --- a/dataprocessing/python_scripts/setup_ego_mv_powerflow.py +++ b/dataprocessing/python_scripts/setup_ego_mv_powerflow.py @@ -68,7 +68,7 @@ def create_powerflow_schema(engine, schema, tables): tools.grant_db_access(conn, schema, table, group) write_ego_scenario_log(conn=conn, - version='v0.4.2', + version='v0.4.4', io='output', schema=schema, table=table, diff --git a/dataprocessing/sql_snippets/ego_dp_data_check.sql b/dataprocessing/sql_snippets/ego_dp_data_check.sql index 170e1c73..378c8204 100644 --- a/dataprocessing/sql_snippets/ego_dp_data_check.sql +++ b/dataprocessing/sql_snippets/ego_dp_data_check.sql @@ -26,7 +26,7 @@ ALTER TABLE model_draft.ego_grid_pf_hv_data_check -- metadata COMMENT ON TABLE model_draft.ego_grid_pf_hv_data_check IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- select description @@ -43,7 +43,7 @@ SELECT obj_description('model_draft.ego_demand_la_zensus' ::regclass) ::json; INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'lines with undefined buses', 'model_draft.ego_grid_pf_hv_line', @@ -54,7 +54,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'lines with undefined buses', 'model_draft.ego_grid_pf_hv_line', @@ -66,7 +66,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'lines with undefined buses', 'model_draft.ego_grid_pf_hv_line', @@ -79,7 +79,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'lines with NULL values for buses', 'model_draft.ego_grid_pf_hv_line', @@ -90,7 +90,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'lines with NULL values for buses', 'model_draft.ego_grid_pf_hv_line', @@ -101,7 +101,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'lines with NULL values for buses', 'model_draft.ego_grid_pf_hv_line', @@ -117,7 +117,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'transformers with undefined buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -128,7 +128,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'transformers with undefined buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -140,7 +140,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'transformers with undefined buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -154,7 +154,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'transformers with NULL values for buses' 'model_draft.ego_grid_pf_hv_transformer',, @@ -165,7 +165,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'transformers with NULL values for buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -176,7 +176,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'transformers with NULL values for buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -190,7 +190,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'EHV substation as 110 kV bus', 'model_draft.ego_grid_pf_hv_bus', @@ -201,7 +201,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'EHV substation as 110 kV bus', 'model_draft.ego_grid_pf_hv_bus', @@ -212,7 +212,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'EHV substation as 110 kV bus', 'model_draft.ego_grid_pf_hv_bus', @@ -229,7 +229,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'generators without defined buses', 'model_draft.ego_grid_pf_hv_generator', @@ -240,7 +240,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'generators without defined buses', 'model_draft.ego_grid_pf_hv_generator', @@ -252,7 +252,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'generators without defined buses', 'model_draft.ego_grid_pf_hv_generator', @@ -266,7 +266,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'pf_generator_single without defined buses', 'model_draft.ego_supply_pf_generator_single', @@ -277,7 +277,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'pf_generator_single without defined buses', 'model_draft.ego_supply_pf_generator_single', @@ -287,7 +287,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'pf_generator_single without defined buses', 'model_draft.ego_supply_pf_generator_single', @@ -299,7 +299,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'generators (source != 14, 15, 10) without time series', 'model_draft.ego_grid_pf_hv_generator', @@ -311,7 +311,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'generators (source != 14, 15, 10) without time series', 'model_draft.ego_grid_pf_hv_generator', @@ -322,7 +322,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'generators (source != 14, 15, 10) without time series', 'model_draft.ego_grid_pf_hv_generator', @@ -336,7 +336,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'time series without defined generators', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -349,7 +349,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'time series without defined generators', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -361,7 +361,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'time series without defined generators', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -374,7 +374,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'generator time series with more or less than 8760 entries', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -384,7 +384,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'generator time series with more or less than 8760 entries', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -394,7 +394,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'generator time series with more or less than 8760 entries', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -406,7 +406,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'generator control incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -415,7 +415,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'generator control incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -424,7 +424,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'generator control incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -434,7 +434,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'all', 'generator control incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -446,7 +446,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'generator source incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -455,7 +455,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'generator source incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -464,7 +464,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'generator source incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -480,7 +480,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'loads without defined buses', 'model_draft.ego_grid_pf_hv_load', @@ -491,7 +491,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'loads without defined buses', 'model_draft.ego_grid_pf_hv_load', @@ -503,7 +503,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'loads without defined buses', 'model_draft.ego_grid_pf_hv_load', @@ -517,7 +517,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'loads without time series', 'model_draft.ego_grid_pf_hv_load', @@ -528,7 +528,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'loads without time series', 'model_draft.ego_grid_pf_hv_load', @@ -539,7 +539,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'loads without time series', 'model_draft.ego_grid_pf_hv_load', @@ -552,7 +552,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'time series without defined loads', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -565,7 +565,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'time series without defined loads', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -577,7 +577,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'time series without defined loads', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -590,7 +590,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'Status Quo', 'load time series with more than 8760 entries', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -600,7 +600,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'NEP 2035', 'load time series with more than 8760 entries', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -610,7 +610,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'eGo 100', 'load time series with more than 8760 entries', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -625,7 +625,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'all', 'generators without rea_geom_new', 'model_draft.ego_dp_supply_res_powerplant', @@ -641,7 +641,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.2', + 'v0.4.4', 'all', 'mv grid districts without generators', 'model_draft.ego_grid_mv_griddistrict', @@ -663,4 +663,4 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_data_check','ego_dp_data_check.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_data_check','ego_dp_data_check.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_census.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_census.sql index 0224d058..9a363388 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_census.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_census.sql @@ -11,7 +11,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','destatis_zensus_population_per_ha_invg_mview','ego_dp_loadarea_census.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','destatis_zensus_population_per_ha_invg_mview','ego_dp_loadarea_census.sql',' '); -- zensus load DROP TABLE IF EXISTS model_draft.ego_demand_la_zensus CASCADE; @@ -43,7 +43,7 @@ CREATE INDEX ego_demand_la_zensus_geom_idx ON model_draft.ego_demand_la_zensus USING GIST (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_la_osm','ego_dp_loadarea_census.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_la_osm','ego_dp_loadarea_census.sql',' '); -- population in osm loads UPDATE model_draft.ego_demand_la_zensus AS t1 @@ -68,14 +68,14 @@ ALTER TABLE model_draft.ego_demand_la_zensus OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_la_zensus IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- select description SELECT obj_description('model_draft.ego_demand_la_zensus' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_la_zensus','ego_dp_loadarea_census.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_la_zensus','ego_dp_loadarea_census.sql',' '); -- cluster from zensus load lattice @@ -114,7 +114,7 @@ ALTER TABLE model_draft.ego_demand_la_zensus_cluster OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_la_zensus_cluster IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- insert cluster @@ -146,7 +146,7 @@ UPDATE model_draft.ego_demand_la_zensus_cluster AS t1 WHERE t1.cid = t2.cid; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_la_zensus_cluster','ego_dp_loadarea_census.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_la_zensus_cluster','ego_dp_loadarea_census.sql',' '); -- zensus stats @@ -178,8 +178,8 @@ ALTER MATERIALIZED VIEW model_draft.ego_society_zensus_per_la_mview OWNER TO oeu -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_society_zensus_per_la_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_society_zensus_per_la_mview','ego_dp_loadarea_census.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_society_zensus_per_la_mview','ego_dp_loadarea_census.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_consumption.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_consumption.sql index 034133e9..8c065c5d 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_consumption.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_consumption.sql @@ -9,10 +9,10 @@ __author__ = "IlkaCu, Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_per_district','ego_dp_loadarea_consumption.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_per_district','ego_dp_loadarea_consumption.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_consumption.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_consumption.sql',' '); -- landuse area per district ALTER TABLE model_draft.ego_demand_per_district @@ -99,7 +99,7 @@ UPDATE model_draft.ego_demand_loadarea a -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','demand','ego_demand_federalstate','ego_dp_loadarea_consumption.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','demand','ego_demand_federalstate','ego_dp_loadarea_consumption.sql',' '); -- sector consumption of residential per loadarea UPDATE model_draft.ego_demand_loadarea a @@ -203,4 +203,4 @@ COMMENT ON TABLE model_draft.ego_demand_loadarea IS SELECT obj_description('model_draft.ego_demand_loadarea' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_consumption.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_consumption.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_griddistrict_results.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_griddistrict_results.sql index 33bed6c2..1be246af 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_griddistrict_results.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_griddistrict_results.sql @@ -17,7 +17,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_griddistrict_results.sql',' '); -- Area of MV Griddistrict UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -31,7 +31,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input', 'boundaries','bkg_vg250_6_gem','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input', 'boundaries','bkg_vg250_6_gem','ego_dp_loadarea_griddistrict_results.sql',' '); -- Municipality (Gemeinden) UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -49,7 +49,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_griddistrict_results.sql',' '); -- Municipality parts (Gemeinde-Einzelteile) UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -67,7 +67,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict_type1','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict_type1','ego_dp_loadarea_griddistrict_results.sql',' '); -- Municipality types - Type1 UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -85,7 +85,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_boundaries_hvmv_subst_per_gem_1_mview','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_hvmv_subst_per_gem_1_mview','ego_dp_loadarea_griddistrict_results.sql',' '); UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET type1_cnt = t2.type_cnt @@ -101,7 +101,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict_type2','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict_type2','ego_dp_loadarea_griddistrict_results.sql',' '); -- Municipality types - Type2 UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -118,7 +118,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_hvmv_substation_voronoi_cut','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation_voronoi_cut','ego_dp_loadarea_griddistrict_results.sql',' '); UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET type2_cnt = t2.type_cnt @@ -134,7 +134,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict_type3','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict_type3','ego_dp_loadarea_griddistrict_results.sql',' '); -- Municipality types - Type3 UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -151,7 +151,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_boundaries_hvmv_subst_per_gem_3_mview','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_hvmv_subst_per_gem_3_mview','ego_dp_loadarea_griddistrict_results.sql',' '); UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET type3_cnt = t2.type_cnt @@ -178,7 +178,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_griddistrict_results.sql',' '); -- Population results UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -202,7 +202,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_griddistrict_results.sql',' '); -- Loadarea results - count UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -278,7 +278,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET consumption_per_area = consumption *1000000 / area_ha; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_griddistrict_results.sql',' '); /* -- test diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_industry_consumer.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_industry_consumer.sql index 6a370819..de6ccd61 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_industry_consumer.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_industry_consumer.sql @@ -12,10 +12,10 @@ __author__ = "IlkaCu, Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','demand','ego_demand_federalstate','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','demand','ego_demand_federalstate','ego_dp_loadarea_industry_consumer.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','economy','destatis_gva_per_district','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','economy','destatis_gva_per_district','ego_dp_loadarea_industry_consumer.sql',' '); -- Calculate specific electricity consumption per million Euro GVA for each federal state DROP TABLE IF EXISTS model_draft.ego_demand_per_gva CASCADE; @@ -75,7 +75,7 @@ COMMENT ON TABLE model_draft.ego_demand_per_gva IS }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_per_gva','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_per_gva','ego_dp_loadarea_industry_consumer.sql',' '); -- electricity consumption per district based on gross value added DROP TABLE IF EXISTS model_draft.ego_demand_per_district CASCADE; @@ -231,7 +231,7 @@ CREATE INDEX landuse_industry_geom_centre_idx -- Calculate NUTS -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','boundaries','bkg_vg250_4_krs_mview','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_4_krs_mview','ego_dp_loadarea_industry_consumer.sql',' '); UPDATE model_draft.ego_landuse_industry a SET nuts = b.nuts @@ -355,14 +355,14 @@ COMMENT ON TABLE model_draft.ego_landuse_industry IS }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_landuse_industry','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_landuse_industry','ego_dp_loadarea_industry_consumer.sql',' '); -- Identify large scale consumer -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_supply_conv_powerplant','ego_dp_loadarea_industry_consumer.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_supply_conv_powerplant','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_industry_consumer.sql',' '); DROP TABLE IF EXISTS model_draft.ego_demand_hv_largescaleconsumer CASCADE; CREATE TABLE model_draft.ego_demand_hv_largescaleconsumer AS @@ -475,10 +475,10 @@ CREATE INDEX large_scale_consumer_geom_centre_idx -- Identify corresponding bus for large scale consumer (lsc) with the help of ehv-voronoi -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','calc_ego_substation','ego_deu_voronoi_ehv','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','calc_ego_substation','ego_deu_voronoi_ehv','ego_dp_loadarea_industry_consumer.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_hvmv_substation','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_loadarea_industry_consumer.sql',' '); UPDATE model_draft.ego_demand_hv_largescaleconsumer a SET subst_id = b.subst_id @@ -558,7 +558,7 @@ COMMENT ON TABLE model_draft.ego_demand_hv_largescaleconsumer IS SELECT obj_description('model_draft.ego_demand_hv_largescaleconsumer' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_hv_largescaleconsumer','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_hv_largescaleconsumer','ego_dp_loadarea_industry_consumer.sql',' '); /* diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_landuse.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_landuse.sql index e8b9e5cf..5e3f7c40 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_landuse.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_landuse.sql @@ -48,7 +48,7 @@ __author__ = "Ludee" -- ToDo: change "urban" to electrified -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon','ego_dp_loadarea_landuse.sql',' '); -- filter urban DROP TABLE IF EXISTS openstreetmap.osm_deu_polygon_urban CASCADE; @@ -113,7 +113,7 @@ ALTER TABLE openstreetmap.osm_deu_polygon_urban OWNER TO oeuser; -- OSM Urban Landuse Inside vg250 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_loadarea_landuse.sql',' '); -- Calculate 'inside' vg250 UPDATE openstreetmap.osm_deu_polygon_urban AS t1 @@ -298,7 +298,7 @@ INSERT INTO openstreetmap.osm_deu_polygon_urban ORDER BY clean.gid; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_landuse.sql',' '); -- -- "Validate (geom)" (OK!) -> 22.000ms =0 @@ -375,7 +375,7 @@ CREATE INDEX osm_deu_polygon_urban_sector_1_residential_mview_geom_idx ALTER TABLE openstreetmap.osm_deu_polygon_urban_sector_1_residential_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_landuse.sql',' '); -- Sector 2. Retail @@ -407,7 +407,7 @@ CREATE INDEX osm_deu_polygon_urban_sector_2_retail_mview_geom_idx ALTER TABLE openstreetmap.osm_deu_polygon_urban_sector_2_retail_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_landuse.sql',' '); -- Sector 3. Industrial @@ -443,7 +443,7 @@ CREATE INDEX osm_deu_polygon_urban_sector_3_industrial_mview_geom_idx ALTER TABLE openstreetmap.osm_deu_polygon_urban_sector_3_industrial_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_landuse.sql',' '); -- Sector 4. Agricultural @@ -474,7 +474,7 @@ CREATE INDEX osm_deu_polygon_urban_sector_4_agricultural_mview_geom_idx ALTER TABLE openstreetmap.osm_deu_polygon_urban_sector_4_agricultural_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_landuse.sql',' '); -- -- "Validate (geom)" (OK!) -> 22.000ms =0 diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_griddistrict.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_griddistrict.sql index 44e3a5cc..7063b75b 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_griddistrict.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_griddistrict.sql @@ -66,13 +66,13 @@ ALTER TABLE model_draft.ego_demand_loadarea OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_loadarea IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- insert cutted load melt INSERT INTO model_draft.ego_demand_loadarea (geom) @@ -113,7 +113,7 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- metadata COMMENT ON TABLE model_draft.ego_demand_loadarea IS '{ "comment": "eGoDP - Versioning table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "demand.ego_dp_loadarea" }'; -- Identify Loadarea smaller than 100m² @@ -139,18 +139,18 @@ ALTER TABLE model_draft.ego_demand_loadarea_smaller100m2_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_loadarea_smaller100m2_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_loadarea_smaller100m2_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_smaller100m2_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- Exclude Loadarea smaller than 100m² DELETE FROM model_draft.ego_demand_loadarea AS loads WHERE loads.area_ha < 0.001; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- Generate Centre of Loadareas with Centroid and PointOnSurface @@ -205,7 +205,7 @@ WHERE NOT ST_CONTAINS(loads.geom,loads.geom_centre); */ -- Calculate population from Census 2011 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- zensus 2011 population UPDATE model_draft.ego_demand_loadarea AS t1 @@ -227,7 +227,7 @@ UPDATE model_draft.ego_demand_loadarea AS t1 /* -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','economy','ioer_urban_share_industrial_centroid','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','economy','ioer_urban_share_industrial_centroid','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- ioer industry share UPDATE model_draft.ego_demand_loadarea AS t1 @@ -257,7 +257,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_1_residentia CONSTRAINT urban_sector_per_grid_district_1_residential_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_1_residential (geom) @@ -298,11 +298,11 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_griddistrict_1_residential IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- 2. Retail sector @@ -313,7 +313,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_2_retail ( CONSTRAINT urban_sector_per_grid_district_2_retail_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_2_retail (geom) @@ -354,15 +354,15 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_griddistrict_2_retail IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- filter Industrial without largescale @@ -387,11 +387,11 @@ ALTER MATERIALIZED VIEW openstreetmap.osm_deu_polygon_urban_sector_3_industrial_ -- metadata COMMENT ON MATERIALIZED VIEW openstreetmap.osm_deu_polygon_urban_sector_3_industrial_nolargescale_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_nolargescale_mview','setup_osm_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_nolargescale_mview','setup_osm_landuse.sql',' '); /* -- check @@ -455,11 +455,11 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_griddistrict_3_industrial IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- 4. agricultural sector @@ -470,7 +470,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_4_agricultur CONSTRAINT urban_sector_per_grid_district_4_agricultural_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_4_agricultural (geom) @@ -511,11 +511,11 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_griddistrict_4_agricultural IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- sector stats @@ -543,7 +543,7 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- Calculate statistics like NUTS and AGS code @@ -600,7 +600,7 @@ UPDATE model_draft.ego_demand_loadarea AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- Check for Loadareas without AGS code @@ -625,11 +625,11 @@ ALTER TABLE model_draft.ego_demand_loadarea_error_noags_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_loadarea_error_noags_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_loadarea_error_noags_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_error_noags_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); /* @@ -664,7 +664,7 @@ CREATE INDEX ego_demand_loadarea_ta_geom_idx ALTER TABLE model_draft.ego_demand_loadarea_ta OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_loadarea_ta','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_ta','ego_dp_loadarea_loadcut_griddistrict.sql',' '); */ /* @@ -694,5 +694,5 @@ CREATE INDEX ego_demand_loadarea_spf_geom_centre_idx ALTER TABLE model_draft.ego_demand_loadarea_spf OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_loadarea_spf','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_spf','ego_dp_loadarea_loadcut_griddistrict.sql',' '); */ diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_voronoi.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_voronoi.sql index ca553b28..480fba3c 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_voronoi.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_voronoi.sql @@ -64,13 +64,13 @@ ALTER TABLE model_draft.ego_demand_loadarea_voi OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_loadarea_voi IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- insert cutted load melt INSERT INTO model_draft.ego_demand_loadarea_voi (geom) @@ -121,17 +121,17 @@ ALTER TABLE model_draft.ego_demand_loadarea_voi_smaller100m2_mview OWNER TO oeus -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_loadarea_voi_smaller100m2_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_loadarea_voi_smaller100m2_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_voi_smaller100m2_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- Exclude Loadarea smaller than 100m² DELETE FROM model_draft.ego_demand_loadarea_voi AS loads WHERE loads.area_ha < 0.001; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_loadarea_voi','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea_voi','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- Generate Centre of Loadareas with Centroid and PointOnSurface @@ -199,7 +199,7 @@ WHERE NOT ST_CONTAINS(loads.geom,loads.geom_centre); */ /* -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- zensus 2011 population UPDATE model_draft.ego_demand_loadarea_voi AS t1 @@ -220,7 +220,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','economy','ioer_urban_share_industrial_centroid','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','economy','ioer_urban_share_industrial_centroid','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- ioer industry share UPDATE model_draft.ego_demand_loadarea_voi AS t1 @@ -248,7 +248,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_1_residential CONSTRAINT urban_sector_per_grid_district_1_residential_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_1_residential (geom) @@ -286,7 +286,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- 2. retail sector @@ -297,7 +297,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_2_retail ( CONSTRAINT urban_sector_per_grid_district_2_retail_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_2_retail (geom) @@ -335,7 +335,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- 3. industrial sector @@ -346,7 +346,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_3_industrial CONSTRAINT urban_sector_per_grid_district_3_industrial_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_3_industrial (geom) @@ -384,7 +384,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- 4. agricultural sector @@ -395,7 +395,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_4_agricultural CONSTRAINT urban_sector_per_grid_district_4_agricultural_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_4_agricultural (geom) @@ -433,7 +433,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- sector stats @@ -463,7 +463,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 -- Calculate statistics like NUTS and AGS code -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- nuts code (nuts) UPDATE model_draft.ego_demand_loadarea_voi AS t1 @@ -518,7 +518,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_loadarea_voi','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea_voi','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- loads without ags_0 @@ -543,10 +543,10 @@ ALTER TABLE model_draft.ego_demand_loadarea_voi_error_noags_mview OWNER TO oeuse -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_loadarea_voi_error_noags_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_loadarea_voi_error_noags_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_voi_error_noags_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); /* @@ -581,7 +581,7 @@ CREATE INDEX ego_demand_loadarea_voi_ta_geom_idx ALTER TABLE model_draft.ego_demand_loadarea_voi_ta OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_loadarea_voi_ta','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_voi_ta','ego_dp_loadarea_loadcut_voronoi.sql',' '); */ /* @@ -611,5 +611,5 @@ CREATE INDEX ego_demand_loadarea_voi_spf_geom_centre_idx ALTER TABLE model_draft.ego_demand_loadarea_voi_spf OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_loadarea_voi_spf','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_voi_spf','ego_dp_loadarea_loadcut_voronoi.sql',' '); */ diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_loadmelt.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_loadmelt.sql index 6ca2b8d5..1899b102 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_loadmelt.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_loadmelt.sql @@ -21,10 +21,10 @@ CREATE TABLE model_draft.ego_demand_load_collect ( CONSTRAINT ego_demand_load_collect_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_la_osm','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_la_osm','ego_dp_loadarea_loadmelt.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_la_zensus_cluster','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_la_zensus_cluster','ego_dp_loadarea_loadmelt.sql',' '); -- insert loads OSM INSERT INTO model_draft.ego_demand_load_collect (geom) @@ -48,11 +48,11 @@ ALTER TABLE model_draft.ego_demand_load_collect OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_load_collect IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_load_collect','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_collect','ego_dp_loadarea_loadmelt.sql',' '); -- buffer with 100m @@ -80,11 +80,11 @@ ALTER TABLE model_draft.ego_demand_load_collect_buffer100 OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_load_collect_buffer100 IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_load_collect_buffer100','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_collect_buffer100','ego_dp_loadarea_loadmelt.sql',' '); -- unbuffer with 99m @@ -113,11 +113,11 @@ ALTER TABLE model_draft.ego_demand_load_melt OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_load_melt IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadmelt.sql',' '); -- Validate the melted geometries @@ -150,11 +150,11 @@ ALTER MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_geom_mview OWNER -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_geom_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_load_melt_error_geom_mview','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_melt_error_geom_mview','ego_dp_loadarea_loadmelt.sql',' '); -- Fix geometries with error @@ -188,11 +188,11 @@ ALTER MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_geom_fix_mview OW -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_geom_fix_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_load_melt_error_geom_fix_mview','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_melt_error_geom_fix_mview','ego_dp_loadarea_loadmelt.sql',' '); -- update fixed geoms @@ -206,7 +206,7 @@ UPDATE model_draft.ego_demand_load_melt AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadmelt.sql',' '); -- Check again for errors. @@ -239,11 +239,11 @@ ALTER MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_2_geom_mview OWNE -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_2_geom_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_demand_load_melt_error_2_geom_mview','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_melt_error_2_geom_mview','ego_dp_loadarea_loadmelt.sql',' '); /* -- drop temp diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_loads.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_loads.sql index 6a228e75..f598bebb 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_loads.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_loads.sql @@ -12,17 +12,17 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_hv_largescaleconsumer','ego_dp_loadarea_loads.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_hv_largescaleconsumer','ego_dp_loadarea_loads.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loads.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loads.sql',' '); -- exclude large scale consumer DELETE FROM openstreetmap.osm_deu_polygon_urban WHERE gid IN (SELECT polygon_id FROM model_draft.ego_demand_hv_largescaleconsumer); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loads.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loads.sql',' '); -- sequence DROP SEQUENCE IF EXISTS model_draft.osm_deu_polygon_urban_buffer100_mview_id CASCADE; @@ -55,11 +55,11 @@ ALTER MATERIALIZED VIEW model_draft.osm_deu_polygon_urban_buffer100_mview OWNER -- metadata COMMENT ON MATERIALIZED VIEW model_draft.osm_deu_polygon_urban_buffer100_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','osm_deu_polygon_urban_buffer100_mview','ego_dp_loadarea_loads.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','osm_deu_polygon_urban_buffer100_mview','ego_dp_loadarea_loads.sql',' '); -- unbuffer with 100m @@ -91,14 +91,14 @@ ALTER TABLE model_draft.ego_demand_la_osm OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_la_osm IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2", + "version": "v0.4.4", "published": "none" }'; -- select description SELECT obj_description('model_draft.ego_demand_la_osm' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','ouput','model_draft','ego_demand_la_osm','ego_dp_loadarea_loads.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','ouput','model_draft','ego_demand_la_osm','ego_dp_loadarea_loads.sql',' '); -- DROP MATERIALIZED VIEW IF EXISTS model_draft.osm_deu_polygon_urban_buffer100_mview CASCADE; diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_peakload.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_peakload.sql index dac6581c..a2f0e91e 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_peakload.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_peakload.sql @@ -9,8 +9,8 @@ __author__ = "gplssm, Ludee" */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_peakload.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','scenario','ego_slp_parameters','ego_dp_loadarea_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','scenario','ego_slp_parameters','ego_dp_loadarea_peakload.sql',' '); -- residential UPDATE model_draft.ego_demand_loadarea as t1 @@ -61,4 +61,4 @@ UPDATE model_draft.ego_demand_loadarea as t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_peakload.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_statistic.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_statistic.sql index 6bbd2a83..4ce56c25 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_statistic.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_statistic.sql @@ -12,13 +12,13 @@ __author__ = "Ludee" */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_hvmv_substation','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_loadarea_statistic.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_statistic.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_statistic.sql',' '); /* -- Results and statistics for substation, Loadarea, MV Griddistricts and Consumption @@ -37,7 +37,7 @@ CREATE TABLE model_draft.ego_data_processing_results ( INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_name,description,result,unit,timestamp) -- Count SUB - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_grid_hvmv_substation', 'Number of substations', @@ -48,7 +48,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Count MVGD - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_grid_mv_griddistrict', 'Number of grid districts', @@ -59,7 +59,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Area vg250.gem - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'boundaries', 'bkg_vg250_6_gem', 'Gemeinde area', @@ -70,7 +70,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Area vg250.gem_clean - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_boundaries_bkg_vg250_6_gem_clean', 'Processed gemeinde area', @@ -81,7 +81,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Area GD - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_grid_mv_griddistrict', 'Grid District area', @@ -92,7 +92,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Min area GD calc - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_grid_mv_griddistrict', 'Minmal GD area calculated', @@ -103,7 +103,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Min area GD area - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_grid_mv_griddistrict', 'Minmal GD area from table', @@ -114,7 +114,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Max area GD - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_grid_mv_griddistrict', 'Maximal GD area', @@ -125,7 +125,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Count LA - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_demand_loadarea', 'Number of Load Areas', @@ -136,7 +136,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Area LA - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_demand_loadarea', 'Load Areas area', @@ -147,7 +147,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Min area LA - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_demand_loadarea', 'Minmal LA area', @@ -158,7 +158,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Max area LA - SELECT 'v0.4.2', + SELECT 'v0.4.4', 'model_draft', 'ego_demand_loadarea', 'Maximal LA area', @@ -173,10 +173,10 @@ ALTER TABLE model_draft.ego_data_processing_results OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_data_processing_results IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_data_processing_results','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_data_processing_results','ego_dp_loadarea_statistic.sql',' '); @@ -419,7 +419,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET consumption_per_area = consumption *1000000 / area_ha; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_statistic.sql',' '); /* -- test @@ -476,10 +476,10 @@ ALTER TABLE boundaries.bkg_vg250_statistics_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW boundaries.bkg_vg250_statistics_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','boundaries','bkg_vg250_statistics_mview','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','boundaries','bkg_vg250_statistics_mview','ego_dp_loadarea_statistic.sql',' '); -- drid district diff --git a/dataprocessing/sql_snippets/ego_dp_lv_consumption_peakload.sql b/dataprocessing/sql_snippets/ego_dp_lv_consumption_peakload.sql index 24930171..cd9d7d5e 100644 --- a/dataprocessing/sql_snippets/ego_dp_lv_consumption_peakload.sql +++ b/dataprocessing/sql_snippets/ego_dp_lv_consumption_peakload.sql @@ -14,8 +14,8 @@ __author__ = "gplssm" -- Consumption -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_lv_consumption_peakload.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_consumption_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_lv_consumption_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_consumption_peakload.sql',' '); -- Residential UPDATE model_draft.ego_grid_lv_griddistrict AS t1 @@ -109,7 +109,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict -- Peakload -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','scenario','ego_slp_parameters','ego_dp_lv_consumption_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','scenario','ego_slp_parameters','ego_dp_lv_consumption_peakload.sql',' '); -- Residential UPDATE model_draft.ego_grid_lv_griddistrict as t1 @@ -163,4 +163,4 @@ UPDATE model_draft.ego_grid_lv_griddistrict as t1 WHERE t1.mvlv_subst_id = t2.mvlv_subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_consumption_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_consumption_peakload.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_lv_griddistrict.sql b/dataprocessing/sql_snippets/ego_dp_lv_griddistrict.sql index ffd66dca..47df228f 100644 --- a/dataprocessing/sql_snippets/ego_dp_lv_griddistrict.sql +++ b/dataprocessing/sql_snippets/ego_dp_lv_griddistrict.sql @@ -61,7 +61,7 @@ ALTER TABLE model_draft.ego_grid_lv_griddistrict OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- insert INSERT INTO model_draft.ego_grid_lv_griddistrict (id,mvlv_subst_id,subst_id,la_id,nn,geom) @@ -71,7 +71,7 @@ INSERT INTO model_draft.ego_grid_lv_griddistrict (id,mvlv_subst_id,subst_id,la_i -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mvlv_substation','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mvlv_substation','ego_dp_lv_griddistrict.sql',' '); -- mvlv substation count UPDATE model_draft.ego_grid_lv_griddistrict AS t1 @@ -99,7 +99,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','society','destatis_zensus_population_per_ha_mview','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','society','destatis_zensus_population_per_ha_mview','ego_dp_lv_griddistrict.sql',' '); -- zensus 2011 population UPDATE model_draft.ego_grid_lv_griddistrict AS t1 @@ -137,10 +137,10 @@ ALTER TABLE model_draft.ego_osm_sector_per_lvgd_1_residential OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_lvgd_1_residential IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_lv_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_lvgd_1_residential (geom) @@ -172,7 +172,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_lvgd_1_residential','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_lvgd_1_residential','ego_dp_lv_griddistrict.sql',' '); @@ -193,10 +193,10 @@ ALTER TABLE model_draft.ego_osm_sector_per_lvgd_2_retail OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_lvgd_2_retail IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_lv_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_lvgd_2_retail (geom) @@ -226,7 +226,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_lvgd_2_retail','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_lvgd_2_retail','ego_dp_lv_griddistrict.sql',' '); -- 3. Industrial sector @@ -246,10 +246,10 @@ ALTER TABLE model_draft.ego_osm_sector_per_lvgd_3_industrial OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_lvgd_3_industrial IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_lv_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_lvgd_3_industrial (geom) @@ -279,7 +279,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_lvgd_3_industrial','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_lvgd_3_industrial','ego_dp_lv_griddistrict.sql',' '); @@ -300,10 +300,10 @@ ALTER TABLE model_draft.ego_osm_sector_per_lvgd_4_agricultural OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_lvgd_4_agricultural IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_lv_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_lvgd_4_agricultural (geom) @@ -333,7 +333,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_lvgd_4_agricultural','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_lvgd_4_agricultural','ego_dp_lv_griddistrict.sql',' '); -- sector stats @@ -360,7 +360,7 @@ SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_pe WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_griddistrict.sql',' '); /* diff --git a/dataprocessing/sql_snippets/ego_dp_lv_loadcut.sql b/dataprocessing/sql_snippets/ego_dp_lv_loadcut.sql index 1fd9aa12..56006ff9 100644 --- a/dataprocessing/sql_snippets/ego_dp_lv_loadcut.sql +++ b/dataprocessing/sql_snippets/ego_dp_lv_loadcut.sql @@ -15,8 +15,8 @@ __author__ = "jong42, Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_lv_loadcut.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mvlv_substation_voronoi','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mvlv_substation_voronoi','ego_dp_lv_loadcut.sql',' '); -- Cut Loadarea with MVLV Substation Voronoi DROP TABLE IF EXISTS model_draft.ego_grid_lv_griddistrict_cut CASCADE; @@ -64,7 +64,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict_cut AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_lv_griddistrict_cut','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut','ego_dp_lv_loadcut.sql',' '); /* -- Validate (geom) @@ -117,10 +117,10 @@ CREATE INDEX ego_grid_lv_griddistrict_cut_1subst_geom_idx -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict_cut_1subst IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_lv_griddistrict_cut_1subst','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut_1subst','ego_dp_lv_loadcut.sql',' '); -- Select parts with no LV Substation @@ -149,10 +149,10 @@ CREATE INDEX ego_grid_lv_griddistrict_cut_0subst_geom_idx -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict_cut_0subst IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_lv_griddistrict_cut_0subst','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut_0subst','ego_dp_lv_loadcut.sql',' '); -- Select parts with more than one substation @@ -181,10 +181,10 @@ CREATE INDEX ego_grid_lv_griddistrict_cut_xsubst_geom_idx -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict_cut_xsubst IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_lv_griddistrict_cut_xsubst','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut_xsubst','ego_dp_lv_loadcut.sql',' '); -- Combine parts with Next Neighbor @@ -232,10 +232,10 @@ ALTER TABLE model_draft.ego_grid_lv_griddistrict_cut_nn OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict_cut_nn IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_lv_griddistrict_cut_nn','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut_nn','ego_dp_lv_loadcut.sql',' '); -- Collect and union all parts @@ -303,7 +303,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict_cut_nn_collect AS t1 -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict_cut_nn_collect IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_lv_griddistrict_cut_nn_collect','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut_nn_collect','ego_dp_lv_loadcut.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_lv_substation.sql b/dataprocessing/sql_snippets/ego_dp_lv_substation.sql index b8dcbf74..1767dd1d 100644 --- a/dataprocessing/sql_snippets/ego_dp_lv_substation.sql +++ b/dataprocessing/sql_snippets/ego_dp_lv_substation.sql @@ -19,7 +19,7 @@ CREATE TABLE model_draft.ego_lattice_360m_lv ( CONSTRAINT ego_lattice_360m_lv_pkey PRIMARY KEY (id) ); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_lv_substation.sql',' '); -- lattice on the bbox of loadareas INSERT INTO model_draft.ego_lattice_360m_lv (geom, la_id) @@ -57,10 +57,10 @@ ALTER TABLE model_draft.ego_lattice_360m_lv OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_lattice_360m_lv IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_lattice_360m_lv','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_lattice_360m_lv','ego_dp_lv_substation.sql',' '); -- Create MVLV Substation from lattice centroid @@ -113,10 +113,10 @@ ALTER TABLE model_draft.ego_grid_mvlv_substation OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mvlv_substation IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation.sql',' '); -- Lege Buffer um ONT-Standorte und ermittle die Teile der Lastgebiete, die sich nicht innerhalb dieser Buffer befinden @@ -163,10 +163,10 @@ UPDATE model_draft.ego_grid_lv_loadarea_rest -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_loadarea_rest IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_lv_loadarea_rest','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_loadarea_rest','ego_dp_lv_substation.sql',' '); -- Bestimme die Mittelpunkte der Gebiete, die noch nicht durch ONT abgedeckt sind, und lege diese Mittelpunkte als ONT-Standorte fest @@ -177,7 +177,7 @@ INSERT INTO model_draft.ego_grid_mvlv_substation (la_id, geom) FROM model_draft.ego_grid_lv_loadarea_rest; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_lv_substation.sql',' '); -- subst_id from MV-griddistrict UPDATE model_draft.ego_grid_mvlv_substation AS t1 @@ -195,10 +195,10 @@ UPDATE model_draft.ego_grid_mvlv_substation AS t1 -- metadata COMMENT ON TABLE model_draft.ego_grid_mvlv_substation IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation.sql',' '); -- drop diff --git a/dataprocessing/sql_snippets/ego_dp_lv_substation_voronoi.sql b/dataprocessing/sql_snippets/ego_dp_lv_substation_voronoi.sql index 0062417d..3354da80 100644 --- a/dataprocessing/sql_snippets/ego_dp_lv_substation_voronoi.sql +++ b/dataprocessing/sql_snippets/ego_dp_lv_substation_voronoi.sql @@ -10,8 +10,8 @@ __author__ = "Ludee, jong42" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation_voronoi.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_hvmv_substation_dummy','ego_dp_lv_substation_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation_dummy','ego_dp_lv_substation_voronoi.sql',' '); -- add Dummy points to substations (18 Points) ALTER TABLE model_draft.ego_grid_mvlv_substation @@ -45,7 +45,7 @@ ALTER TABLE model_draft.ego_grid_mvlv_substation_voronoi OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mvlv_substation_voronoi IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- loop over MV Griddistrict DO @@ -123,4 +123,4 @@ $$; DELETE FROM model_draft.ego_grid_mvlv_substation WHERE is_dummy = TRUE; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_mvlv_substation_voronoi','ego_dp_lv_substation_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mvlv_substation_voronoi','ego_dp_lv_substation_voronoi.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_mv_griddistrict.sql b/dataprocessing/sql_snippets/ego_dp_mv_griddistrict.sql index d9bff62d..2d6c8db5 100644 --- a/dataprocessing/sql_snippets/ego_dp_mv_griddistrict.sql +++ b/dataprocessing/sql_snippets/ego_dp_mv_griddistrict.sql @@ -15,7 +15,7 @@ __author__ = "Ludee" ---------- ---------- ---------- -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_mv_griddistrict.sql',' '); -- municipalities DROP TABLE IF EXISTS model_draft.ego_boundaries_hvmv_subst_per_gem CASCADE; @@ -36,7 +36,7 @@ CREATE INDEX ego_boundaries_hvmv_subst_per_gem_geom_idx ALTER TABLE model_draft.ego_boundaries_hvmv_subst_per_gem OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_hvmv_substation','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_mv_griddistrict.sql',' '); -- HVMV subst count UPDATE model_draft.ego_boundaries_hvmv_subst_per_gem AS t1 @@ -54,10 +54,10 @@ UPDATE model_draft.ego_boundaries_hvmv_subst_per_gem AS t1 -- metadata COMMENT ON TABLE model_draft.ego_boundaries_hvmv_subst_per_gem IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_boundaries_hvmv_subst_per_gem','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem','ego_dp_mv_griddistrict.sql',' '); -- SELECT sum(mun.subst_sum) AS sum -- FROM model_draft.ego_boundaries_hvmv_subst_per_gem AS mun; @@ -97,10 +97,10 @@ ALTER TABLE model_draft.ego_boundaries_hvmv_subst_per_gem_1_mview OWNER TO oeuse -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_boundaries_hvmv_subst_per_gem_1_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_1_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_1_mview','ego_dp_mv_griddistrict.sql',' '); -- MView II. @@ -133,10 +133,10 @@ UPDATE model_draft.ego_boundaries_hvmv_subst_per_gem AS t1 -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_boundaries_hvmv_subst_per_gem_2_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_2_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_2_mview','ego_dp_mv_griddistrict.sql',' '); -- Substation Type 2 @@ -161,10 +161,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_mun_2_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_mun_2_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_hvmv_substation_mun_2_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_mun_2_mview','ego_dp_mv_griddistrict.sql',' '); -- MView III. @@ -197,10 +197,10 @@ UPDATE model_draft.ego_boundaries_hvmv_subst_per_gem AS t1 -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_boundaries_hvmv_subst_per_gem_3_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -255,10 +255,10 @@ UPDATE model_draft.ego_grid_mv_griddistrict_type1 AS t1 -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_type1 IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_mv_griddistrict_type1','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_type1','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- ---------- ---------- ---------- @@ -266,7 +266,7 @@ SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_mv_griddis ---------- ---------- ---------- ---------- ---------- ---------- -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_mv_griddistrict.sql',' '); -- Substation ID UPDATE model_draft.ego_grid_hvmv_substation_voronoi AS t1 @@ -319,10 +319,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_hvmv_substation_voronoi_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_mview','ego_dp_mv_griddistrict.sql',' '); -- -- Validate (geom) @@ -407,10 +407,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- -- -- Validate (geom) (OK!) -> 22.000ms =0 @@ -458,10 +458,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_1subst_mview OWNER -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_1subst_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_1subst_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_1subst_mview','ego_dp_mv_griddistrict.sql',' '); -- Parts without substation @@ -491,10 +491,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_mview OWNER -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -553,10 +553,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_mview OWN -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -599,10 +599,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_line_mvie -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_line_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_line_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_line_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -628,10 +628,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_union_mvi -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_union_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_union_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_union_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -665,10 +665,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_nn_collect OWNER TO -- metadata COMMENT ON TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_nn_collect IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_nn_collect','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_nn_collect','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -694,10 +694,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_nn_mview OWNER TO o -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_nn_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_nn_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_nn_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -742,10 +742,10 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_type2 OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_type2 IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_mv_griddistrict_type2','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_type2','ego_dp_mv_griddistrict.sql',' '); -- -- Validate (geom) (OK!) -> 22.000ms =0 @@ -813,10 +813,10 @@ ALTER TABLE model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -860,10 +860,10 @@ ALTER TABLE model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn_line OWNER TO oeu -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn_line IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn_line','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn_line','ego_dp_mv_griddistrict.sql',' '); -- UNION @@ -894,10 +894,10 @@ ALTER TABLE model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn_union OWNER TO oe -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn_union IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn_union','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn_union','ego_dp_mv_griddistrict.sql',' '); -- Substations Template @@ -940,10 +940,10 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_type3 OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_type3 IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_mv_griddistrict_type3','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_type3','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -998,10 +998,10 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_collect OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_collect IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_mv_griddistrict_collect','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_collect','ego_dp_mv_griddistrict.sql',' '); -- NEW PART @@ -1032,7 +1032,7 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_union OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_union IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- Clean Polygons and Snap to Grid UPDATE model_draft.ego_grid_mv_griddistrict_union AS t1 @@ -1096,7 +1096,7 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_dump OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_dump IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- dump centre fragments (a) @@ -1178,10 +1178,10 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_dump_nn OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_dump_nn IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_mv_griddistrict_dump_nn','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_dump_nn','ego_dp_mv_griddistrict.sql',' '); -- connect nn points @@ -1219,7 +1219,7 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_dump_nn_line OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_dump_nn_line IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- collect @@ -1289,10 +1289,10 @@ CREATE INDEX ego_grid_mv_griddistrict_dump_nn_collect_union_geom_idx -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_dump_nn_collect_union IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_grid_mv_griddistrict_dump_nn_collect_union','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_dump_nn_collect_union','ego_dp_mv_griddistrict.sql',' '); -- Clean Polygons and Snap to Grid UPDATE model_draft.ego_grid_mv_griddistrict_dump_nn_collect_union AS t1 @@ -1404,7 +1404,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_mv_griddistrict','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_mv_griddistrict','ego_dp_mv_griddistrict.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql index f38e0cc4..1bd8215c 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql @@ -184,7 +184,7 @@ COMMENT ON TABLE model_draft.ego_supply_pf_generator_single IS SELECT obj_description('model_draft.ego_supply_pf_generator_single' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_pf_generator_single','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_pf_generator_single','ego_dp_powerflow_assignment_generator.sql',' '); @@ -192,7 +192,7 @@ SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_pf_gen -- Insert generator data into powerflow schema, that contains all generators seperately -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_pf_hv_source','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','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 @@ -235,7 +235,7 @@ UPDATE model_draft.ego_supply_pf_generator_single a -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','climate','cosmoclmgrid','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','climate','cosmoclmgrid','ego_dp_powerflow_assignment_generator.sql',' '); -- Identify climate point IDs for each renewables generator @@ -411,7 +411,7 @@ UPDATE model_draft.ego_grid_pf_hv_generator -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_assignment_generator.sql',' '); CREATE TABLE model_draft.ego_supply_aggr_weather AS @@ -435,4 +435,4 @@ AS ALTER TABLE model_draft.ego_supply_aggr_weather OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_aggr_weather','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_aggr_weather','ego_dp_powerflow_assignment_generator.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_load.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_load.sql index 620b3e3f..20c7316f 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_load.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_load.sql @@ -194,7 +194,7 @@ WHERE a.bus IS NOT NULL GROUP BY a.bus; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_assignment_load.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_assignment_load.sql',' '); @@ -221,4 +221,4 @@ FROM model_draft.ego_grid_pf_hv_load a WHERE scn_name= 'Status Quo'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_assignment_load_nep2035.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_assignment_load_nep2035.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql index 63ca2ae8..071e6d9a 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql @@ -103,6 +103,6 @@ UPDATE model_draft.ego_dp_supply_res_powerplant a -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_powerflow_assignment_otgid.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_powerflow_assignment_otgid.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_powerflow_assignment_otgid.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_powerflow_assignment_otgid.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_storage.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_storage.sql index 9977651d..dba41f25 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_storage.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_storage.sql @@ -880,4 +880,4 @@ INSERT into model_draft.ego_grid_pf_hv_storage ( DROP TABLE IF EXISTS model_draft.ego_grid_pf_hv_storage_pumped_temp; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_assignment_storage.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_assignment_storage.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql index 2140bd53..d36a0583 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql @@ -45,7 +45,7 @@ CREATE INDEX ego_supply_generator_idx -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_generator','ego_dp_powerflow_assignment_unid.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_generator','ego_dp_powerflow_assignment_unid.sql',' '); -- Update power plant tables and add information on unified id of generators @@ -69,8 +69,8 @@ UPDATE model_draft.ego_dp_supply_res_powerplant a -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_powerflow_assignment_unid.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_powerflow_assignment_unid.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_powerflow_assignment_unid.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_powerflow_assignment_unid.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_create_pp_mview.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_create_pp_mview.sql index d95fbac3..ee77e2cb 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_create_pp_mview.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_create_pp_mview.sql @@ -99,9 +99,9 @@ ALTER MATERIALIZED VIEW model_draft.ego_supply_conv_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_conv_powerplant_sq_mview','ego_dp_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_conv_powerplant_nep2035_mview','ego_dp_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_conv_powerplant_ego100_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_conv_powerplant_sq_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_conv_powerplant_nep2035_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_conv_powerplant_ego100_mview','ego_dp_powerflow_create_pp_mview.sql',' '); -------------------------------------------------------------------------------- @@ -241,6 +241,6 @@ ALTER MATERIALIZED VIEW model_draft.ego_supply_res_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_res_powerplant_sq_mview','ego_dp_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_res_powerplant_nep2035_mview','ego_dp_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_res_powerplant_ego100_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_res_powerplant_sq_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_res_powerplant_nep2035_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_res_powerplant_ego100_mview','ego_dp_powerflow_create_pp_mview.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql index 239095ba..f9c9d9be 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql @@ -298,6 +298,6 @@ VALUES ('Status Quo', DELETE FROM model_draft.ego_grid_pf_hv_transformer WHERE bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus) OR bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_grid_future_scenarios.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_grid_future_scenarios.sql index 8ff01a43..af36c1e4 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_grid_future_scenarios.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_grid_future_scenarios.sql @@ -102,6 +102,6 @@ FROM model_draft.ego_grid_pf_hv_transformer a WHERE scn_name= 'Status Quo'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_grid_future_scenarios.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_grid_future_scenarios.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_grid_future_scenarios.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_grid_future_scenarios.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_grid_future_scenarios.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_grid_future_scenarios.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql index 7c5134c5..1fae53e2 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql @@ -180,7 +180,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_scenario_settings IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_scenario_settings' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_scenario_settings','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_scenario_settings','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV source @@ -274,7 +274,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_source IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_source' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_source','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_source','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV bus @@ -483,7 +483,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_busmap IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_bus' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV generator @@ -679,7 +679,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_generator IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_generator' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV line @@ -878,7 +878,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_line IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_line' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV link @@ -1038,7 +1038,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_link IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_link' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_link','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_link','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV load @@ -1201,7 +1201,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_load IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_load' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV storage @@ -1426,7 +1426,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_storage IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_storage' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV temp resolution @@ -1524,7 +1524,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_temp_resolution IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_temp_resolution' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_temp_resolution','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_temp_resolution','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV transformer @@ -1710,7 +1710,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_transformer IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_transformer' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_hv_setup.sql',' '); -------------------------------------------------------------------- @@ -1804,7 +1804,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_bus_v_mag_set IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_bus_v_mag_set' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_bus_v_mag_set','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_bus_v_mag_set','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV generator PQ set @@ -1925,7 +1925,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_generator_pq_set IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_generator_pq_set' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV load PQ set @@ -2027,7 +2027,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_load_pq_set IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_load_pq_set' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV storage PQ set @@ -2160,7 +2160,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_storage_pq_set IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_storage_pq_set' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_storage_pq_set','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_storage_pq_set','ego_dp_powerflow_hv_setup.sql',' '); ------------------------------------------------------------------- --------------------------- Grant rights -------------------------- diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql index 4a5d79bd..3a593c25 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql @@ -71,7 +71,7 @@ where scn_name = 'eGo 100'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_lopf_data.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_lopf_data.sql',' '); -- set p_max_pu @@ -418,7 +418,7 @@ WHERE model_draft.ego_grid_hvmv_substation.subst_id IN ( AND ST_CONTAINS(salt.geom,model_draft.ego_grid_hvmv_substation.point)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_lopf_data.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_lopf_data.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_lopf_data.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_lopf_data.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_osmtgmod_to_pypsa.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_osmtgmod_to_pypsa.sql index 6410c678..43d08f97 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_osmtgmod_to_pypsa.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_osmtgmod_to_pypsa.sql @@ -26,7 +26,7 @@ SELECT WHERE result_id = 1; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); -- BRANCH DATA INSERT INTO model_draft.ego_grid_pf_hv_line (line_id, bus0, bus1, x, r, b, s_nom, cables, frequency, geom, topo) @@ -46,7 +46,7 @@ SELECT WHERE result_id = 1 and (link_type = 'line' or link_type = 'cable'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); -- TRANSFORMER DATA INSERT INTO model_draft.ego_grid_pf_hv_transformer (trafo_id, bus0, bus1, x, s_nom, tap_ratio, phase_shift, geom, topo) @@ -64,7 +64,7 @@ SELECT WHERE result_id = 1 and link_type = 'transformer'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); -- per unit to absolute values diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_demand.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_demand.sql index 83cd8354..4a598311 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_demand.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_demand.sql @@ -51,7 +51,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_load_pq_set (scn_name, load_id, temp_id, GROUP BY C.load_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_timeseries_demand.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_timeseries_demand.sql',' '); --------------- @@ -79,4 +79,4 @@ FROM model_draft.ego_grid_pf_hv_load_pq_set a WHERE scn_name= 'Status Quo'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_load_timeseries_NEP2035.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_load_timeseries_NEP2035.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql index 144d10e2..1ffdd24d 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql @@ -1067,4 +1067,4 @@ INSERT INTO model_draft.ego_grid_pf_hv_load_pq_set (scn_name, load_id, temp_id, */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_timeseries_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_timeseries_generator.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_structure_input_verification.sql b/dataprocessing/sql_snippets/ego_dp_structure_input_verification.sql index e94402a5..a3f2c116 100644 --- a/dataprocessing/sql_snippets/ego_dp_structure_input_verification.sql +++ b/dataprocessing/sql_snippets/ego_dp_structure_input_verification.sql @@ -11,22 +11,22 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','check','boundaries','bkg_vg250_1_sta','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','boundaries','bkg_vg250_2_lan','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','boundaries','bkg_vg250_4_krs','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','boundaries','bkg_vg250_6_gem','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','openstreetmap','osm_deu_polygon','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','openstreetmap','osm_deu_ways','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','openstreetmap','osm_deu_nodes','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','openstreetmap','osm_deu_line','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','scenario','ego_slp_parameters','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','grid','otg_ehvhv_bus_data','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','society','destatis_zensus_population_per_ha','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','economy','destatis_gva_per_district','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','demand','ego_demand_federalstate','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','supply','vernetzen_wind_potential_area','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','model_draft','ego_supply_res_powerplant_sq_mview','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.2','check','model_draft','ego_supply_conv_powerplant_sq_mview','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','boundaries','bkg_vg250_1_sta','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','boundaries','bkg_vg250_2_lan','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','boundaries','bkg_vg250_4_krs','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','boundaries','bkg_vg250_6_gem','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','openstreetmap','osm_deu_polygon','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','openstreetmap','osm_deu_ways','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','openstreetmap','osm_deu_nodes','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','openstreetmap','osm_deu_line','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','scenario','ego_slp_parameters','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','grid','otg_ehvhv_bus_data','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','society','destatis_zensus_population_per_ha','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','economy','destatis_gva_per_district','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','demand','ego_demand_federalstate','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','supply','vernetzen_wind_potential_area','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','model_draft','ego_supply_res_powerplant_sq_mview','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','check','model_draft','ego_supply_conv_powerplant_sq_mview','ego_dp_structure_input_verification.sql','preprocessing verification'); /* -- input tables @@ -94,12 +94,12 @@ COMMENT ON TABLE model_draft.ego_scenario_input IS '{ SELECT obj_description('model_draft.test_table' ::regclass) ::json; -- scenario log (project, version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','setup','model_draft','ego_scenario_input','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.4','setup','model_draft','ego_scenario_input','ego_dp_structure_input_verification.sql','preprocessing verification'); */ -- insert version INSERT INTO model_draft.ego_scenario_input(version,oid,database,table_schema,table_name,path,metadata_title,metadata_reference_date,meta_data) - SELECT 'v0.4.2' AS version, + SELECT 'v0.4.4' AS version, sub.oid, sub.database, sub.table_schema, diff --git a/dataprocessing/sql_snippets/ego_dp_substation_ehv.sql b/dataprocessing/sql_snippets/ego_dp_substation_ehv.sql index 5d1f4b12..aa61adde 100644 --- a/dataprocessing/sql_snippets/ego_dp_substation_ehv.sql +++ b/dataprocessing/sql_snippets/ego_dp_substation_ehv.sql @@ -36,15 +36,15 @@ ALTER TABLE model_draft.ego_grid_ehv_substation OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_ehv_substation IS '{ "comment": "eGoDP - Versioning table", - "version": "v0.4.1" }' ; + "version": "v0.4.4" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','input','openstreetmap','osm_deu_ways','ego_dp_substation_ehv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.1','input','openstreetmap','osm_deu_polygon','ego_dp_substation_ehv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.1','input','openstreetmap','osm_deu_line','ego_dp_substation_ehv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.1','input','openstreetmap','osm_deu_nodes','ego_dp_substation_ehv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.1','input','openstreetmap','osm_deu_rels','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_ways','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_line','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_nodes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_rels','ego_dp_substation_ehv.sql',' '); --> WAY: Erzeuge einen VIEW aus OSM way substations: @@ -63,7 +63,7 @@ ALTER VIEW model_draft.way_substations OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','way_substations','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations','ego_dp_substation_ehv.sql',' '); -- @@ -79,7 +79,7 @@ ALTER VIEW model_draft.way_substations_with_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','way_substations_with_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations_with_hoes','ego_dp_substation_ehv.sql',' '); --> NODE: Erzeuge einen VIEW aus OSM node substations: @@ -97,7 +97,7 @@ ALTER VIEW model_draft.node_substations_with_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','node_substations_with_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','node_substations_with_hoes','ego_dp_substation_ehv.sql',' '); --> RELATION: Erzeuge einen VIEW aus OSM relation substations: @@ -119,7 +119,7 @@ ALTER VIEW model_draft.relation_substations_with_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','relation_substations_with_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','relation_substations_with_hoes','ego_dp_substation_ehv.sql',' '); -- @@ -148,7 +148,7 @@ ALTER VIEW model_draft.substation_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','substation_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','substation_hoes','ego_dp_substation_ehv.sql',' '); -- create view summary_total_hoes that contains substations without any filter @@ -182,7 +182,7 @@ ALTER VIEW model_draft.summary_total_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','summary_total_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary_total_hoes','ego_dp_substation_ehv.sql',' '); -- create view that filters irrelevant tags @@ -200,7 +200,7 @@ CREATE INDEX summary_hoes_gix ON model_draft.summary_hoes USING GIST (polygon); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','summary_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary_hoes','ego_dp_substation_ehv.sql',' '); -- eliminate substation that are not within VG250 @@ -215,8 +215,8 @@ CREATE VIEW model_draft.summary_de_hoes AS ALTER VIEW model_draft.summary_de_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_substation_ehv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','summary_de_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary_de_hoes','ego_dp_substation_ehv.sql',' '); -- create view with buffer of 75m around polygons @@ -229,7 +229,7 @@ CREATE MATERIALIZED VIEW model_draft.buffer_75_hoes AS ALTER MATERIALIZED VIEW model_draft.buffer_75_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','buffer_75_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','buffer_75_hoes','ego_dp_substation_ehv.sql',' '); -- create second view with same data to compare @@ -243,7 +243,7 @@ ALTER MATERIALIZED VIEW model_draft.buffer_75_a_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','buffer_75_a_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','buffer_75_a_hoes','ego_dp_substation_ehv.sql',' '); -- create view to eliminate smaller substations where buffers intersect @@ -261,7 +261,7 @@ CREATE MATERIALIZED VIEW model_draft.substations_to_drop_hoes AS ALTER MATERIALIZED VIEW model_draft.substations_to_drop_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','substations_to_drop_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','substations_to_drop_hoes','ego_dp_substation_ehv.sql',' '); -- filter those substations and create final_result_hoes @@ -275,7 +275,7 @@ CREATE VIEW model_draft.final_result_hoes AS ALTER VIEW model_draft.final_result_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','temp','model_draft','final_result_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','final_result_hoes','ego_dp_substation_ehv.sql',' '); -- insert results @@ -284,7 +284,7 @@ INSERT INTO model_draft.ego_grid_ehv_substation (lon, lat, point, polygon, volta FROM model_draft.final_result_hoes; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.1','output','model_draft','ego_grid_ehv_substation','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_ehv_substation','ego_dp_substation_ehv.sql',' '); -- drop diff --git a/dataprocessing/sql_snippets/ego_dp_substation_hvmv.sql b/dataprocessing/sql_snippets/ego_dp_substation_hvmv.sql index e87d902c..26531b93 100644 --- a/dataprocessing/sql_snippets/ego_dp_substation_hvmv.sql +++ b/dataprocessing/sql_snippets/ego_dp_substation_hvmv.sql @@ -37,13 +37,13 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation OWNER TO oeuser; COMMENT ON TABLE model_draft.ego_grid_hvmv_substation IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_ways','ego_dp_substation_hvmv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_polygon','ego_dp_substation_hvmv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_nodes','ego_dp_substation_hvmv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','openstreetmap','osm_deu_line','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_ways','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_nodes','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_line','ego_dp_substation_hvmv.sql',' '); --> WAY: create view of way substations: @@ -62,7 +62,7 @@ ALTER VIEW model_draft.way_substations OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','way_substations','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations','ego_dp_substation_hvmv.sql',' '); --> WAY: create view of way substations with 110kV: @@ -78,7 +78,7 @@ ALTER VIEW model_draft.way_substations_with_110kV OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','way_substations_with_110kV','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations_with_110kV','ego_dp_substation_hvmv.sql',' '); --> WAY: create view of substations without 110kV @@ -95,7 +95,7 @@ ALTER VIEW model_draft.way_substations_without_110kV OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','way_substations_without_110kV','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations_without_110kV','ego_dp_substation_hvmv.sql',' '); --> NODE: create view of 110kV node substations: @@ -113,7 +113,7 @@ ALTER VIEW model_draft.node_substations_with_110kV OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','node_substations_with_110kV','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','node_substations_with_110kV','ego_dp_substation_hvmv.sql',' '); --> LINES 110kV: create view of 110kV lines @@ -131,7 +131,7 @@ ALTER VIEW model_draft.way_lines_110kV OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','way_lines_110kV','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_lines_110kV','ego_dp_substation_hvmv.sql',' '); -- INTERSECTION: create view from substations without 110kV tag that contain 110kV line @@ -147,7 +147,7 @@ ALTER VIEW model_draft.way_substations_without_110kV_intersected_by_110kV_line O -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','way_substations_without_110kV_intersected_by_110kV_line','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations_without_110kV_intersected_by_110kV_line','ego_dp_substation_hvmv.sql',' '); -- @@ -176,7 +176,7 @@ ALTER VIEW model_draft.substation_110kV OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','substation_110kV','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','substation_110kV','ego_dp_substation_hvmv.sql',' '); -- create view summary_total that contains substations without any filter @@ -210,7 +210,7 @@ ALTER VIEW model_draft.summary_total OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','summary_total','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary_total','ego_dp_substation_hvmv.sql',' '); -- create view that filters irrelevant tags @@ -228,7 +228,7 @@ ALTER MATERIALIZED VIEW model_draft.summary OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','summary','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary','ego_dp_substation_hvmv.sql',' '); -- eliminate substation that are not within VG250 @@ -244,8 +244,8 @@ ALTER VIEW model_draft.summary_de OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_substation_hvmv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','summary_de','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary_de','ego_dp_substation_hvmv.sql',' '); -- create view with buffer of 75m around polygons @@ -259,7 +259,7 @@ ALTER MATERIALIZED VIEW model_draft.buffer_75 OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','buffer_75','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','buffer_75','ego_dp_substation_hvmv.sql',' '); -- create second view with same data to compare @@ -272,7 +272,7 @@ CREATE MATERIALIZED VIEW model_draft.buffer_75_a AS ALTER MATERIALIZED VIEW model_draft.buffer_75_a OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','buffer_75_a','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','buffer_75_a','ego_dp_substation_hvmv.sql',' '); -- create view to eliminate smaller substations where buffers intersect @@ -291,7 +291,7 @@ ALTER MATERIALIZED VIEW model_draft.substations_to_drop OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','substations_to_drop','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','substations_to_drop','ego_dp_substation_hvmv.sql',' '); -- filter those substations and create final_result @@ -306,7 +306,7 @@ ALTER VIEW model_draft.final_result OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','final_result','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','final_result','ego_dp_substation_hvmv.sql',' '); -- insert results @@ -315,7 +315,7 @@ INSERT INTO model_draft.ego_grid_hvmv_substation (lon, lat, point, polygon, volt FROM model_draft.final_result; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv.sql',' '); -- drop diff --git a/dataprocessing/sql_snippets/ego_dp_substation_hvmv_voronoi.sql b/dataprocessing/sql_snippets/ego_dp_substation_hvmv_voronoi.sql index e4a07660..4ad88161 100644 --- a/dataprocessing/sql_snippets/ego_dp_substation_hvmv_voronoi.sql +++ b/dataprocessing/sql_snippets/ego_dp_substation_hvmv_voronoi.sql @@ -10,7 +10,7 @@ __author__ = "Ludee" */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv_voronoi.sql',' '); -- set id as subst_id - move to get_substation.sql ALTER TABLE model_draft.ego_grid_hvmv_substation @@ -29,7 +29,7 @@ CREATE INDEX ego_grid_hvmv_substation_geom_idx ON model_draft.ego_grid_hvmv_substation USING GIST (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_substation_hvmv_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_substation_hvmv_voronoi.sql',' '); -- Gemeindeschlüssel UPDATE model_draft.ego_grid_hvmv_substation AS t1 @@ -45,7 +45,7 @@ UPDATE model_draft.ego_grid_hvmv_substation AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv_voronoi.sql',' '); -- create dummy points for voronoi calculation @@ -87,13 +87,13 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_dummy OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_hvmv_substation_dummy IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- select description SELECT obj_description('model_draft.ego_grid_hvmv_substation_dummy' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_hvmv_substation_dummy','ego_dp_substation_hvmv_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_hvmv_substation_dummy','ego_dp_substation_hvmv_voronoi.sql',' '); -- voronoi polygons with eucldean distance @@ -165,10 +165,10 @@ DELETE FROM model_draft.ego_grid_hvmv_substation_voronoi WHERE subst_id IS NULL; -- metadata COMMENT ON TABLE model_draft.ego_grid_hvmv_substation_voronoi IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }' ; + "version": "v0.4.4" }' ; -- select description SELECT obj_description('model_draft.ego_grid_hvmv_substation_voronoi' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_substation_hvmv_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_substation_hvmv_voronoi.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_substation_id_to_generator.sql b/dataprocessing/sql_snippets/ego_dp_substation_id_to_generator.sql index 9e83c71f..fb1337f7 100644 --- a/dataprocessing/sql_snippets/ego_dp_substation_id_to_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_substation_id_to_generator.sql @@ -62,7 +62,7 @@ ALTER TABLE model_draft.ego_dp_supply_conv_powerplant DROP COLUMN subst_id_NN; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_conv_powerplant','ego_dp_substation_id_to_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_conv_powerplant','ego_dp_substation_id_to_generator.sql',' '); ------------------ @@ -94,4 +94,4 @@ The assignment and reallocation of RES generators which are located outside Germ */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_substation_id_to_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_substation_id_to_generator.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_substation_otg.sql b/dataprocessing/sql_snippets/ego_dp_substation_otg.sql index fd7d3722..feed4bd7 100644 --- a/dataprocessing/sql_snippets/ego_dp_substation_otg.sql +++ b/dataprocessing/sql_snippets/ego_dp_substation_otg.sql @@ -10,9 +10,9 @@ __author__ = "lukasol, C. Matke" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','grid','otg_ehvhv_bus_data','ego_dp_substation_otg.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_hvmv_substation','ego_dp_substation_otg.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_ehv_substation','ego_dp_substation_otg.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','grid','otg_ehvhv_bus_data','ego_dp_substation_otg.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_substation_otg.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_ehv_substation','ego_dp_substation_otg.sql',' '); -- update model_draft.ego_grid_hvmv_substation table with new column of respective osmtgmod bus_i @@ -28,7 +28,7 @@ UPDATE model_draft.ego_grid_hvmv_substation DELETE FROM model_draft.ego_grid_hvmv_substation WHERE otg_id IS NULL; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_otg.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_otg.sql',' '); -- do the same with model_draft.ego_grid_ehv_substation @@ -46,4 +46,4 @@ UPDATE model_draft.ego_grid_ehv_substation DELETE FROM model_draft.ego_grid_ehv_substation WHERE otg_id IS NULL; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_ehv_substation','ego_dp_substation_otg.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_ehv_substation','ego_dp_substation_otg.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_supply_dp_powerflow_create_pp_mview.sql b/dataprocessing/sql_snippets/ego_dp_supply_dp_powerflow_create_pp_mview.sql index be510a62..2c22f895 100644 --- a/dataprocessing/sql_snippets/ego_dp_supply_dp_powerflow_create_pp_mview.sql +++ b/dataprocessing/sql_snippets/ego_dp_supply_dp_powerflow_create_pp_mview.sql @@ -27,7 +27,7 @@ CREATE MATERIALIZED VIEW supply.ego_supply_conv_powerplant_sq_mview AS WHERE scenario = 'Status Quo' AND shutdown IS NULL or shutdown >= 2015 AND capacity > 0 - AND version = 'v0.4.2'; + AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_supply_conv_powerplant_sq_mview OWNER TO oeuser; @@ -41,7 +41,7 @@ CREATE MATERIALIZED VIEW supply.ego_supply_conv_powerplant_nep2035_mview AS AND capacity > 0 AND fuel not in ('hydro', 'run_of_river', 'reservoir') AND shutdown IS NULL or shutdown >= 2034 - AND version = 'v0.4.2'; + AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_supply_conv_powerplant_nep2035_mview OWNER TO oeuser; @@ -97,15 +97,15 @@ CREATE MATERIALIZED VIEW supply.ego_supply_conv_powerplant_ego100_mview AS AND fuel = 'pumped_storage' AND capacity > 0 AND shutdown IS NULL or shutdown >= 2049 - AND version = 'v0.4.2'; + AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_supply_conv_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','supply','ego_supply_conv_powerplant_sq_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','supply','ego_supply_conv_powerplant_nep2035_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','supply','ego_supply_conv_powerplant_ego100_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_conv_powerplant_sq_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_conv_powerplant_nep2035_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_conv_powerplant_ego100_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); -------------------------------------------------------------------------------- @@ -120,7 +120,7 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_sq_mview AS FROM supply.ego_dp_supply_res_powerplant WHERE scenario = 'Status Quo' AND electrical_capacity > 0 - AND version = 'v0.4.2'; + AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_supply_res_powerplant_sq_mview OWNER TO oeuser; @@ -138,12 +138,12 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_nep2035_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_supply_res_powerplant - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' - And version = 'v0.4.2' + And version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) as sub @@ -159,11 +159,11 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_nep2035_mview AS SELECT id FROM supply.ego_dp_supply_res_powerplant WHERE scenario in ('NEP 2035') - AND version = 'v0.4.2' + AND version = 'v0.4.4' Group BY id Order by id) AND scenario in ('NEP 2035') - And version = 'v0.4.2' + And version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -185,12 +185,12 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_ego100_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_supply_res_powerplant - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' - And version = 'v0.4.2' + And version = 'v0.4.4' AND electrical_capacity > 0 AND generation_type in ('solar','wind') ORDER BY id @@ -209,11 +209,11 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_ego100_mview AS Where scenario in ('eGo 100') AND generation_type not in ('gas') AND flag in ('commissioning', 'repowering') - AND version = 'v0.4.2' + AND version = 'v0.4.4' Group BY id Order by id) AND scenario in ('eGo 100') - And version = 'v0.4.2' + And version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -231,11 +231,11 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_ego100_mview AS Where scenario in ('NEP 2035') AND generation_type not in ('biomass','gas','reservoir','run_of_river') AND flag in ('commissioning', 'repowering') - And version = 'v0.4.2' + And version = 'v0.4.4' Group BY id Order by id) AND scenario in ('NEP 2035') - And version = 'v0.4.2' + And version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) sub3 @@ -245,6 +245,6 @@ ALTER MATERIALIZED VIEW supply.ego_supply_res_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','supply','ego_supply_res_powerplant_sq_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','supply','ego_supply_res_powerplant_nep2035_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','supply','ego_supply_res_powerplant_ego100_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_res_powerplant_sq_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_res_powerplant_nep2035_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_res_powerplant_ego100_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_versioning.sql b/dataprocessing/sql_snippets/ego_dp_versioning.sql index a590ff2d..1c2d15d4 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning.sql @@ -13,82 +13,82 @@ __author__ = "Ludee" -- EHV Substation versioning /* DELETE FROM grid.ego_dp_ehv_substation - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_dp_ehv_substation - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_ehv_substation; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_dp_ehv_substation','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_ehv_substation','ego_dp_versioning.sql','versioning'); -- HVMV Substation versioning /* DELETE FROM grid.ego_dp_hvmv_substation - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_dp_hvmv_substation - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_hvmv_substation; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_dp_hvmv_substation','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_hvmv_substation','ego_dp_versioning.sql','versioning'); -- MVLV Substation versioning /* DELETE FROM grid.ego_dp_mvlv_substation - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_dp_mvlv_substation - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_mvlv_substation; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_dp_mvlv_substation','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_mvlv_substation','ego_dp_versioning.sql','versioning'); -- CATCHMENT AREA -- EHV Griddistrict versioning /* DELETE FROM grid.ego_dp_ehv_griddistrict - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_dp_ehv_griddistrict - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_ehv_substation_voronoi; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_dp_ehv_griddistrict','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_ehv_griddistrict','ego_dp_versioning.sql','versioning'); -- MV Griddistrict versioning /* DELETE FROM grid.ego_dp_mv_griddistrict - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_dp_mv_griddistrict - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_mv_griddistrict; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_dp_mv_griddistrict','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_mv_griddistrict','ego_dp_versioning.sql','versioning'); -- LV Griddistrict versioning /* DELETE FROM grid.ego_dp_lv_griddistrict - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ --INSERT INTO grid.ego_dp_lv_griddistrict --- SELECT 'v0.4.2', +-- SELECT 'v0.4.4', -- * -- FROM model_draft.ego_grid_lv_griddistrict; INSERT INTO grid.ego_dp_lv_griddistrict - SELECT 'v0.4.2', + SELECT 'v0.4.4', id, mvlv_subst_id, subst_id, @@ -128,32 +128,32 @@ INSERT INTO grid.ego_dp_lv_griddistrict FROM model_draft.ego_grid_lv_griddistrict; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_dp_lv_griddistrict','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_lv_griddistrict','ego_dp_versioning.sql','versioning'); -- LOADAREA -- Loadarea versioning /* DELETE FROM demand.ego_dp_loadarea - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO demand.ego_dp_loadarea - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_demand_loadarea; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','demand','ego_dp_loadarea','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','demand','ego_dp_loadarea','ego_dp_versioning.sql','versioning'); -- GENERATOR -- conv versioning /* DELETE FROM supply.ego_dp_conv_powerplant - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO supply.ego_dp_conv_powerplant - SELECT 'v0.4.2', + SELECT 'v0.4.4', id, bnetza_id, company, @@ -198,14 +198,14 @@ INSERT INTO supply.ego_dp_conv_powerplant FROM model_draft.ego_dp_supply_conv_powerplant; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_dp_conv_powerplant','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_conv_powerplant','ego_dp_versioning.sql','versioning'); -- res versioning /* DELETE FROM supply.ego_dp_res_powerplant - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO supply.ego_dp_res_powerplant - SELECT 'v0.4.2', + SELECT 'v0.4.4', id, start_up_date, electrical_capacity, @@ -250,359 +250,359 @@ INSERT INTO supply.ego_dp_res_powerplant FROM 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.2','result','supply','ego_dp_res_powerplant','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_res_powerplant','ego_dp_versioning.sql','versioning'); -- POWERFLOW -- hv pf bus /* DELETE FROM grid.ego_pf_hv_bus - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_bus - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_bus; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_bus','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_bus','ego_dp_versioning.sql','versioning'); -- hv pf generator /* DELETE FROM grid.ego_pf_hv_generator - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_generator - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_generator; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_generator','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_generator','ego_dp_versioning.sql','versioning'); -- hv pf generator_pq_set /* DELETE FROM grid.ego_pf_hv_generator_pq_set - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_generator_pq_set - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_generator_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_generator_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_generator_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf line /* DELETE FROM grid.ego_pf_hv_line - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_line - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_line; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_line','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_line','ego_dp_versioning.sql','versioning'); -- hv pf link /* DELETE FROM grid.ego_pf_hv_link - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_link - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_link; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_line','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_line','ego_dp_versioning.sql','versioning'); -- hv pf load /* DELETE FROM grid.ego_pf_hv_load - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_load - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_load; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_load','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_load','ego_dp_versioning.sql','versioning'); -- hv pf load_pq_set /* DELETE FROM grid.ego_pf_hv_load_pq_set - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_load_pq_set - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_load_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_load_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_load_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf source /* DELETE FROM grid.ego_pf_hv_source - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_source - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_source; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_source','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_source','ego_dp_versioning.sql','versioning'); -- hv pf storage /* DELETE FROM grid.ego_pf_hv_storage - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_storage - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_storage; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_storage','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_storage','ego_dp_versioning.sql','versioning'); -- hv pf storage_pq_set /* DELETE FROM grid.ego_pf_hv_storage_pq_set - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_storage_pq_set - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_storage_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_storage_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_storage_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf temp_resolution /* DELETE FROM grid.ego_pf_hv_temp_resolution - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_temp_resolution - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_temp_resolution; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_temp_resolution','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_temp_resolution','ego_dp_versioning.sql','versioning'); -- hv pf transformer /* DELETE FROM grid.ego_pf_hv_transformer - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_transformer - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_transformer; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_transformer','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_transformer','ego_dp_versioning.sql','versioning'); -- hv pf extension bus /* DELETE FROM grid.ego_pf_hv_extension_bus - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_bus - SELECT 'v0.4.2', + SELECT 'v0.4.4', scn_name, bus_id, v_nom, current_type, v_mag_pu_min, v_mag_pu_max, geom FROM model_draft.ego_grid_pf_hv_extension_bus; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_bus','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_bus','ego_dp_versioning.sql','versioning'); -- hv pf extension generator /* DELETE FROM grid.ego_pf_hv_extension_generator - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_generator - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_extension_generator; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_generator','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_generator','ego_dp_versioning.sql','versioning'); -- hv pf extension generator_pq_set /* DELETE FROM grid.ego_pf_hv_generator_pq_set - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_generator_pq_set - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_extension_generator_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_generator_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_generator_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf extension line /* DELETE FROM grid.ego_pf_hv_extension_line - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_line - SELECT 'v0.4.2', + SELECT 'v0.4.4', scn_name, line_id , bus0, bus1, x, r, g, b, s_nom, s_nom_extendable, s_nom_min, s_nom_max, capital_cost, length, cables, frequency, terrain_factor, geom, topo, v_nom, project, project_id FROM model_draft.ego_grid_pf_hv_extension_line; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_line','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_line','ego_dp_versioning.sql','versioning'); -- hv pf extension link /* DELETE FROM grid.ego_pf_hv_extension_link - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_link - SELECT 'v0.4.2', + SELECT 'v0.4.4', scn_name, link_id, bus0, bus1, efficiency, marginal_cost, p_nom, p_nom_extendable, p_nom_min, p_nom_max, capital_cost, length, terrain_factor,geom, topo, project, project_id FROM model_draft.ego_grid_pf_hv_extension_link; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_link','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_link','ego_dp_versioning.sql','versioning'); -- hv pf extension load /* DELETE FROM grid.ego_pf_hv_extension_load - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_load - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_extension_load; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_load','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_load','ego_dp_versioning.sql','versioning'); -- hv pf extension load_pq_set /* DELETE FROM grid.ego_pf_hv_extension_load_pq_set - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_load_pq_set - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_extension_load_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_load_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_load_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf extension source /* DELETE FROM grid.ego_pf_hv_source - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_source - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_extension_source; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_source','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_source','ego_dp_versioning.sql','versioning'); -- hv pf extension storage /* DELETE FROM grid.ego_pf_hv_extension_storage - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_storage - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_extension_storage; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_storage','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_storage','ego_dp_versioning.sql','versioning'); -- hv pf extension storage_pq_set /* DELETE FROM grid.ego_pf_hv_extension_storage_pq_set - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_storage_pq_set - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_extension_storage_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_storage_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_storage_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf extension temp_resolution /* DELETE FROM grid.ego_pf_hv_extension_temp_resolution - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_temp_resolution - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_pf_hv_extension_temp_resolution; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_temp_resolution','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_temp_resolution','ego_dp_versioning.sql','versioning'); -- hv pf extension transformer /* DELETE FROM grid.ego_pf_hv_extension_transformer - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_pf_hv_extension_transformer - SELECT 'v0.4.2', + SELECT 'v0.4.4', scn_name, trafo_id, bus0,bus1, x, r, g, b, s_nom, s_nom_extendable, s_nom_min, s_nom_max, tap_ratio, phase_shift, capital_cost, geom, topo, project FROM model_draft.ego_grid_pf_hv_extension_transformer; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_extension_transformer','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_transformer','ego_dp_versioning.sql','versioning'); -- hv pf line expansion cost /* DELETE FROM grid.ego_line_expansion_costs - WHERE version = 'v0.4.2'; */ + WHERE version = 'v0.4.4'; */ INSERT INTO grid.ego_line_expansion_costs - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_grid_line_expansion_costs; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_line_expansion_costs','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_line_expansion_costs','ego_dp_versioning.sql','versioning'); -- renewable time series INSERT INTO supply.ego_renewable_feedin - SELECT 'v0.4.2', + SELECT 'v0.4.4', weather_scenario_id, w_id, source, weather_year, feedin, power_class FROM model_draft.ego_renewable_feedin; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_renewable_feedin','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_renewable_feedin','ego_dp_versioning.sql','versioning'); -- renewable wind parameters INSERT INTO supply.ego_power_class - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_power_class; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_power_class','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_power_class','ego_dp_versioning.sql','versioning'); -- subset of generator single to match aggr_id and w_id INSERT INTO supply.ego_aggr_weather - SELECT 'v0.4.2', + SELECT 'v0.4.4', * FROM model_draft.ego_supply_aggr_weather; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_aggr_weather','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_aggr_weather','ego_dp_versioning.sql','versioning'); -- pf data check @@ -611,4 +611,4 @@ INSERT INTO grid.ego_pf_hv_data_check FROM model_draft.ego_grid_pf_hv_data_check; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning'); diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql index ade134ec..f0ccd929 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql @@ -19,7 +19,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS AND (shutdown IS NULL or shutdown >= 2015) AND capacity > 0 AND preversion = 'v0.3.0' - AND version = 'v0.4.2'; + AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview OWNER TO oeuser; @@ -34,7 +34,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS AND fuel not in ('hydro', 'run_of_river', 'reservoir') AND (shutdown IS NULL or shutdown >= 2034) AND preversion = 'v0.3.0' - AND version = 'v0.4.2'; + AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview OWNER TO oeuser; @@ -91,15 +91,15 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS AND capacity > 0 AND (shutdown IS NULL or shutdown >= 2049) AND preversion = 'v0.3.0' - AND version = 'v0.4.2'; + AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_dp_conv_powerplant_sq_mview','ego_dp_versioning_mviews.sql','versioning'); -SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_dp_conv_powerplant_nep2035_mview','ego_dp_versioning_mviews.sql','versioning'); -SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_dp_conv_powerplant_ego100_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_conv_powerplant_sq_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_conv_powerplant_nep2035_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_conv_powerplant_ego100_mview','ego_dp_versioning_mviews.sql','versioning'); -- Create View with full dataset per scenario and renewables power plants @@ -111,7 +111,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS WHERE scenario = 'Status Quo' AND electrical_capacity > 0 AND preversion = 'v0.3.0' - AND version = 'v0.4.2'; + AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview OWNER TO oeuser; @@ -129,13 +129,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_res_powerplant - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' And preversion = 'v0.3.0' - AND version = 'v0.4.2' + AND version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) as sub @@ -151,12 +151,12 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS SELECT id FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - AND version = 'v0.4.2' + AND version = 'v0.4.4' Group BY id Order by id) AND scenario in ('NEP 2035') And preversion = 'v0.3.0' - AND version = 'v0.4.2' + AND version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -178,13 +178,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_res_powerplant - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' AND preversion = 'v0.3.0' - AND version = 'v0.4.2' + AND version = 'v0.4.4' AND electrical_capacity > 0 AND generation_type in ('solar','wind') AND generation_subtype not in ('wind_offshore') @@ -203,13 +203,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario in ('eGo 100') AND generation_type not in ('gas') - AND version = 'v0.4.2' + AND version = 'v0.4.4' AND flag in ('commissioning', 'repowering') Group BY id Order by id) AND scenario in ('eGo 100') And preversion = 'v0.3.0' - AND version = 'v0.4.2' + AND version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -225,7 +225,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS SELECT id FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - AND version = 'v0.4.2' + AND version = 'v0.4.4' AND generation_type not in ('biomass','gas','reservoir','run_of_river') AND flag in ('commissioning', 'repowering') AND generation_subtype not in ('wind_offshore') @@ -233,7 +233,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS Order by id) AND scenario in ('NEP 2035') And preversion = 'v0.3.0' - AND version = 'v0.4.2' + AND version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) sub3 @@ -243,6 +243,6 @@ ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_dp_res_powerplant_sq_mview','ego_dp_versioning_mviews.sql','versioning'); -SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_dp_res_powerplant_nep2035_mview','ego_dp_versioning_mviews.sql','versioning'); -SELECT scenario_log('eGo_DP','v0.4.2','result','supply','ego_dp_res_powerplant_ego100_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_res_powerplant_sq_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_res_powerplant_nep2035_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_res_powerplant_ego100_mview','ego_dp_versioning_mviews.sql','versioning'); diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_overview.sql b/dataprocessing/sql_snippets/ego_dp_versioning_overview.sql index 38c18563..710349d7 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_overview.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_overview.sql @@ -20,12 +20,12 @@ ORDER BY name, version, id; -- Select one version SELECT * FROM model_draft.ego_scenario_overview -WHERE version = 'v0.4.2' +WHERE version = 'v0.4.4' ORDER BY id; -- Remove version DELETE FROM model_draft.ego_scenario_overview -WHERE version = 'v0.4.2'; +WHERE version = 'v0.4.4'; */ @@ -36,7 +36,7 @@ SELECT schema_name AS schema, table_name AS table, version FROM model_draft.scenario_log -WHERE version = 'v0.4.2' +WHERE version = 'v0.4.4' AND io = 'result' AND comment = 'versioning' GROUP BY schema_name, table_name, version @@ -53,7 +53,7 @@ BEGIN table_name AS table, version FROM model_draft.scenario_log - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' AND io = 'result' AND comment = 'versioning' GROUP BY schema_name, table_name, version @@ -75,182 +75,182 @@ INSERT INTO model_draft.ego_scenario_overview (name,version,cnt) version, count(*) AS cnt FROM grid.ego_dp_ehv_substation - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_dp_hvmv_substation' AS name, version, count(*) AS cnt FROM grid.ego_dp_hvmv_substation - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_dp_mvlv_substation' AS name, version, count(*) AS cnt FROM grid.ego_dp_mvlv_substation - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_dp_ehv_griddistrict' AS name, version, count(*) AS cnt FROM grid.ego_dp_ehv_griddistrict - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_dp_mv_griddistrict' AS name, version, count(*) AS cnt FROM grid.ego_dp_mv_griddistrict - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_dp_lv_griddistrict' AS name, version, count(*) AS cnt FROM grid.ego_dp_lv_griddistrict - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'demand.ego_dp_loadarea' AS name, version, count(*) AS cnt FROM demand.ego_dp_loadarea - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'supply.ego_dp_conv_powerplant' AS name, version, count(*) AS cnt FROM supply.ego_dp_conv_powerplant - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'supply.ego_dp_res_powerplant' AS name, version, count(*) AS cnt FROM supply.ego_dp_res_powerplant - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_bus' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_bus - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_generator' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_generator - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_generator_pq_set' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_generator_pq_set - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_line' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_line - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_load' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_load - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_load_pq_set' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_load_pq_set - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_source' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_source - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_storage' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_storage - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_storage_pq_set' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_storage_pq_set - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_temp_resolution' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_temp_resolution - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_transformer' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_transformer - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL -- supply SELECT 'supply.ego_dp_conv_powerplant_sq_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_conv_powerplant_sq_mview - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'supply.ego_dp_conv_powerplant_nep2035_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_conv_powerplant_nep2035_mview - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'supply.ego_dp_conv_powerplant_ego100_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_conv_powerplant_ego100_mview - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'supply.ego_dp_res_powerplant_sq_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_res_powerplant_sq_mview - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'supply.ego_dp_res_powerplant_nep2035_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_res_powerplant_nep2035_mview - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version UNION ALL SELECT 'supply.ego_dp_res_powerplant_ego100_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_res_powerplant_ego100_mview - WHERE version = 'v0.4.2' + WHERE version = 'v0.4.4' GROUP BY version ; */ diff --git a/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql b/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql index c928c185..513b18e0 100644 --- a/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql +++ b/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql @@ -1458,7 +1458,7 @@ AND bus_id NOT IN (SELECT bus0 FROM model_draft.ego_grid_pf_hv_extension_link WH AND bus_id NOT IN (SELECT bus0 FROM model_draft.ego_grid_pf_hv_extension_transformer WHERE scn_name = a.scn_name) AND bus_id NOT IN (SELECT bus1 FROM model_draft.ego_grid_pf_hv_extension_transformer WHERE scn_name = a.scn_name); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_extension_bus','ego_pp_nep2035_grid_variations.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_extension_line','ego_pp_nep2035_grid_variations.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_extension_link','ego_pp_nep2035_grid_variations.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_pf_hv_extension_transformer','ego_pp_nep2035_grid_variations.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_extension_bus','ego_pp_nep2035_grid_variations.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_extension_line','ego_pp_nep2035_grid_variations.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_extension_link','ego_pp_nep2035_grid_variations.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_extension_transformer','ego_pp_nep2035_grid_variations.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_conv.sql b/dataprocessing/sql_snippets/rea/ego_dp_conv.sql index bf99bf24..a70f41e5 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_conv.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_conv.sql @@ -9,7 +9,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' '); -- la_id ALTER TABLE model_draft.ego_dp_supply_conv_powerplant @@ -31,4 +31,4 @@ UPDATE model_draft.ego_dp_supply_conv_powerplant AS t1 WHERE t1.gid = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_lattice_500m.sql b/dataprocessing/sql_snippets/rea/ego_dp_lattice_500m.sql index b9ceeec2..3822cbe2 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_lattice_500m.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_lattice_500m.sql @@ -20,7 +20,7 @@ CREATE TABLE model_draft.ego_lattice_500m ( CONSTRAINT ego_lattice_500m_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_500m.sql',' '); -- lattice on bbox of Germany with 500m INSERT INTO model_draft.ego_lattice_500m (geom_box) @@ -52,7 +52,7 @@ ALTER TABLE model_draft.ego_lattice_500m OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_lattice_500m IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_500m','ego_dp_lattice_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_500m','ego_dp_lattice_500m.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_lattice_50m.sql b/dataprocessing/sql_snippets/rea/ego_dp_lattice_50m.sql index 5208f16d..5c430ad1 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_lattice_50m.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_lattice_50m.sql @@ -19,7 +19,7 @@ CREATE TABLE model_draft.ego_lattice_50m ( CONSTRAINT ego_lattice_50m_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_50m.sql',' '); -- insert lattice INSERT INTO model_draft.ego_lattice_50m (geom_box) @@ -51,7 +51,7 @@ ALTER TABLE model_draft.ego_lattice_50m OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_lattice_50m IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_50m','ego_dp_lattice_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_50m','ego_dp_lattice_50m.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_500m.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_500m.sql index 29e7562d..f1afe60b 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_500m.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_500m.sql @@ -13,7 +13,7 @@ __author__ = "Ludee" */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_500m.sql',' '); -- substation id from mv-griddistrict UPDATE model_draft.ego_lattice_500m AS t1 @@ -35,7 +35,7 @@ UPDATE model_draft.ego_lattice_500m AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_lattice_per_area_500m.sql',' '); -- area type for wind potential area (wpa) UPDATE model_draft.ego_lattice_500m AS t1 @@ -51,7 +51,7 @@ UPDATE model_draft.ego_lattice_500m AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_500m.sql',' '); -- area type for loadarea (la) UPDATE model_draft.ego_lattice_500m AS t1 @@ -82,7 +82,7 @@ UPDATE model_draft.ego_lattice_500m AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_500m','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_500m','ego_dp_rea_lattice_per_area_500m.sql',' '); -- mview points inside wpa @@ -103,7 +103,7 @@ ALTER TABLE model_draft.ego_lattice_500m_wpa_mview OWNER TO oeuser; SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_wpa_mview'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_500m_wpa_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_500m_wpa_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); -- mview points inside la @@ -124,7 +124,7 @@ ALTER TABLE model_draft.ego_lattice_500m_la_mview OWNER TO oeuser; SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_la_mview'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_lattice_500m_la_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_lattice_500m_la_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); -- mview points inside wpa and la @@ -145,7 +145,7 @@ ALTER TABLE model_draft.ego_lattice_500m_x_mview OWNER TO oeuser; SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_x_mview'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_lattice_500m_x_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_lattice_500m_x_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); -- mview points outside area @@ -166,4 +166,4 @@ ALTER TABLE model_draft.ego_lattice_500m_out_mview OWNER TO oeuser; SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_out_mview'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_lattice_500m_out_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_lattice_500m_out_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_50m.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_50m.sql index 09f59788..889fb864 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_50m.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_50m.sql @@ -10,7 +10,7 @@ __author__ = "Ludee" */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_50m.sql',' '); -- substation id from mv-griddistrict UPDATE model_draft.ego_lattice_50m AS t1 @@ -26,7 +26,7 @@ UPDATE model_draft.ego_lattice_50m AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_50m.sql',' '); -- area type for loadarea (la) UPDATE model_draft.ego_lattice_50m AS t1 @@ -42,7 +42,7 @@ UPDATE model_draft.ego_lattice_50m AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_50m','ego_dp_rea_lattice_per_area_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_50m','ego_dp_rea_lattice_per_area_50m.sql',' '); -- mview points inside la @@ -63,4 +63,4 @@ ALTER TABLE model_draft.ego_lattice_50m_la_mview OWNER TO oeuser; SELECT copy_comment_mview('model_draft.ego_lattice_50m','model_draft.ego_lattice_50m_la_mview'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_lattice_50m_la_mview','ego_dp_rea_lattice_per_area_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_50m_la_mview','ego_dp_rea_lattice_per_area_50m.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_m1.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_m1.sql index af2dc6bc..eb5383b9 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_m1.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_m1.sql @@ -11,7 +11,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m1.sql',' '); -- MView M1-1 DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m1_1_a_mview CASCADE; @@ -39,7 +39,7 @@ CREATE INDEX ego_supply_rea_m1_1_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m1_1_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_1_a_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_1_a_mview','ego_dp_rea_m1.sql',' '); -- rea_flag M1-1 @@ -70,7 +70,7 @@ CREATE INDEX ego_supply_rea_m1_1_dea_temp_geom_idx ON model_draft.ego_supply_rea_m1_1_dea_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_1_dea_temp','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_1_dea_temp','ego_dp_rea_m1.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_1_osm_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m1_1_osm_temp ( @@ -85,7 +85,7 @@ CREATE INDEX ego_supply_rea_m1_1_osm_temp_geom_idx ON model_draft.ego_supply_rea_m1_1_osm_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_1_osm_temp','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_1_osm_temp','ego_dp_rea_m1.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_1_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m1_1_jnt_temp ( @@ -99,10 +99,10 @@ CREATE INDEX ego_supply_rea_m1_1_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m1_1_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) --- SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_1_jnt_temp','ego_dp_rea_m1.sql',' '); +-- SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_1_jnt_temp','ego_dp_rea_m1.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_m1.sql',' '); -- loop for grid_district DO @@ -175,7 +175,7 @@ CREATE INDEX ego_supply_rea_m1_1_mview_rea_geom_new_idx ALTER TABLE model_draft.ego_supply_rea_m1_1_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m1_1_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m1_1_mview','ego_dp_rea_m1.sql',' '); -- M1-1 rest @@ -200,7 +200,7 @@ CREATE INDEX ego_supply_rea_m1_1_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m1_1_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m1_1_rest_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m1_1_rest_mview','ego_dp_rea_m1.sql',' '); -- Drop temp DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_1_dea_temp CASCADE; @@ -237,7 +237,7 @@ CREATE INDEX ego_supply_rea_m1_2_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m1_2_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_2_a_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_2_a_mview','ego_dp_rea_m1.sql',' '); -- rea_flag M1-2 @@ -266,7 +266,7 @@ CREATE INDEX ego_supply_rea_m1_2_dea_temp_geom_idx ON model_draft.ego_supply_rea_m1_2_dea_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_2_dea_temp','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_2_dea_temp','ego_dp_rea_m1.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_2_osm_temp ; CREATE TABLE model_draft.ego_supply_rea_m1_2_osm_temp ( @@ -281,7 +281,7 @@ CREATE INDEX ego_supply_rea_m1_2_osm_temp_geom_idx ON model_draft.ego_supply_rea_m1_2_osm_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_2_osm_temp','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_2_osm_temp','ego_dp_rea_m1.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_2_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m1_2_jnt_temp ( @@ -301,7 +301,7 @@ CREATE INDEX ego_supply_rea_m1_2_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m1_2_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m1_2_jnt_temp','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_2_jnt_temp','ego_dp_rea_m1.sql',' '); -- loop for grid_district DO @@ -381,7 +381,7 @@ GRANT ALL ON TABLE model_draft.ego_supply_rea_m1_2_mview TO oeuser WITH GRANT OP ALTER TABLE model_draft.ego_supply_rea_m1_2_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m1_2_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m1_2_mview','ego_dp_rea_m1.sql',' '); -- M1-2 rest DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m1_2_rest_mview CASCADE; @@ -405,7 +405,7 @@ CREATE INDEX ego_supply_rea_m1_2_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m1_2_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m1_2_rest_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m1_2_rest_mview','ego_dp_rea_m1.sql',' '); -- Drop temp diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_m2.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_m2.sql index 0c0560c7..5eadf8ea 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_m2.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_m2.sql @@ -11,7 +11,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m2.sql',' '); -- MView M2 DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m2_a_mview CASCADE; @@ -38,7 +38,7 @@ CREATE INDEX ego_supply_rea_m2_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m2_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m2_a_mview','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m2_a_mview','ego_dp_rea_m2.sql',' '); -- rea_flag M2 @@ -117,7 +117,7 @@ UPDATE model_draft.ego_supply_rea_m2_windfarm AS t1 WHERE t1.farm_id = t2.farm_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m2_windfarm','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m2_windfarm','ego_dp_rea_m2.sql',' '); -- update DEA in wind farms UPDATE model_draft.ego_dp_supply_res_powerplant AS t1 @@ -155,7 +155,7 @@ CREATE INDEX ego_supply_rea_m2_farm_temp_geom_idx ON model_draft.ego_supply_rea_m2_farm_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m2_farm_temp','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m2_farm_temp','ego_dp_rea_m2.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m2_wpa_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m2_wpa_temp ( @@ -170,7 +170,7 @@ CREATE INDEX ego_supply_rea_m2_wpa_temp_geom_idx ON model_draft.ego_supply_rea_m2_wpa_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m2_wpa_temp','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m2_wpa_temp','ego_dp_rea_m2.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m2_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m2_jnt_temp ( @@ -185,10 +185,10 @@ CREATE INDEX ego_supply_rea_m2_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m2_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m2_jnt_temp','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m2_jnt_temp','ego_dp_rea_m2.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_m2.sql',' '); -- loop for grid_district @@ -260,7 +260,7 @@ CREATE INDEX ego_supply_rea_m2_mview_rea_geom_new_idx ALTER TABLE model_draft.ego_supply_rea_m2_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m2_mview','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m2_mview','ego_dp_rea_m2.sql',' '); -- M2 rest @@ -285,7 +285,7 @@ CREATE INDEX ego_supply_rea_m2_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m2_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m2_rest_mview','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m2_rest_mview','ego_dp_rea_m2.sql',' '); -- Drop temp diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_m3.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_m3.sql index 36a5ce14..98aa8717 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_m3.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_m3.sql @@ -12,7 +12,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m3.sql',' '); -- MView M3 DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m3_a_mview CASCADE; @@ -41,7 +41,7 @@ CREATE INDEX ego_supply_rea_m3_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m3_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m3_a_mview','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m3_a_mview','ego_dp_rea_m3.sql',' '); -- rea_flag M3 @@ -73,7 +73,7 @@ CREATE INDEX ego_supply_rea_m3_dea_temp_geom_idx ON model_draft.ego_supply_rea_m3_dea_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m3_dea_temp','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m3_dea_temp','ego_dp_rea_m3.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m3_grid_wpa_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m3_grid_wpa_temp ( @@ -88,7 +88,7 @@ CREATE INDEX ego_supply_rea_m3_grid_wpa_temp_geom_idx ON model_draft.ego_supply_rea_m3_grid_wpa_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m3_grid_wpa_temp','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m3_grid_wpa_temp','ego_dp_rea_m3.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m3_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m3_jnt_temp ( @@ -102,7 +102,7 @@ CREATE INDEX ego_supply_rea_m3_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m3_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m3_jnt_temp','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m3_jnt_temp','ego_dp_rea_m3.sql',' '); -- loop for grid_district @@ -176,7 +176,7 @@ CREATE INDEX ego_supply_rea_m3_mview_rea_geom_new_idx ALTER TABLE model_draft.ego_supply_rea_m3_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m3_mview','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m3_mview','ego_dp_rea_m3.sql',' '); -- M3 rest @@ -201,7 +201,7 @@ CREATE INDEX ego_supply_rea_m3_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m3_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m3_rest_mview','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m3_rest_mview','ego_dp_rea_m3.sql',' '); -- Drop temp diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_m4.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_m4.sql index 497fd29d..ea72081e 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_m4.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_m4.sql @@ -13,7 +13,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m4.sql',' '); -- MView M4 DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m4_a_mview CASCADE; @@ -45,7 +45,7 @@ CREATE INDEX ego_supply_rea_m4_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m4_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m4_a_mview','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m4_a_mview','ego_dp_rea_m4.sql',' '); -- rea_flag M4 @@ -80,7 +80,7 @@ CREATE INDEX ego_supply_rea_m4_dea_temp_geom_idx ON model_draft.ego_supply_rea_m4_dea_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m4_dea_temp','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m4_dea_temp','ego_dp_rea_m4.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m4_grid_wpa_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m4_grid_wpa_temp ( @@ -96,7 +96,7 @@ CREATE INDEX ego_supply_rea_m4_grid_wpa_temp_geom_idx ON model_draft.ego_supply_rea_m4_grid_wpa_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m4_grid_wpa_temp','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m4_grid_wpa_temp','ego_dp_rea_m4.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m4_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m4_jnt_temp ( @@ -110,7 +110,7 @@ CREATE INDEX ego_supply_rea_m4_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m4_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m4_jnt_temp','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m4_jnt_temp','ego_dp_rea_m4.sql',' '); -- loop for grid_district @@ -181,7 +181,7 @@ CREATE INDEX ego_supply_rea_m4_mview_rea_geom_new_idx ALTER TABLE model_draft.ego_supply_rea_m4_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m4_mview','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m4_mview','ego_dp_rea_m4.sql',' '); -- M4 rest @@ -206,7 +206,7 @@ CREATE INDEX ego_supply_rea_m4_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m4_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m4_rest_mview','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m4_rest_mview','ego_dp_rea_m4.sql',' '); -- Drop temp diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_m5.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_m5.sql index 6e00a029..69c8c782 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_m5.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_m5.sql @@ -11,7 +11,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m5.sql',' '); -- MView M5 DEA DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m5_a_mview CASCADE; @@ -40,7 +40,7 @@ CREATE INDEX ego_supply_rea_m5_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m5_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m5_a_mview','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m5_a_mview','ego_dp_rea_m5.sql',' '); -- rea_flag M5 @@ -73,7 +73,7 @@ CREATE INDEX ego_supply_rea_m5_dea_temp_geom_idx ON model_draft.ego_supply_rea_m5_dea_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m5_dea_temp','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m5_dea_temp','ego_dp_rea_m5.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m5_grid_la_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m5_grid_la_temp ( @@ -89,7 +89,7 @@ CREATE INDEX ego_supply_rea_m5_grid_la_temp_geom_idx ON model_draft.ego_supply_rea_m5_grid_la_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m5_grid_la_temp','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m5_grid_la_temp','ego_dp_rea_m5.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m5_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m5_jnt_temp ( @@ -103,7 +103,7 @@ CREATE INDEX ego_supply_rea_m5_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m5_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_rea_m5_jnt_temp','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m5_jnt_temp','ego_dp_rea_m5.sql',' '); -- loop for grid_district @@ -176,7 +176,7 @@ CREATE INDEX ego_supply_rea_m5_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m5_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m5_rest_mview','ego_dp_rea_m5.sql','Should be 0!'); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m5_rest_mview','ego_dp_rea_m5.sql','Should be 0!'); -- Second loop for m5 rest for grid_district @@ -249,7 +249,7 @@ CREATE INDEX ego_supply_rea_m5_rest_2_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m5_rest_2_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m5_rest_2_mview','ego_dp_rea_m5.sql','Should be 0!'); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m5_rest_2_mview','ego_dp_rea_m5.sql','Should be 0!'); -- M5 result @@ -275,7 +275,7 @@ CREATE INDEX ego_supply_rea_m5_mview_rea_geom_new_idx ALTER TABLE model_draft.ego_supply_rea_m5_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_m5_mview','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m5_mview','ego_dp_rea_m5.sql',' '); -- update la_id from loadarea diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_results.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_results.sql index d1932e93..6416ee4f 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_results.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_results.sql @@ -15,7 +15,7 @@ Results */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_results.sql',' '); -- dea capacity and count per generation types and voltage level DROP TABLE IF EXISTS model_draft.ego_supply_rea_per_gentype_and_voltlevel CASCADE; @@ -35,7 +35,7 @@ ALTER TABLE model_draft.ego_supply_rea_per_gentype_and_voltlevel OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_per_gentype_and_voltlevel','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_per_gentype_and_voltlevel','ego_dp_rea_results.sql',' '); /* @@ -67,7 +67,7 @@ ALTER TABLE model_draft.ego_supply_rea_per_mvgd OWNER TO oeuser; */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_results.sql',' '); UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET dea_cnt = t2.dea_cnt, @@ -114,7 +114,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_results.sql',' '); -- DEA capacity and count per load area @@ -153,7 +153,7 @@ FROM model_draft.ego_supply_rea_per_loadarea AS la, */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_per_loadarea','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_per_loadarea','ego_dp_rea_results.sql',' '); -- DEA capacity and count per load area @@ -224,7 +224,7 @@ ALTER TABLE model_draft.ego_supply_rea_per_method OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_rea_per_method','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_per_method','ego_dp_rea_results.sql',' '); -- Hotfix to fill empty rea_geom_new cells in table @@ -244,4 +244,4 @@ CREATE INDEX ego_dp_supply_res_powerplant_geom_new_idx (rea_geom_new); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_results.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_setup.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_setup.sql index 06ac3119..527c4b26 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_setup.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_setup.sql @@ -17,7 +17,7 @@ SELECT COUNT(*) FROM model_draft.ego_grid_mv_griddistrict; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_setup.sql',' '); ALTER TABLE model_draft.ego_dp_supply_res_powerplant DROP COLUMN IF EXISTS la_id CASCADE, @@ -34,7 +34,7 @@ ALTER TABLE model_draft.ego_dp_supply_res_powerplant ADD COLUMN rea_geom_new geometry(Point,3035); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_setup.sql',' '); -- rea_flag reset UPDATE model_draft.ego_dp_supply_res_powerplant @@ -57,7 +57,7 @@ UPDATE model_draft.ego_dp_supply_res_powerplant WHERE generation_subtype = 'wind_offshore'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_setup.sql',' '); /* @@ -91,14 +91,14 @@ ALTER TABLE model_draft.ego_dp_supply_res_powerplant_out_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_dp_supply_res_powerplant_out_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_dp_supply_res_powerplant_out_mview','ego_dp_rea_setup.sql','First check if RES are outside Germany'); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_dp_supply_res_powerplant_out_mview','ego_dp_rea_setup.sql','First check if RES are outside Germany'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_hvmv_substation','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_rea_setup.sql',' '); -- new geom, DEA to next substation DROP TABLE IF EXISTS model_draft.ego_dp_supply_res_powerplant_out_nn CASCADE; @@ -122,10 +122,10 @@ ALTER TABLE model_draft.ego_dp_supply_res_powerplant_out_nn -- metadata COMMENT ON TABLE model_draft.ego_dp_supply_res_powerplant_out_nn IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_dp_supply_res_powerplant_out_nn','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_dp_supply_res_powerplant_out_nn','ego_dp_rea_setup.sql',' '); -- new subst_id and rea_geom_new with line UPDATE model_draft.ego_dp_supply_res_powerplant AS t1 @@ -169,10 +169,10 @@ ALTER TABLE model_draft.ego_dp_supply_res_powerplant_out_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_dp_supply_res_powerplant_out_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_dp_supply_res_powerplant_out_mview','ego_dp_rea_setup.sql','Second check if RES outside Germany'); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_dp_supply_res_powerplant_out_mview','ego_dp_rea_setup.sql','Second check if RES outside Germany'); -- drop DROP TABLE IF EXISTS model_draft.ego_dp_supply_res_powerplant_out_nn CASCADE; @@ -185,7 +185,7 @@ In Germany a lot of farmyard builings are used for renewable energy production w */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_setup.sql',' '); ALTER TABLE model_draft.ego_osm_sector_per_griddistrict_4_agricultural DROP COLUMN IF EXISTS subst_id, @@ -211,4 +211,4 @@ UPDATE model_draft.ego_osm_sector_per_griddistrict_4_agricultural SET area_ha = ST_AREA(geom)/10000; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_setup.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_wpa_per_mvgd.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_wpa_per_mvgd.sql index 2be0e009..50751142 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_wpa_per_mvgd.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_wpa_per_mvgd.sql @@ -19,7 +19,7 @@ CREATE TABLE model_draft.ego_supply_wpa ( CONSTRAINT ego_supply_wpa_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','supply','vernetzen_wind_potential_area','ego_dp_rea_wpa_per_mvgd.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','supply','vernetzen_wind_potential_area','ego_dp_rea_wpa_per_mvgd.sql',' '); -- insert wpa dump INSERT INTO model_draft.ego_supply_wpa (geom) @@ -36,7 +36,7 @@ CREATE INDEX ego_supply_wpa_geom_idx ALTER TABLE model_draft.ego_supply_wpa OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','temp','model_draft','ego_supply_wpa','ego_dp_rea_wpa_per_mvgd.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_wpa','ego_dp_rea_wpa_per_mvgd.sql',' '); */ /* -- validate (geom) @@ -69,8 +69,8 @@ CREATE TABLE model_draft.ego_supply_wpa_per_mvgd ( CONSTRAINT ego_supply_wpa_per_mvgd_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_wpa_per_mvgd.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.2','input','supply','vernetzen_wind_potential_area','ego_dp_rea_wpa_per_mvgd.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_wpa_per_mvgd.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','input','supply','vernetzen_wind_potential_area','ego_dp_rea_wpa_per_mvgd.sql',' '); -- insert wpa per mv-griddistrict WITH wpa_dump AS ( @@ -112,10 +112,10 @@ ALTER TABLE model_draft.ego_supply_wpa_per_mvgd OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_supply_wpa_per_mvgd IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.2" }'; + "version": "v0.4.4" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.2','output','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_wpa_per_mvgd.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_wpa_per_mvgd.sql',' '); -- DROP TABLE IF EXISTS model_draft.ego_supply_wpa CASCADE; From a366b966178b90ebc486feafe003b67dff5dd8bc Mon Sep 17 00:00:00 2001 From: WolfBunke Date: Fri, 27 Jul 2018 08:36:39 +0200 Subject: [PATCH 22/36] fix #302 Changes are done for 302#issuecomment-408162852 --- .../sql_snippets/ego_dp_versioning_mviews.sql | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql index f0ccd929..2edf7423 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql @@ -18,8 +18,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS WHERE scenario = 'Status Quo' AND (shutdown IS NULL or shutdown >= 2015) AND capacity > 0 - AND preversion = 'v0.3.0' - AND version = 'v0.4.4'; + --AND preversion = 'v0.3.0' + --AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview OWNER TO oeuser; @@ -33,8 +33,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS AND capacity > 0 AND fuel not in ('hydro', 'run_of_river', 'reservoir') AND (shutdown IS NULL or shutdown >= 2034) - AND preversion = 'v0.3.0' - AND version = 'v0.4.4'; + --AND preversion = 'v0.3.0' + --AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview OWNER TO oeuser; @@ -90,8 +90,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS AND fuel = 'pumped_storage' AND capacity > 0 AND (shutdown IS NULL or shutdown >= 2049) - AND preversion = 'v0.3.0' - AND version = 'v0.4.4'; + --AND preversion = 'v0.3.0' + --AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview OWNER TO oeuser; @@ -110,8 +110,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario = 'Status Quo' AND electrical_capacity > 0 - AND preversion = 'v0.3.0' - AND version = 'v0.4.4'; + --AND preversion = 'v0.3.0' + --AND version = 'v0.4.4'; ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview OWNER TO oeuser; @@ -129,13 +129,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_res_powerplant - WHERE version = 'v0.4.4' + --WHERE version = 'v0.4.4' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' - And preversion = 'v0.3.0' - AND version = 'v0.4.4' + --And preversion = 'v0.3.0' + --AND version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) as sub @@ -151,12 +151,12 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS SELECT id FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - AND version = 'v0.4.4' + --AND version = 'v0.4.4' Group BY id Order by id) AND scenario in ('NEP 2035') - And preversion = 'v0.3.0' - AND version = 'v0.4.4' + -- And preversion = 'v0.3.0' + -- AND version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -178,13 +178,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_res_powerplant - WHERE version = 'v0.4.4' + -- WHERE version = 'v0.4.4' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' - AND preversion = 'v0.3.0' - AND version = 'v0.4.4' + -- AND preversion = 'v0.3.0' + -- AND version = 'v0.4.4' AND electrical_capacity > 0 AND generation_type in ('solar','wind') AND generation_subtype not in ('wind_offshore') @@ -203,13 +203,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario in ('eGo 100') AND generation_type not in ('gas') - AND version = 'v0.4.4' + --AND version = 'v0.4.4' AND flag in ('commissioning', 'repowering') Group BY id Order by id) AND scenario in ('eGo 100') - And preversion = 'v0.3.0' - AND version = 'v0.4.4' + --And preversion = 'v0.3.0' + --AND version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -225,15 +225,15 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS SELECT id FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - AND version = 'v0.4.4' + --AND version = 'v0.4.4' 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') - And preversion = 'v0.3.0' - AND version = 'v0.4.4' + --And preversion = 'v0.3.0' + --AND version = 'v0.4.4' AND electrical_capacity > 0 ORDER BY id ) sub3 From 7ebe22d9c4e07eb31a152bf186ad2b794b336fe7 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Fri, 27 Jul 2018 15:18:30 +0200 Subject: [PATCH 23/36] adjust eeg filter --- .../sql_snippets/ego_dp_powerflow_assignment_unid.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql index d36a0583..40cb68da 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql @@ -37,7 +37,7 @@ INSERT INTO model_draft.ego_supply_generator (re_id, geom) INSERT INTO model_draft.ego_supply_generator (conv_id, geom) SELECT id, geom FROM model_draft.ego_dp_supply_conv_powerplant - WHERE eeg NOT LIKE 'yes'; -- Duplicates that already occur in the eeg-list are ignored + WHERE eeg IS NULL OR eeg = 'no'; -- Duplicates that already occur in the eeg-list are ignored -- index GIST (geom) CREATE INDEX ego_supply_generator_idx From 75818965fcdd286294c2870d3bbe23d7ee256884 Mon Sep 17 00:00:00 2001 From: ulfmueller Date: Sun, 29 Jul 2018 22:58:19 +0200 Subject: [PATCH 24/36] minor changes --- dataprocessing/eGo_data_processing.py | 106 +++++++++++++------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/dataprocessing/eGo_data_processing.py b/dataprocessing/eGo_data_processing.py index edc41ea4..5998b4bf 100644 --- a/dataprocessing/eGo_data_processing.py +++ b/dataprocessing/eGo_data_processing.py @@ -41,77 +41,77 @@ def data_processing(): snippets = [ ## INPUT DATA CHECK (eGoPP) - 'ego_dp_structure_input_verification.sql', # Input verification (eGoPP) +# 'ego_dp_structure_input_verification.sql', # Input verification (eGoPP) ## SUBSTATION - 'ego_dp_substation_hvmv.sql', # Abstract HVMV Substations of the high voltage level from OSM - 'ego_dp_substation_ehv.sql', # Abstract EHV Substations of the extra high voltage level from OSM - 'ego_dp_substation_otg.sql', # Assign osmTGmod-id to HVMV and EHV substations - 'ego_dp_substation_hvmv_voronoi.sql', # HVMV Voronoi cells based on HVMV substations - 'ego_dp_substation_ehv_voronoi.sql', # EHV Voronoi cells based on EHV substations +# 'ego_dp_substation_hvmv.sql', # Abstract HVMV Substations of the high voltage level from OSM +# 'ego_dp_substation_ehv.sql', # Abstract EHV Substations of the extra high voltage level from OSM +# 'ego_dp_substation_otg.sql', # Assign osmTGmod-id to HVMV and EHV substations +# 'ego_dp_substation_hvmv_voronoi.sql', # HVMV Voronoi cells based on HVMV substations +# 'ego_dp_substation_ehv_voronoi.sql', # EHV Voronoi cells based on EHV substations ## GRIDDISTRICT - 'ego_dp_mv_griddistrict.sql', # MV GridDistricts from municipalities and Voronoi cells - 'ego_dp_substation_id_to_generator.sql', # Assign Substation ID (subst_id) to Generator (Conventional and Renewable) +# 'ego_dp_mv_griddistrict.sql', # MV GridDistricts from municipalities and Voronoi cells +# 'ego_dp_substation_id_to_generator.sql', # Assign Substation ID (subst_id) to Generator (Conventional and Renewable) ## LOADAREA - 'ego_dp_loadarea_landuse.sql', # OSM landuse sectors - 'ego_dp_loadarea_industry_consumer.sql', # OSM Industry consumer - 'ego_dp_loadarea_loads.sql', # OSM Loads from landuse - 'ego_dp_loadarea_census.sql', # Loads from Census 2011 - 'ego_dp_loadarea_loadmelt.sql', # Melt loads from OSM landuse and Census 2011 - 'ego_dp_loadarea_loadcut_griddistrict.sql', # Cut Loadarea with MV Griddistrict - 'ego_dp_loadarea_loadcut_voronoi.sql', # Cut Loadarea with MV Voronoi cells - 'ego_dp_loadarea_consumption.sql', # Allocate consumption to Loadareas - 'ego_dp_loadarea_peakload.sql', # Peak loads per Loadarea - 'ego_dp_loadarea_griddistrict_results.sql', # Results for MV Griddistrict - 'ego_dp_loadarea_statistic.sql', # Results and statistics for eGoDP data +# 'ego_dp_loadarea_landuse.sql', # OSM landuse sectors +# 'ego_dp_loadarea_industry_consumer.sql', # OSM Industry consumer +# 'ego_dp_loadarea_loads.sql', # OSM Loads from landuse +# 'ego_dp_loadarea_census.sql', # Loads from Census 2011 +# 'ego_dp_loadarea_loadmelt.sql', # Melt loads from OSM landuse and Census 2011 +# 'ego_dp_loadarea_loadcut_griddistrict.sql', # Cut Loadarea with MV Griddistrict +# 'ego_dp_loadarea_loadcut_voronoi.sql', # Cut Loadarea with MV Voronoi cells +# 'ego_dp_loadarea_consumption.sql', # Allocate consumption to Loadareas +# 'ego_dp_loadarea_peakload.sql', # Peak loads per Loadarea +# 'ego_dp_loadarea_griddistrict_results.sql', # Results for MV Griddistrict +# 'ego_dp_loadarea_statistic.sql', # Results and statistics for eGoDP data ## LOWVOLTAGE - 'ego_dp_lv_substation.sql', # MVLV Substation (ONT) - 'ego_dp_lv_substation_voronoi.sql', # MVLV Substation Voronoi - 'ego_dp_lv_loadcut.sql', # LV Loadcut - 'ego_dp_lv_griddistrict.sql', # LV Griddistrict - 'ego_dp_lv_consumption_peakload.sql', # LV Consumption and Peakload +# 'ego_dp_lv_substation.sql', # MVLV Substation (ONT) +# 'ego_dp_lv_substation_voronoi.sql', # MVLV Substation Voronoi +# 'ego_dp_lv_loadcut.sql', # LV Loadcut +# 'ego_dp_lv_griddistrict.sql', # LV Griddistrict +# 'ego_dp_lv_consumption_peakload.sql', # LV Consumption and Peakload ## REA - 'rea/ego_dp_lattice_500m.sql', # Lattice (point grid) 500m - 'rea/ego_dp_lattice_50m.sql', # Lattice (point grid) 50m - 'rea/ego_dp_rea_wpa_per_mvgd.sql', # Wind potential area (WPA) - 'rea/ego_dp_rea_lattice_per_area_500m.sql', # Prepare 500m lattice - 'rea/ego_dp_rea_lattice_per_area_50m.sql', # Prepare 50m lattice - 'rea/ego_dp_rea_setup.sql', # Setup tables for REA - 'rea/ego_dp_rea_m1.sql', # M1 biomass and solar to OSM agricultural - 'rea/ego_dp_rea_m2.sql', # M2 wind farms - 'rea/ego_dp_rea_m3.sql', # M3 wind turbines to WPA - 'rea/ego_dp_rea_m4.sql', # M4 other and rest +# 'rea/ego_dp_lattice_500m.sql', # Lattice (point grid) 500m +# 'rea/ego_dp_lattice_50m.sql', # Lattice (point grid) 50m +# 'rea/ego_dp_rea_wpa_per_mvgd.sql', # Wind potential area (WPA) +# 'rea/ego_dp_rea_lattice_per_area_500m.sql', # Prepare 500m lattice +# 'rea/ego_dp_rea_lattice_per_area_50m.sql', # Prepare 50m lattice +# 'rea/ego_dp_rea_setup.sql', # Setup tables for REA +# 'rea/ego_dp_rea_m1.sql', # M1 biomass and solar to OSM agricultural +# 'rea/ego_dp_rea_m2.sql', # M2 wind farms +# 'rea/ego_dp_rea_m3.sql', # M3 wind turbines to WPA +# 'rea/ego_dp_rea_m4.sql', # M4 other and rest 'rea/ego_dp_rea_m5.sql', # M5 LV to Loadarea 'rea/ego_dp_rea_results.sql', # Results and statistics ## POWERFLOW - 'ego_dp_powerflow_hv_setup.sql', # Set schema/tables for EHV/HV powerflow calculations up - 'ego_dp_powerflow_osmtgmod_to_pypsa.sql', # Include data from osmTGmod into EHV/HV powerflow schema - 'ego_dp_powerflow_electrical_neighbour.sql', # Create border crossing lines and buses in neighbouring countries - 'ego_dp_powerflow_fix_ehv_subnetworks.sql', # Fix topological errors in eHV grid - 'ego_dp_powerflow_grid_future_scenarios.sql', # Copy grid to future scenarios - 'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists - 'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv) - 'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario - 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation (SQ, NEP2035, eGo100) - 'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation (SQ, NEP2035, eGo100) - 'ego_dp_powerflow_assignment_storage.sql', # Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100) - 'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table - 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict - 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100) - 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages - 'ego_dp_data_check.sql', # Check powerflow data for plausibility +# 'ego_dp_powerflow_hv_setup.sql', # Set schema/tables for EHV/HV powerflow calculations up +# 'ego_dp_powerflow_osmtgmod_to_pypsa.sql', # Include data from osmTGmod into EHV/HV powerflow schema +# 'ego_dp_powerflow_electrical_neighbour.sql', # Create border crossing lines and buses in neighbouring countries +# 'ego_dp_powerflow_fix_ehv_subnetworks.sql', # Fix topological errors in eHV grid +# 'ego_dp_powerflow_grid_future_scenarios.sql', # Copy grid to future scenarios +# 'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists +# 'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv) +# 'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario +# 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation (SQ, NEP2035, eGo100) +# 'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation (SQ, NEP2035, eGo100) +# 'ego_dp_powerflow_assignment_storage.sql', # Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100) +# 'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table +# 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict +# 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100) +# 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages +# 'ego_dp_data_check.sql', # Check powerflow data for plausibility ## POST-PROCESSING - 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data +# 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data ## VERSIONING - 'ego_dp_versioning.sql', # Versioning - 'ego_dp_versioning_mviews.sql' , # Versioning of mviews +# 'ego_dp_versioning.sql', # Versioning +# 'ego_dp_versioning_mviews.sql' , # Versioning of mviews From 2e4c73cf2299f0c944057d3259438aad24956acd Mon Sep 17 00:00:00 2001 From: ulfmueller Date: Thu, 2 Aug 2018 11:43:00 +0200 Subject: [PATCH 25/36] remove BOM --- dataprocessing/eGo_data_processing.py | 28 +++++++++---------- .../ego_dp_powerflow_electrical_neighbour.sql | 1 - .../ego_dp_powerflow_fix_ehv_subnetworks.sql | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dataprocessing/eGo_data_processing.py b/dataprocessing/eGo_data_processing.py index 5998b4bf..8264dd7f 100644 --- a/dataprocessing/eGo_data_processing.py +++ b/dataprocessing/eGo_data_processing.py @@ -85,8 +85,8 @@ def data_processing(): # 'rea/ego_dp_rea_m2.sql', # M2 wind farms # 'rea/ego_dp_rea_m3.sql', # M3 wind turbines to WPA # 'rea/ego_dp_rea_m4.sql', # M4 other and rest - 'rea/ego_dp_rea_m5.sql', # M5 LV to Loadarea - 'rea/ego_dp_rea_results.sql', # Results and statistics +# 'rea/ego_dp_rea_m5.sql', # M5 LV to Loadarea +# 'rea/ego_dp_rea_results.sql', # Results and statistics ## POWERFLOW @@ -95,19 +95,19 @@ def data_processing(): # 'ego_dp_powerflow_electrical_neighbour.sql', # Create border crossing lines and buses in neighbouring countries # 'ego_dp_powerflow_fix_ehv_subnetworks.sql', # Fix topological errors in eHV grid # 'ego_dp_powerflow_grid_future_scenarios.sql', # Copy grid to future scenarios -# 'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists -# 'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv) -# 'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario -# 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation (SQ, NEP2035, eGo100) -# 'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation (SQ, NEP2035, eGo100) -# 'ego_dp_powerflow_assignment_storage.sql', # Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100) -# 'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table -# 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict -# 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100) -# 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages -# 'ego_dp_data_check.sql', # Check powerflow data for plausibility + 'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists + 'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv) + 'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario + 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation (SQ, NEP2035, eGo100) + 'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation (SQ, NEP2035, eGo100) + 'ego_dp_powerflow_assignment_storage.sql', # Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100) + 'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table + 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict + 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100) + 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages + 'ego_dp_data_check.sql', # Check powerflow data for plausibility ## POST-PROCESSING -# 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data + 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data ## VERSIONING # 'ego_dp_versioning.sql', # Versioning diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql index 8cc2444d..e4ee8c29 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_electrical_neighbour.sql @@ -1,4 +1,3 @@ - /* The electricity grid model extracted from osmTGmod is limited to the German territory. This script adds border crossing lines and corresponding buses and transformers to all neighbouring countries which have a direct electrical connection diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql index f9c9d9be..b1bd19a5 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql @@ -1,4 +1,4 @@ -DROP SEQUENCE IF EXISTS model_draft.ego_grid_hv_fix_errors_bus_id CASCADE; +DROP SEQUENCE IF EXISTS model_draft.ego_grid_hv_fix_errors_bus_id CASCADE; CREATE SEQUENCE model_draft.ego_grid_hv_fix_errors_bus_id; SELECT setval('model_draft.ego_grid_hv_fix_errors_bus_id', (max(bus_id)+1)) FROM model_draft.ego_grid_pf_hv_bus; From 1761e15ceafcea6df7ccddc6dc7a9e65e053f1ca Mon Sep 17 00:00:00 2001 From: ClaraBuettner Date: Thu, 2 Aug 2018 14:22:08 +0200 Subject: [PATCH 26/36] Update x-values of trafos --- .../ego_pp_nep2035_grid_variations.sql | 79 ++++++++++--------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql b/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql index 513b18e0..6ca72834 100644 --- a/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql +++ b/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql @@ -538,7 +538,7 @@ SET s_min = (CASE WHEN s0 < s1 THEN s0 --- Set s_nom in respect to s_min and trafos in existing network --- UPDATE model_draft.ego_grid_pf_hv_extension_transformer -SET s_nom = (CASE WHEN s_min <= 600 THEN 600 +SET s_nom = (CASE WHEN s_min <= 600 THEN 600 WHEN s_min > 600 AND s_min <= 1200 THEN 1200 WHEN s_min > 1200 AND s_min <= 1600 THEN 1600 WHEN s_min > 1600 AND s_min <= 2100 THEN 2100 @@ -548,9 +548,9 @@ SET s_nom = (CASE WHEN s_min <= 600 THEN 600 WHEN s_min > 6000 AND s_min <= 7200 THEN 7200 WHEN s_min > 7200 AND s_min <= 8000 THEN 8000 WHEN s_min > 8000 AND s_min <= 9000 THEN 9000 - WHEN s_min > 9000 AND s_min <= 10800 THEN 10800 - WHEN s_min > 10800 --AND s_min <= 12000 - THEN 12000 + WHEN s_min > 9000 AND s_min <= 13000 THEN 13000 + WHEN s_min > 13000 AND s_min <= 20000 THEN 20000 + WHEN s_min > 20000 AND s_min <= 33000 THEN 33000 END); --- Set capital costs for trafos --- @@ -1036,7 +1036,7 @@ SET s_min = (CASE WHEN s0 < s1 THEN s0 UPDATE model_draft.ego_grid_pf_hv_extension_transformer -SET s_nom = (CASE WHEN s_min <= 600 THEN 600 +SET s_nom = (CASE WHEN s_min <= 600 THEN 600 WHEN s_min > 600 AND s_min <= 1200 THEN 1200 WHEN s_min > 1200 AND s_min <= 1600 THEN 1600 WHEN s_min > 1600 AND s_min <= 2100 THEN 2100 @@ -1046,24 +1046,24 @@ SET s_nom = (CASE WHEN s_min <= 600 THEN 600 WHEN s_min > 6000 AND s_min <= 7200 THEN 7200 WHEN s_min > 7200 AND s_min <= 8000 THEN 8000 WHEN s_min > 8000 AND s_min <= 9000 THEN 9000 - WHEN s_min > 9000 AND s_min <= 10800 THEN 10800 - WHEN s_min > 10800 --AND s_min <= 12000 - THEN 12000 + WHEN s_min > 9000 AND s_min <= 13000 THEN 13000 + WHEN s_min > 13000 AND s_min <= 20000 THEN 20000 + WHEN s_min > 20000 AND s_min <= 33000 THEN 33000 END); - -UPDATE model_draft.ego_grid_pf_hv_extension_transformer -SET x = (CASE s_nom WHEN 1200 THEN 4.84 - WHEN 4800 THEN 1.21 - WHEN 2100 THEN 9.62667148 - WHEN 1600 THEN 3.63 - WHEN 600 THEN 9.68 - WHEN 6000 THEN 3.249 - WHEN 7200 THEN 2.80777136 - WHEN 2600 THEN 2.23384392 - WHEN 8000 THEN 2.43675 - WHEN 9000 THEN 2.166 - WHEN 10800 THEN 0.00002 - WHEN 12000 THEN 0.00002 +UPDATE model_draft.ego_grid_pf_hv_extension_transformer +SET x = (CASE s_nom WHEN 1200 THEN 0.0001 + WHEN 4800 THEN 0.000025 + WHEN 2100 THEN 0.00006667 + WHEN 1600 THEN 0.000075000000000000000000 + WHEN 600 THEN 0.00020000000000000000 + WHEN 6000 THEN 0.000022500000000000000000 + WHEN 7200 THEN 0.000019444400000000000000 + WHEN 2600 THEN 0.000046153800000000000000 + WHEN 8000 THEN 0.000016875000000000000000 + WHEN 9000 THEN 0.000015000000000000000000 + WHEN 13000 THEN 0.000010384600000000000000 + WHEN 20000 THEN 0.000006750000000000000000 + WHEN 33000 THEN 0.000004090910000000000000 END), tap_ratio = 1, phase_shift = 0; @@ -1259,7 +1259,7 @@ SET geom = ST_Multi(topo), WHERE scn_name = 'extension_nep2035_b2'; UPDATE model_draft.ego_grid_pf_hv_extension_transformer -SET s_nom = (CASE WHEN s_min <= 600 THEN 600 +SET s_nom = (CASE WHEN s_min <= 600 THEN 600 WHEN s_min > 600 AND s_min <= 1200 THEN 1200 WHEN s_min > 1200 AND s_min <= 1600 THEN 1600 WHEN s_min > 1600 AND s_min <= 2100 THEN 2100 @@ -1269,25 +1269,26 @@ SET s_nom = (CASE WHEN s_min <= 600 THEN 600 WHEN s_min > 6000 AND s_min <= 7200 THEN 7200 WHEN s_min > 7200 AND s_min <= 8000 THEN 8000 WHEN s_min > 8000 AND s_min <= 9000 THEN 9000 - WHEN s_min > 9000 AND s_min <= 10800 THEN 10800 - WHEN s_min > 10800 --AND s_min <= 12000 - THEN 12000 + WHEN s_min > 9000 AND s_min <= 13000 THEN 13000 + WHEN s_min > 13000 AND s_min <= 20000 THEN 20000 + WHEN s_min > 20000 AND s_min <= 33000 THEN 33000 END) WHERE scn_name = 'extension_nep2035_b2'; -UPDATE model_draft.ego_grid_pf_hv_extension_transformer -SET x = (CASE s_nom WHEN 1200 THEN 4.84 - WHEN 4800 THEN 1.21 - WHEN 2100 THEN 9.62667148 - WHEN 1600 THEN 3.63 - WHEN 600 THEN 9.68 - WHEN 6000 THEN 3.249 - WHEN 7200 THEN 2.80777136 - WHEN 2600 THEN 2.23384392 - WHEN 8000 THEN 2.43675 - WHEN 9000 THEN 2.166 - WHEN 10800 THEN 0.00002 - WHEN 12000 THEN 0.00002 +UPDATE model_draft.ego_grid_pf_hv_extension_transformer +SET x = (CASE s_nom WHEN 1200 THEN 0.0001 + WHEN 4800 THEN 0.000025 + WHEN 2100 THEN 0.00006667 + WHEN 1600 THEN 0.000075000000000000000000 + WHEN 600 THEN 0.00020000000000000000 + WHEN 6000 THEN 0.000022500000000000000000 + WHEN 7200 THEN 0.000019444400000000000000 + WHEN 2600 THEN 0.000046153800000000000000 + WHEN 8000 THEN 0.000016875000000000000000 + WHEN 9000 THEN 0.000015000000000000000000 + WHEN 13000 THEN 0.000010384600000000000000 + WHEN 20000 THEN 0.000006750000000000000000 + WHEN 33000 THEN 0.000004090910000000000000 END), tap_ratio = 1, phase_shift = 0 From 49d1f53a0315322acbf220c32034e131f07bd419 Mon Sep 17 00:00:00 2001 From: ulfmueller Date: Fri, 10 Aug 2018 21:20:37 +0200 Subject: [PATCH 27/36] debugging for v0.4.4 --- dataprocessing/eGo_data_processing.py | 26 +++++++++---------- .../sql_snippets/ego_dp_data_check.sql | 12 ++++----- .../ego_dp_powerflow_assignment_generator.sql | 4 ++- .../ego_dp_powerflow_lopf_data.sql | 2 +- .../sql_snippets/ego_dp_versioning.sql | 8 +++--- .../sql_snippets/ego_dp_versioning_mviews.sql | 8 +++--- 6 files changed, 31 insertions(+), 29 deletions(-) diff --git a/dataprocessing/eGo_data_processing.py b/dataprocessing/eGo_data_processing.py index 8264dd7f..1deb041a 100644 --- a/dataprocessing/eGo_data_processing.py +++ b/dataprocessing/eGo_data_processing.py @@ -95,23 +95,23 @@ def data_processing(): # 'ego_dp_powerflow_electrical_neighbour.sql', # Create border crossing lines and buses in neighbouring countries # 'ego_dp_powerflow_fix_ehv_subnetworks.sql', # Fix topological errors in eHV grid # 'ego_dp_powerflow_grid_future_scenarios.sql', # Copy grid to future scenarios - 'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists - 'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv) - 'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario - 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation (SQ, NEP2035, eGo100) - 'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation (SQ, NEP2035, eGo100) - 'ego_dp_powerflow_assignment_storage.sql', # Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100) - 'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table - 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict - 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100) - 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages - 'ego_dp_data_check.sql', # Check powerflow data for plausibility +# 'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists +# 'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv) +# 'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario +# 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation (SQ, NEP2035, eGo100) +# 'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation (SQ, NEP2035, eGo100) +# 'ego_dp_powerflow_assignment_storage.sql', # Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100) +# 'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table +# 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict +# 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100) +# 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages +# 'ego_dp_data_check.sql', # Check powerflow data for plausibility ## POST-PROCESSING - 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data +# 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data ## VERSIONING # 'ego_dp_versioning.sql', # Versioning -# 'ego_dp_versioning_mviews.sql' , # Versioning of mviews + 'ego_dp_versioning_mviews.sql' , # Versioning of mviews diff --git a/dataprocessing/sql_snippets/ego_dp_data_check.sql b/dataprocessing/sql_snippets/ego_dp_data_check.sql index 378c8204..0d67f1d4 100644 --- a/dataprocessing/sql_snippets/ego_dp_data_check.sql +++ b/dataprocessing/sql_snippets/ego_dp_data_check.sql @@ -156,8 +156,8 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl SELECT 'v0.4.4', 'Status Quo', - 'transformers with NULL values for buses' - 'model_draft.ego_grid_pf_hv_transformer',, + 'transformers with NULL values for buses', + 'model_draft.ego_grid_pf_hv_transformer', count(*) FROM model_draft.ego_grid_pf_hv_transformer WHERE scn_name = 'Status Quo' AND (bus0 IS NULL OR @@ -272,7 +272,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl 'model_draft.ego_supply_pf_generator_single', count(*) FROM model_draft.ego_supply_pf_generator_single WHERE scn_name = 'Status Quo' AND - otg_id IS NULL; + bus IS NULL; INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) @@ -283,7 +283,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl 'model_draft.ego_supply_pf_generator_single', count(*) FROM model_draft.ego_supply_pf_generator_single WHERE scn_name = 'NEP 2035' AND - otg_id IS NULL; + bus IS NULL; INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT @@ -293,7 +293,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl 'model_draft.ego_supply_pf_generator_single', count(*) FROM model_draft.ego_supply_pf_generator_single WHERE scn_name = 'eGo 100' AND - otg_id IS NULL; + bus IS NULL; -- Do all generators which are not 'reservoir', 'geothermal' or 'other_non_renewable' have defined timeseries in all three scenarios? @@ -629,7 +629,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl 'all', 'generators without rea_geom_new', 'model_draft.ego_dp_supply_res_powerplant', - count(*) FROM model_draft_ego_dp_supply_res_powerplant + count(*) FROM model_draft.ego_dp_supply_res_powerplant WHERE rea_geom_new IS NULL; diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql index 1bd8215c..8fb08780 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql @@ -1,4 +1,4 @@ -/* +/* Generators which were assigned to a specific substation prior to this script need to be transformed to a data structure suitable for powerflow calculation with tool developed and used in the open_eGo project. The following script transforms data from the powerplant mviews and adds some parameters according to the characteristics of the generators. @@ -413,6 +413,8 @@ UPDATE model_draft.ego_grid_pf_hv_generator -- scenario log (project,version,io,schema_name,table_name,script_name,comment) SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_assignment_generator.sql',' '); +DROP TABLE IF EXISTS model_draft.ego_supply_aggr_weather CASCADE; + CREATE TABLE model_draft.ego_supply_aggr_weather AS (WITH w_sub AS ( diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql index 3a593c25..2b5025dd 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql @@ -1,4 +1,4 @@ -/* +/* Missing parameters necessary for calculating a linear optimal power flow (LOPF) are added to the existing data. This includes marginal costs per technology, which is composed of specific operating cost, fuel costs and CO2 costs according to renpass_gis, NEP 2014 scenario. diff --git a/dataprocessing/sql_snippets/ego_dp_versioning.sql b/dataprocessing/sql_snippets/ego_dp_versioning.sql index 1c2d15d4..49e6e071 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning.sql @@ -606,9 +606,9 @@ SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_aggr_weather','ego_ -- pf data check -INSERT INTO grid.ego_pf_hv_data_check - SELECT * - FROM model_draft.ego_grid_pf_hv_data_check; +--INSERT INTO grid.ego_pf_hv_data_check +-- SELECT * +-- FROM model_draft.ego_grid_pf_hv_data_check; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning'); +--SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning'); diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql index fac6dc63..ecd85234 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql @@ -17,7 +17,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS FROM supply.ego_dp_conv_powerplant WHERE scenario = 'Status Quo' AND (shutdown IS NULL or shutdown >= 2015) - AND capacity > 0 + AND capacity > 0; -- AND preversion = 'v0.3.0' --AND version = 'v0.4.4'; @@ -33,7 +33,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS WHERE scenario = 'NEP 2035' AND capacity > 0 AND fuel not in ('hydro', 'run_of_river', 'reservoir') - AND (shutdown IS NULL or shutdown >= 2034) + AND (shutdown IS NULL or shutdown >= 2034); --AND preversion = 'v0.3.0' --AND version = 'v0.4.4'; @@ -91,7 +91,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS WHERE scenario in('NEP 2035') AND fuel = 'pumped_storage' AND capacity > 0 - AND (shutdown IS NULL or shutdown >= 2049) + AND (shutdown IS NULL or shutdown >= 2049); --AND preversion = 'v0.3.0' --AND version = 'v0.4.4'; @@ -112,7 +112,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS SELECT * FROM supply.ego_dp_res_powerplant WHERE scenario = 'Status Quo' - AND electrical_capacity > 0 + AND electrical_capacity > 0; --AND preversion = 'v0.3.0' --AND version = 'v0.4.4'; From 8015cdfd5ec7b79bd28c30cbf1e8c8660795c9e1 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Mon, 13 Aug 2018 15:01:19 +0200 Subject: [PATCH 28/36] change version number --- .../ego_dp_loadarea_peakload.py | 4 +- .../ego_dp_powerflow_griddistrict_demand.py | 6 +- .../python_scripts/setup_ego_mv_powerflow.py | 2 +- .../sql_snippets/ego_dp_data_check.sql | 106 ++++----- .../sql_snippets/ego_dp_loadarea_census.sql | 16 +- .../ego_dp_loadarea_consumption.sql | 8 +- .../ego_dp_loadarea_griddistrict_results.sql | 24 +- .../ego_dp_loadarea_industry_consumer.sql | 20 +- .../sql_snippets/ego_dp_loadarea_landuse.sql | 14 +- .../ego_dp_loadarea_loadcut_griddistrict.sql | 58 ++--- .../ego_dp_loadarea_loadcut_voronoi.sql | 44 ++-- .../sql_snippets/ego_dp_loadarea_loadmelt.sql | 30 +-- .../sql_snippets/ego_dp_loadarea_loads.sql | 14 +- .../sql_snippets/ego_dp_loadarea_peakload.sql | 6 +- .../ego_dp_loadarea_statistic.sql | 40 ++-- .../ego_dp_lv_consumption_peakload.sql | 8 +- .../sql_snippets/ego_dp_lv_griddistrict.sql | 32 +-- .../sql_snippets/ego_dp_lv_loadcut.sql | 26 +-- .../sql_snippets/ego_dp_lv_substation.sql | 20 +- .../ego_dp_lv_substation_voronoi.sql | 8 +- .../sql_snippets/ego_dp_mv_griddistrict.sql | 108 ++++----- .../ego_dp_powerflow_assignment_generator.sql | 10 +- .../ego_dp_powerflow_assignment_load.sql | 4 +- .../ego_dp_powerflow_assignment_otgid.sql | 4 +- .../ego_dp_powerflow_assignment_storage.sql | 2 +- .../ego_dp_powerflow_assignment_unid.sql | 6 +- .../ego_dp_powerflow_create_pp_mview.sql | 12 +- .../ego_dp_powerflow_fix_ehv_subnetworks.sql | 6 +- ...ego_dp_powerflow_grid_future_scenarios.sql | 6 +- .../ego_dp_powerflow_hv_setup.sql | 28 +-- .../ego_dp_powerflow_lopf_data.sql | 6 +- .../ego_dp_powerflow_osmtgmod_to_pypsa.sql | 6 +- .../ego_dp_powerflow_timeseries_demand.sql | 4 +- .../ego_dp_powerflow_timeseries_generator.sql | 2 +- .../ego_dp_structure_input_verification.sql | 36 +-- .../sql_snippets/ego_dp_substation_ehv.sql | 40 ++-- .../sql_snippets/ego_dp_substation_hvmv.sql | 42 ++-- .../ego_dp_substation_hvmv_voronoi.sql | 14 +- .../ego_dp_substation_id_to_generator.sql | 4 +- .../sql_snippets/ego_dp_substation_otg.sql | 10 +- ...dp_supply_dp_powerflow_create_pp_mview.sql | 40 ++-- .../sql_snippets/ego_dp_versioning.sql | 220 +++++++++--------- .../sql_snippets/ego_dp_versioning_mviews.sql | 40 ++-- .../ego_dp_versioning_overview.sql | 60 ++--- .../ego_pp_nep2035_grid_variations.sql | 8 +- .../sql_snippets/rea/ego_dp_conv.sql | 4 +- .../sql_snippets/rea/ego_dp_lattice_500m.sql | 6 +- .../sql_snippets/rea/ego_dp_lattice_50m.sql | 6 +- .../rea/ego_dp_rea_lattice_per_area_500m.sql | 16 +- .../rea/ego_dp_rea_lattice_per_area_50m.sql | 8 +- .../sql_snippets/rea/ego_dp_rea_m1.sql | 28 +-- .../sql_snippets/rea/ego_dp_rea_m2.sql | 18 +- .../sql_snippets/rea/ego_dp_rea_m3.sql | 14 +- .../sql_snippets/rea/ego_dp_rea_m4.sql | 14 +- .../sql_snippets/rea/ego_dp_rea_m5.sql | 16 +- .../sql_snippets/rea/ego_dp_rea_results.sql | 14 +- .../sql_snippets/rea/ego_dp_rea_setup.sql | 24 +- .../rea/ego_dp_rea_wpa_per_mvgd.sql | 12 +- 58 files changed, 692 insertions(+), 692 deletions(-) diff --git a/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py b/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py index 8968dbfc..59c5ff14 100755 --- a/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py +++ b/dataprocessing/python_scripts/ego_dp_loadarea_peakload.py @@ -128,7 +128,7 @@ def add_sectoral_peak_load(load_areas, **kwargs): columns=columns) write_ego_scenario_log(conn=conn, - version='v0.4.4', + version='v0.4.5', io='input', schema='model_draft', table=table, @@ -276,7 +276,7 @@ def add_sectoral_peak_load(load_areas, **kwargs): metadata.submit_comment(conn, json_str, schema, target_table) write_ego_scenario_log(conn=conn, - version='v0.4.4', + version='v0.4.5', io='output', schema='model_draft', table=target_table, diff --git a/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py b/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py index d078d55f..c75bc151 100644 --- a/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py +++ b/dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py @@ -65,7 +65,7 @@ def demand_per_mv_grid_district(): annual_demand_df = annual_demand_df.loc[~pd.isnull(annual_demand_df.index)] write_scenario_log(conn=conn, - version='v0.4.4', + version='v0.4.5', project='eGoDP', io='input', schema='model_draft', @@ -80,7 +80,7 @@ def demand_per_mv_grid_district(): index_col='polygon_id') write_scenario_log(conn=conn, - version='v0.4.4', + version='v0.4.5', project='eGoDP', io='input', schema='model_draft', @@ -188,7 +188,7 @@ def demand_per_mv_grid_district(): metadata.submit_comment(conn, json_str, schema, target_table) write_scenario_log(conn=conn, - version='v0.4.4', + version='v0.4.5', project='eGoDP', io='output', schema=schema, diff --git a/dataprocessing/python_scripts/setup_ego_mv_powerflow.py b/dataprocessing/python_scripts/setup_ego_mv_powerflow.py index 5c3bde91..04e225df 100644 --- a/dataprocessing/python_scripts/setup_ego_mv_powerflow.py +++ b/dataprocessing/python_scripts/setup_ego_mv_powerflow.py @@ -68,7 +68,7 @@ def create_powerflow_schema(engine, schema, tables): tools.grant_db_access(conn, schema, table, group) write_ego_scenario_log(conn=conn, - version='v0.4.4', + version='v0.4.5', io='output', schema=schema, table=table, diff --git a/dataprocessing/sql_snippets/ego_dp_data_check.sql b/dataprocessing/sql_snippets/ego_dp_data_check.sql index 0d67f1d4..2257e462 100644 --- a/dataprocessing/sql_snippets/ego_dp_data_check.sql +++ b/dataprocessing/sql_snippets/ego_dp_data_check.sql @@ -26,7 +26,7 @@ ALTER TABLE model_draft.ego_grid_pf_hv_data_check -- metadata COMMENT ON TABLE model_draft.ego_grid_pf_hv_data_check IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- select description @@ -43,7 +43,7 @@ SELECT obj_description('model_draft.ego_demand_la_zensus' ::regclass) ::json; INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'lines with undefined buses', 'model_draft.ego_grid_pf_hv_line', @@ -54,7 +54,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'lines with undefined buses', 'model_draft.ego_grid_pf_hv_line', @@ -66,7 +66,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'lines with undefined buses', 'model_draft.ego_grid_pf_hv_line', @@ -79,7 +79,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'lines with NULL values for buses', 'model_draft.ego_grid_pf_hv_line', @@ -90,7 +90,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'lines with NULL values for buses', 'model_draft.ego_grid_pf_hv_line', @@ -101,7 +101,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'lines with NULL values for buses', 'model_draft.ego_grid_pf_hv_line', @@ -117,7 +117,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'transformers with undefined buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -128,7 +128,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'transformers with undefined buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -140,7 +140,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'transformers with undefined buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -154,7 +154,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'transformers with NULL values for buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -165,7 +165,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'transformers with NULL values for buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -176,7 +176,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'transformers with NULL values for buses', 'model_draft.ego_grid_pf_hv_transformer', @@ -190,7 +190,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'EHV substation as 110 kV bus', 'model_draft.ego_grid_pf_hv_bus', @@ -201,7 +201,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'EHV substation as 110 kV bus', 'model_draft.ego_grid_pf_hv_bus', @@ -212,7 +212,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'EHV substation as 110 kV bus', 'model_draft.ego_grid_pf_hv_bus', @@ -229,7 +229,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'generators without defined buses', 'model_draft.ego_grid_pf_hv_generator', @@ -240,7 +240,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'generators without defined buses', 'model_draft.ego_grid_pf_hv_generator', @@ -252,7 +252,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'generators without defined buses', 'model_draft.ego_grid_pf_hv_generator', @@ -266,7 +266,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'pf_generator_single without defined buses', 'model_draft.ego_supply_pf_generator_single', @@ -277,7 +277,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'pf_generator_single without defined buses', 'model_draft.ego_supply_pf_generator_single', @@ -287,7 +287,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'pf_generator_single without defined buses', 'model_draft.ego_supply_pf_generator_single', @@ -299,7 +299,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'generators (source != 14, 15, 10) without time series', 'model_draft.ego_grid_pf_hv_generator', @@ -311,7 +311,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'generators (source != 14, 15, 10) without time series', 'model_draft.ego_grid_pf_hv_generator', @@ -322,7 +322,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'generators (source != 14, 15, 10) without time series', 'model_draft.ego_grid_pf_hv_generator', @@ -336,7 +336,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'time series without defined generators', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -349,7 +349,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'time series without defined generators', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -361,7 +361,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'time series without defined generators', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -374,7 +374,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'generator time series with more or less than 8760 entries', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -384,7 +384,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'generator time series with more or less than 8760 entries', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -394,7 +394,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'generator time series with more or less than 8760 entries', 'model_draft.ego_grid_pf_hv_generator_pq_set', @@ -406,7 +406,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'generator control incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -415,7 +415,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'generator control incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -424,7 +424,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'generator control incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -434,7 +434,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'all', 'generator control incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -446,7 +446,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'generator source incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -455,7 +455,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'generator source incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -464,7 +464,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'generator source incomplete', 'model_draft.ego_grid_pf_hv_generator', @@ -480,7 +480,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'loads without defined buses', 'model_draft.ego_grid_pf_hv_load', @@ -491,7 +491,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'loads without defined buses', 'model_draft.ego_grid_pf_hv_load', @@ -503,7 +503,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'loads without defined buses', 'model_draft.ego_grid_pf_hv_load', @@ -517,7 +517,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'loads without time series', 'model_draft.ego_grid_pf_hv_load', @@ -528,7 +528,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'loads without time series', 'model_draft.ego_grid_pf_hv_load', @@ -539,7 +539,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'loads without time series', 'model_draft.ego_grid_pf_hv_load', @@ -552,7 +552,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'time series without defined loads', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -565,7 +565,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'time series without defined loads', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -577,7 +577,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'time series without defined loads', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -590,7 +590,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'Status Quo', 'load time series with more than 8760 entries', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -600,7 +600,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'NEP 2035', 'load time series with more than 8760 entries', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -610,7 +610,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'eGo 100', 'load time series with more than 8760 entries', 'model_draft.ego_grid_pf_hv_load_pq_set', @@ -625,7 +625,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'all', 'generators without rea_geom_new', 'model_draft.ego_dp_supply_res_powerplant', @@ -641,7 +641,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, table_name, count) SELECT - 'v0.4.4', + 'v0.4.5', 'all', 'mv grid districts without generators', 'model_draft.ego_grid_mv_griddistrict', @@ -663,4 +663,4 @@ INSERT INTO model_draft.ego_grid_pf_hv_data_check (version, scn_name, test, tabl -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_data_check','ego_dp_data_check.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_data_check','ego_dp_data_check.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_census.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_census.sql index 9a363388..f4ce3c09 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_census.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_census.sql @@ -11,7 +11,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','destatis_zensus_population_per_ha_invg_mview','ego_dp_loadarea_census.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','destatis_zensus_population_per_ha_invg_mview','ego_dp_loadarea_census.sql',' '); -- zensus load DROP TABLE IF EXISTS model_draft.ego_demand_la_zensus CASCADE; @@ -43,7 +43,7 @@ CREATE INDEX ego_demand_la_zensus_geom_idx ON model_draft.ego_demand_la_zensus USING GIST (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_la_osm','ego_dp_loadarea_census.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_la_osm','ego_dp_loadarea_census.sql',' '); -- population in osm loads UPDATE model_draft.ego_demand_la_zensus AS t1 @@ -68,14 +68,14 @@ ALTER TABLE model_draft.ego_demand_la_zensus OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_la_zensus IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- select description SELECT obj_description('model_draft.ego_demand_la_zensus' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_la_zensus','ego_dp_loadarea_census.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_la_zensus','ego_dp_loadarea_census.sql',' '); -- cluster from zensus load lattice @@ -114,7 +114,7 @@ ALTER TABLE model_draft.ego_demand_la_zensus_cluster OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_la_zensus_cluster IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- insert cluster @@ -146,7 +146,7 @@ UPDATE model_draft.ego_demand_la_zensus_cluster AS t1 WHERE t1.cid = t2.cid; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_la_zensus_cluster','ego_dp_loadarea_census.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_la_zensus_cluster','ego_dp_loadarea_census.sql',' '); -- zensus stats @@ -178,8 +178,8 @@ ALTER MATERIALIZED VIEW model_draft.ego_society_zensus_per_la_mview OWNER TO oeu -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_society_zensus_per_la_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_society_zensus_per_la_mview','ego_dp_loadarea_census.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_society_zensus_per_la_mview','ego_dp_loadarea_census.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_consumption.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_consumption.sql index 8c065c5d..95f3394c 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_consumption.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_consumption.sql @@ -9,10 +9,10 @@ __author__ = "IlkaCu, Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_per_district','ego_dp_loadarea_consumption.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_per_district','ego_dp_loadarea_consumption.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_consumption.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_consumption.sql',' '); -- landuse area per district ALTER TABLE model_draft.ego_demand_per_district @@ -99,7 +99,7 @@ UPDATE model_draft.ego_demand_loadarea a -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','demand','ego_demand_federalstate','ego_dp_loadarea_consumption.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','demand','ego_demand_federalstate','ego_dp_loadarea_consumption.sql',' '); -- sector consumption of residential per loadarea UPDATE model_draft.ego_demand_loadarea a @@ -203,4 +203,4 @@ COMMENT ON TABLE model_draft.ego_demand_loadarea IS SELECT obj_description('model_draft.ego_demand_loadarea' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_consumption.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_consumption.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_griddistrict_results.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_griddistrict_results.sql index 1be246af..7616af9c 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_griddistrict_results.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_griddistrict_results.sql @@ -17,7 +17,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_griddistrict_results.sql',' '); -- Area of MV Griddistrict UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -31,7 +31,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input', 'boundaries','bkg_vg250_6_gem','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input', 'boundaries','bkg_vg250_6_gem','ego_dp_loadarea_griddistrict_results.sql',' '); -- Municipality (Gemeinden) UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -49,7 +49,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_griddistrict_results.sql',' '); -- Municipality parts (Gemeinde-Einzelteile) UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -67,7 +67,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict_type1','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict_type1','ego_dp_loadarea_griddistrict_results.sql',' '); -- Municipality types - Type1 UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -85,7 +85,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_hvmv_subst_per_gem_1_mview','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_boundaries_hvmv_subst_per_gem_1_mview','ego_dp_loadarea_griddistrict_results.sql',' '); UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET type1_cnt = t2.type_cnt @@ -101,7 +101,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict_type2','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict_type2','ego_dp_loadarea_griddistrict_results.sql',' '); -- Municipality types - Type2 UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -118,7 +118,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation_voronoi_cut','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_hvmv_substation_voronoi_cut','ego_dp_loadarea_griddistrict_results.sql',' '); UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET type2_cnt = t2.type_cnt @@ -134,7 +134,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict_type3','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict_type3','ego_dp_loadarea_griddistrict_results.sql',' '); -- Municipality types - Type3 UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -151,7 +151,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_hvmv_subst_per_gem_3_mview','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_boundaries_hvmv_subst_per_gem_3_mview','ego_dp_loadarea_griddistrict_results.sql',' '); UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET type3_cnt = t2.type_cnt @@ -178,7 +178,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_griddistrict_results.sql',' '); -- Population results UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -202,7 +202,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_griddistrict_results.sql',' '); -- Loadarea results - count UPDATE model_draft.ego_grid_mv_griddistrict AS t1 @@ -278,7 +278,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET consumption_per_area = consumption *1000000 / area_ha; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_griddistrict_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_griddistrict_results.sql',' '); /* -- test diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_industry_consumer.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_industry_consumer.sql index de6ccd61..0822afe3 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_industry_consumer.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_industry_consumer.sql @@ -12,10 +12,10 @@ __author__ = "IlkaCu, Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','demand','ego_demand_federalstate','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','demand','ego_demand_federalstate','ego_dp_loadarea_industry_consumer.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','economy','destatis_gva_per_district','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','economy','destatis_gva_per_district','ego_dp_loadarea_industry_consumer.sql',' '); -- Calculate specific electricity consumption per million Euro GVA for each federal state DROP TABLE IF EXISTS model_draft.ego_demand_per_gva CASCADE; @@ -75,7 +75,7 @@ COMMENT ON TABLE model_draft.ego_demand_per_gva IS }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_per_gva','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_per_gva','ego_dp_loadarea_industry_consumer.sql',' '); -- electricity consumption per district based on gross value added DROP TABLE IF EXISTS model_draft.ego_demand_per_district CASCADE; @@ -231,7 +231,7 @@ CREATE INDEX landuse_industry_geom_centre_idx -- Calculate NUTS -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_4_krs_mview','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','boundaries','bkg_vg250_4_krs_mview','ego_dp_loadarea_industry_consumer.sql',' '); UPDATE model_draft.ego_landuse_industry a SET nuts = b.nuts @@ -355,14 +355,14 @@ COMMENT ON TABLE model_draft.ego_landuse_industry IS }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_landuse_industry','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_landuse_industry','ego_dp_loadarea_industry_consumer.sql',' '); -- Identify large scale consumer -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_supply_conv_powerplant','ego_dp_loadarea_industry_consumer.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_supply_conv_powerplant','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_industry_consumer.sql',' '); DROP TABLE IF EXISTS model_draft.ego_demand_hv_largescaleconsumer CASCADE; CREATE TABLE model_draft.ego_demand_hv_largescaleconsumer AS @@ -475,10 +475,10 @@ CREATE INDEX large_scale_consumer_geom_centre_idx -- Identify corresponding bus for large scale consumer (lsc) with the help of ehv-voronoi -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','calc_ego_substation','ego_deu_voronoi_ehv','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','calc_ego_substation','ego_deu_voronoi_ehv','ego_dp_loadarea_industry_consumer.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_hvmv_substation','ego_dp_loadarea_industry_consumer.sql',' '); UPDATE model_draft.ego_demand_hv_largescaleconsumer a SET subst_id = b.subst_id @@ -558,7 +558,7 @@ COMMENT ON TABLE model_draft.ego_demand_hv_largescaleconsumer IS SELECT obj_description('model_draft.ego_demand_hv_largescaleconsumer' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_hv_largescaleconsumer','ego_dp_loadarea_industry_consumer.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_hv_largescaleconsumer','ego_dp_loadarea_industry_consumer.sql',' '); /* diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_landuse.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_landuse.sql index 5e3f7c40..08208e54 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_landuse.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_landuse.sql @@ -48,7 +48,7 @@ __author__ = "Ludee" -- ToDo: change "urban" to electrified -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon','ego_dp_loadarea_landuse.sql',' '); -- filter urban DROP TABLE IF EXISTS openstreetmap.osm_deu_polygon_urban CASCADE; @@ -113,7 +113,7 @@ ALTER TABLE openstreetmap.osm_deu_polygon_urban OWNER TO oeuser; -- OSM Urban Landuse Inside vg250 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_loadarea_landuse.sql',' '); -- Calculate 'inside' vg250 UPDATE openstreetmap.osm_deu_polygon_urban AS t1 @@ -298,7 +298,7 @@ INSERT INTO openstreetmap.osm_deu_polygon_urban ORDER BY clean.gid; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_landuse.sql',' '); -- -- "Validate (geom)" (OK!) -> 22.000ms =0 @@ -375,7 +375,7 @@ CREATE INDEX osm_deu_polygon_urban_sector_1_residential_mview_geom_idx ALTER TABLE openstreetmap.osm_deu_polygon_urban_sector_1_residential_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_landuse.sql',' '); -- Sector 2. Retail @@ -407,7 +407,7 @@ CREATE INDEX osm_deu_polygon_urban_sector_2_retail_mview_geom_idx ALTER TABLE openstreetmap.osm_deu_polygon_urban_sector_2_retail_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_landuse.sql',' '); -- Sector 3. Industrial @@ -443,7 +443,7 @@ CREATE INDEX osm_deu_polygon_urban_sector_3_industrial_mview_geom_idx ALTER TABLE openstreetmap.osm_deu_polygon_urban_sector_3_industrial_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_landuse.sql',' '); -- Sector 4. Agricultural @@ -474,7 +474,7 @@ CREATE INDEX osm_deu_polygon_urban_sector_4_agricultural_mview_geom_idx ALTER TABLE openstreetmap.osm_deu_polygon_urban_sector_4_agricultural_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_landuse.sql',' '); -- -- "Validate (geom)" (OK!) -> 22.000ms =0 diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_griddistrict.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_griddistrict.sql index 7063b75b..119a1a4f 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_griddistrict.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_griddistrict.sql @@ -66,13 +66,13 @@ ALTER TABLE model_draft.ego_demand_loadarea OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_loadarea IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- insert cutted load melt INSERT INTO model_draft.ego_demand_loadarea (geom) @@ -113,7 +113,7 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- metadata COMMENT ON TABLE model_draft.ego_demand_loadarea IS '{ "comment": "eGoDP - Versioning table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "demand.ego_dp_loadarea" }'; -- Identify Loadarea smaller than 100m² @@ -139,18 +139,18 @@ ALTER TABLE model_draft.ego_demand_loadarea_smaller100m2_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_loadarea_smaller100m2_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_smaller100m2_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_loadarea_smaller100m2_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- Exclude Loadarea smaller than 100m² DELETE FROM model_draft.ego_demand_loadarea AS loads WHERE loads.area_ha < 0.001; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- Generate Centre of Loadareas with Centroid and PointOnSurface @@ -205,7 +205,7 @@ WHERE NOT ST_CONTAINS(loads.geom,loads.geom_centre); */ -- Calculate population from Census 2011 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- zensus 2011 population UPDATE model_draft.ego_demand_loadarea AS t1 @@ -227,7 +227,7 @@ UPDATE model_draft.ego_demand_loadarea AS t1 /* -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','economy','ioer_urban_share_industrial_centroid','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','economy','ioer_urban_share_industrial_centroid','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- ioer industry share UPDATE model_draft.ego_demand_loadarea AS t1 @@ -257,7 +257,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_1_residentia CONSTRAINT urban_sector_per_grid_district_1_residential_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_1_residential (geom) @@ -298,11 +298,11 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_griddistrict_1_residential IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- 2. Retail sector @@ -313,7 +313,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_2_retail ( CONSTRAINT urban_sector_per_grid_district_2_retail_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_2_retail (geom) @@ -354,15 +354,15 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_griddistrict_2_retail IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- filter Industrial without largescale @@ -387,11 +387,11 @@ ALTER MATERIALIZED VIEW openstreetmap.osm_deu_polygon_urban_sector_3_industrial_ -- metadata COMMENT ON MATERIALIZED VIEW openstreetmap.osm_deu_polygon_urban_sector_3_industrial_nolargescale_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_nolargescale_mview','setup_osm_landuse.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_nolargescale_mview','setup_osm_landuse.sql',' '); /* -- check @@ -455,11 +455,11 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_griddistrict_3_industrial IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- 4. agricultural sector @@ -470,7 +470,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_4_agricultur CONSTRAINT urban_sector_per_grid_district_4_agricultural_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_4_agricultural (geom) @@ -511,11 +511,11 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_griddistrict_4_agricultural IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- sector stats @@ -543,7 +543,7 @@ UPDATE model_draft.ego_demand_loadarea AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- Calculate statistics like NUTS and AGS code @@ -600,7 +600,7 @@ UPDATE model_draft.ego_demand_loadarea AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_loadcut_griddistrict.sql',' '); -- Check for Loadareas without AGS code @@ -625,11 +625,11 @@ ALTER TABLE model_draft.ego_demand_loadarea_error_noags_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_loadarea_error_noags_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_error_noags_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_loadarea_error_noags_mview','ego_dp_loadarea_loadcut_griddistrict.sql',' '); /* @@ -664,7 +664,7 @@ CREATE INDEX ego_demand_loadarea_ta_geom_idx ALTER TABLE model_draft.ego_demand_loadarea_ta OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_ta','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_loadarea_ta','ego_dp_loadarea_loadcut_griddistrict.sql',' '); */ /* @@ -694,5 +694,5 @@ CREATE INDEX ego_demand_loadarea_spf_geom_centre_idx ALTER TABLE model_draft.ego_demand_loadarea_spf OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_spf','ego_dp_loadarea_loadcut_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_loadarea_spf','ego_dp_loadarea_loadcut_griddistrict.sql',' '); */ diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_voronoi.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_voronoi.sql index 480fba3c..1b30bf8e 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_voronoi.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_loadcut_voronoi.sql @@ -64,13 +64,13 @@ ALTER TABLE model_draft.ego_demand_loadarea_voi OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_loadarea_voi IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- insert cutted load melt INSERT INTO model_draft.ego_demand_loadarea_voi (geom) @@ -121,17 +121,17 @@ ALTER TABLE model_draft.ego_demand_loadarea_voi_smaller100m2_mview OWNER TO oeus -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_loadarea_voi_smaller100m2_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_voi_smaller100m2_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_loadarea_voi_smaller100m2_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- Exclude Loadarea smaller than 100m² DELETE FROM model_draft.ego_demand_loadarea_voi AS loads WHERE loads.area_ha < 0.001; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea_voi','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_loadarea_voi','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- Generate Centre of Loadareas with Centroid and PointOnSurface @@ -199,7 +199,7 @@ WHERE NOT ST_CONTAINS(loads.geom,loads.geom_centre); */ /* -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','society','destatis_zensus_population_per_ha_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- zensus 2011 population UPDATE model_draft.ego_demand_loadarea_voi AS t1 @@ -220,7 +220,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','economy','ioer_urban_share_industrial_centroid','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','economy','ioer_urban_share_industrial_centroid','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- ioer industry share UPDATE model_draft.ego_demand_loadarea_voi AS t1 @@ -248,7 +248,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_1_residential CONSTRAINT urban_sector_per_grid_district_1_residential_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon_urban_sector_1_residential_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_1_residential (geom) @@ -286,7 +286,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- 2. retail sector @@ -297,7 +297,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_2_retail ( CONSTRAINT urban_sector_per_grid_district_2_retail_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon_urban_sector_2_retail_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_2_retail (geom) @@ -335,7 +335,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- 3. industrial sector @@ -346,7 +346,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_3_industrial CONSTRAINT urban_sector_per_grid_district_3_industrial_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon_urban_sector_3_industrial_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_3_industrial (geom) @@ -384,7 +384,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- 4. agricultural sector @@ -395,7 +395,7 @@ CREATE TABLE model_draft.ego_osm_sector_per_griddistrict_4_agricultural CONSTRAINT urban_sector_per_grid_district_4_agricultural_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon_urban_sector_4_agricultural_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_griddistrict_4_agricultural (geom) @@ -433,7 +433,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- sector stats @@ -463,7 +463,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 -- Calculate statistics like NUTS and AGS code -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- nuts code (nuts) UPDATE model_draft.ego_demand_loadarea_voi AS t1 @@ -518,7 +518,7 @@ UPDATE model_draft.ego_demand_loadarea_voi AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea_voi','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_loadarea_voi','ego_dp_loadarea_loadcut_voronoi.sql',' '); -- loads without ags_0 @@ -543,10 +543,10 @@ ALTER TABLE model_draft.ego_demand_loadarea_voi_error_noags_mview OWNER TO oeuse -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_loadarea_voi_error_noags_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_voi_error_noags_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_loadarea_voi_error_noags_mview','ego_dp_loadarea_loadcut_voronoi.sql',' '); /* @@ -581,7 +581,7 @@ CREATE INDEX ego_demand_loadarea_voi_ta_geom_idx ALTER TABLE model_draft.ego_demand_loadarea_voi_ta OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_voi_ta','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_loadarea_voi_ta','ego_dp_loadarea_loadcut_voronoi.sql',' '); */ /* @@ -611,5 +611,5 @@ CREATE INDEX ego_demand_loadarea_voi_spf_geom_centre_idx ALTER TABLE model_draft.ego_demand_loadarea_voi_spf OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_loadarea_voi_spf','ego_dp_loadarea_loadcut_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_loadarea_voi_spf','ego_dp_loadarea_loadcut_voronoi.sql',' '); */ diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_loadmelt.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_loadmelt.sql index 1899b102..fd33d1e8 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_loadmelt.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_loadmelt.sql @@ -21,10 +21,10 @@ CREATE TABLE model_draft.ego_demand_load_collect ( CONSTRAINT ego_demand_load_collect_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_la_osm','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_la_osm','ego_dp_loadarea_loadmelt.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_la_zensus_cluster','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_la_zensus_cluster','ego_dp_loadarea_loadmelt.sql',' '); -- insert loads OSM INSERT INTO model_draft.ego_demand_load_collect (geom) @@ -48,11 +48,11 @@ ALTER TABLE model_draft.ego_demand_load_collect OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_load_collect IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_collect','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_load_collect','ego_dp_loadarea_loadmelt.sql',' '); -- buffer with 100m @@ -80,11 +80,11 @@ ALTER TABLE model_draft.ego_demand_load_collect_buffer100 OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_load_collect_buffer100 IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_collect_buffer100','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_load_collect_buffer100','ego_dp_loadarea_loadmelt.sql',' '); -- unbuffer with 99m @@ -113,11 +113,11 @@ ALTER TABLE model_draft.ego_demand_load_melt OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_load_melt IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadmelt.sql',' '); -- Validate the melted geometries @@ -150,11 +150,11 @@ ALTER MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_geom_mview OWNER -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_geom_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_melt_error_geom_mview','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_load_melt_error_geom_mview','ego_dp_loadarea_loadmelt.sql',' '); -- Fix geometries with error @@ -188,11 +188,11 @@ ALTER MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_geom_fix_mview OW -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_geom_fix_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_melt_error_geom_fix_mview','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_load_melt_error_geom_fix_mview','ego_dp_loadarea_loadmelt.sql',' '); -- update fixed geoms @@ -206,7 +206,7 @@ UPDATE model_draft.ego_demand_load_melt AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_load_melt','ego_dp_loadarea_loadmelt.sql',' '); -- Check again for errors. @@ -239,11 +239,11 @@ ALTER MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_2_geom_mview OWNE -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_demand_load_melt_error_2_geom_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_demand_load_melt_error_2_geom_mview','ego_dp_loadarea_loadmelt.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_demand_load_melt_error_2_geom_mview','ego_dp_loadarea_loadmelt.sql',' '); /* -- drop temp diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_loads.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_loads.sql index f598bebb..da34961f 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_loads.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_loads.sql @@ -12,17 +12,17 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_hv_largescaleconsumer','ego_dp_loadarea_loads.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_hv_largescaleconsumer','ego_dp_loadarea_loads.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loads.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loads.sql',' '); -- exclude large scale consumer DELETE FROM openstreetmap.osm_deu_polygon_urban WHERE gid IN (SELECT polygon_id FROM model_draft.ego_demand_hv_largescaleconsumer); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loads.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','openstreetmap','osm_deu_polygon_urban','ego_dp_loadarea_loads.sql',' '); -- sequence DROP SEQUENCE IF EXISTS model_draft.osm_deu_polygon_urban_buffer100_mview_id CASCADE; @@ -55,11 +55,11 @@ ALTER MATERIALIZED VIEW model_draft.osm_deu_polygon_urban_buffer100_mview OWNER -- metadata COMMENT ON MATERIALIZED VIEW model_draft.osm_deu_polygon_urban_buffer100_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','osm_deu_polygon_urban_buffer100_mview','ego_dp_loadarea_loads.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','osm_deu_polygon_urban_buffer100_mview','ego_dp_loadarea_loads.sql',' '); -- unbuffer with 100m @@ -91,14 +91,14 @@ ALTER TABLE model_draft.ego_demand_la_osm OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_demand_la_osm IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4", + "version": "v0.4.5", "published": "none" }'; -- select description SELECT obj_description('model_draft.ego_demand_la_osm' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','ouput','model_draft','ego_demand_la_osm','ego_dp_loadarea_loads.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','ouput','model_draft','ego_demand_la_osm','ego_dp_loadarea_loads.sql',' '); -- DROP MATERIALIZED VIEW IF EXISTS model_draft.osm_deu_polygon_urban_buffer100_mview CASCADE; diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_peakload.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_peakload.sql index a2f0e91e..5cf709e1 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_peakload.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_peakload.sql @@ -9,8 +9,8 @@ __author__ = "gplssm, Ludee" */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_peakload.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','scenario','ego_slp_parameters','ego_dp_loadarea_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','scenario','ego_slp_parameters','ego_dp_loadarea_peakload.sql',' '); -- residential UPDATE model_draft.ego_demand_loadarea as t1 @@ -61,4 +61,4 @@ UPDATE model_draft.ego_demand_loadarea as t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_demand_loadarea','ego_dp_loadarea_peakload.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_loadarea_statistic.sql b/dataprocessing/sql_snippets/ego_dp_loadarea_statistic.sql index 4ce56c25..5d5f1060 100644 --- a/dataprocessing/sql_snippets/ego_dp_loadarea_statistic.sql +++ b/dataprocessing/sql_snippets/ego_dp_loadarea_statistic.sql @@ -12,13 +12,13 @@ __author__ = "Ludee" */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_hvmv_substation','ego_dp_loadarea_statistic.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_statistic.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_loadarea','ego_dp_loadarea_statistic.sql',' '); /* -- Results and statistics for substation, Loadarea, MV Griddistricts and Consumption @@ -37,7 +37,7 @@ CREATE TABLE model_draft.ego_data_processing_results ( INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_name,description,result,unit,timestamp) -- Count SUB - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_grid_hvmv_substation', 'Number of substations', @@ -48,7 +48,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Count MVGD - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_grid_mv_griddistrict', 'Number of grid districts', @@ -59,7 +59,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Area vg250.gem - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'boundaries', 'bkg_vg250_6_gem', 'Gemeinde area', @@ -70,7 +70,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Area vg250.gem_clean - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_boundaries_bkg_vg250_6_gem_clean', 'Processed gemeinde area', @@ -81,7 +81,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Area GD - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_grid_mv_griddistrict', 'Grid District area', @@ -92,7 +92,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Min area GD calc - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_grid_mv_griddistrict', 'Minmal GD area calculated', @@ -103,7 +103,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Min area GD area - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_grid_mv_griddistrict', 'Minmal GD area from table', @@ -114,7 +114,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Max area GD - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_grid_mv_griddistrict', 'Maximal GD area', @@ -125,7 +125,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Count LA - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_demand_loadarea', 'Number of Load Areas', @@ -136,7 +136,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Area LA - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_demand_loadarea', 'Load Areas area', @@ -147,7 +147,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Min area LA - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_demand_loadarea', 'Minmal LA area', @@ -158,7 +158,7 @@ INSERT INTO model_draft.ego_data_processing_results (version,schema_name,table_n UNION ALL -- Max area LA - SELECT 'v0.4.4', + SELECT 'v0.4.5', 'model_draft', 'ego_demand_loadarea', 'Maximal LA area', @@ -173,10 +173,10 @@ ALTER TABLE model_draft.ego_data_processing_results OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_data_processing_results IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_data_processing_results','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_data_processing_results','ego_dp_loadarea_statistic.sql',' '); @@ -419,7 +419,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET consumption_per_area = consumption *1000000 / area_ha; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_mv_griddistrict','ego_dp_loadarea_statistic.sql',' '); /* -- test @@ -476,10 +476,10 @@ ALTER TABLE boundaries.bkg_vg250_statistics_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW boundaries.bkg_vg250_statistics_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','boundaries','bkg_vg250_statistics_mview','ego_dp_loadarea_statistic.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','boundaries','bkg_vg250_statistics_mview','ego_dp_loadarea_statistic.sql',' '); -- drid district diff --git a/dataprocessing/sql_snippets/ego_dp_lv_consumption_peakload.sql b/dataprocessing/sql_snippets/ego_dp_lv_consumption_peakload.sql index cd9d7d5e..c7130cc3 100644 --- a/dataprocessing/sql_snippets/ego_dp_lv_consumption_peakload.sql +++ b/dataprocessing/sql_snippets/ego_dp_lv_consumption_peakload.sql @@ -14,8 +14,8 @@ __author__ = "gplssm" -- Consumption -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_lv_consumption_peakload.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_consumption_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_loadarea','ego_dp_lv_consumption_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_consumption_peakload.sql',' '); -- Residential UPDATE model_draft.ego_grid_lv_griddistrict AS t1 @@ -109,7 +109,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict -- Peakload -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','scenario','ego_slp_parameters','ego_dp_lv_consumption_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','scenario','ego_slp_parameters','ego_dp_lv_consumption_peakload.sql',' '); -- Residential UPDATE model_draft.ego_grid_lv_griddistrict as t1 @@ -163,4 +163,4 @@ UPDATE model_draft.ego_grid_lv_griddistrict as t1 WHERE t1.mvlv_subst_id = t2.mvlv_subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_consumption_peakload.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_consumption_peakload.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_lv_griddistrict.sql b/dataprocessing/sql_snippets/ego_dp_lv_griddistrict.sql index 47df228f..88d6320c 100644 --- a/dataprocessing/sql_snippets/ego_dp_lv_griddistrict.sql +++ b/dataprocessing/sql_snippets/ego_dp_lv_griddistrict.sql @@ -61,7 +61,7 @@ ALTER TABLE model_draft.ego_grid_lv_griddistrict OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- insert INSERT INTO model_draft.ego_grid_lv_griddistrict (id,mvlv_subst_id,subst_id,la_id,nn,geom) @@ -71,7 +71,7 @@ INSERT INTO model_draft.ego_grid_lv_griddistrict (id,mvlv_subst_id,subst_id,la_i -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mvlv_substation','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mvlv_substation','ego_dp_lv_griddistrict.sql',' '); -- mvlv substation count UPDATE model_draft.ego_grid_lv_griddistrict AS t1 @@ -99,7 +99,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','society','destatis_zensus_population_per_ha_mview','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','society','destatis_zensus_population_per_ha_mview','ego_dp_lv_griddistrict.sql',' '); -- zensus 2011 population UPDATE model_draft.ego_grid_lv_griddistrict AS t1 @@ -137,10 +137,10 @@ ALTER TABLE model_draft.ego_osm_sector_per_lvgd_1_residential OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_lvgd_1_residential IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_osm_sector_per_griddistrict_1_residential','ego_dp_lv_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_lvgd_1_residential (geom) @@ -172,7 +172,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_lvgd_1_residential','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_lvgd_1_residential','ego_dp_lv_griddistrict.sql',' '); @@ -193,10 +193,10 @@ ALTER TABLE model_draft.ego_osm_sector_per_lvgd_2_retail OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_lvgd_2_retail IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_osm_sector_per_griddistrict_2_retail','ego_dp_lv_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_lvgd_2_retail (geom) @@ -226,7 +226,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_lvgd_2_retail','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_lvgd_2_retail','ego_dp_lv_griddistrict.sql',' '); -- 3. Industrial sector @@ -246,10 +246,10 @@ ALTER TABLE model_draft.ego_osm_sector_per_lvgd_3_industrial OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_lvgd_3_industrial IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_osm_sector_per_griddistrict_3_industrial','ego_dp_lv_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_lvgd_3_industrial (geom) @@ -279,7 +279,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_lvgd_3_industrial','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_lvgd_3_industrial','ego_dp_lv_griddistrict.sql',' '); @@ -300,10 +300,10 @@ ALTER TABLE model_draft.ego_osm_sector_per_lvgd_4_agricultural OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_osm_sector_per_lvgd_4_agricultural IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_lv_griddistrict.sql',' '); -- intersect sector with mv-griddistrict INSERT INTO model_draft.ego_osm_sector_per_lvgd_4_agricultural (geom) @@ -333,7 +333,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_lvgd_4_agricultural','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_lvgd_4_agricultural','ego_dp_lv_griddistrict.sql',' '); -- sector stats @@ -360,7 +360,7 @@ SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_pe WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_lv_griddistrict','ego_dp_lv_griddistrict.sql',' '); /* diff --git a/dataprocessing/sql_snippets/ego_dp_lv_loadcut.sql b/dataprocessing/sql_snippets/ego_dp_lv_loadcut.sql index 56006ff9..6e863913 100644 --- a/dataprocessing/sql_snippets/ego_dp_lv_loadcut.sql +++ b/dataprocessing/sql_snippets/ego_dp_lv_loadcut.sql @@ -15,8 +15,8 @@ __author__ = "jong42, Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_lv_loadcut.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mvlv_substation_voronoi','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_loadarea','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mvlv_substation_voronoi','ego_dp_lv_loadcut.sql',' '); -- Cut Loadarea with MVLV Substation Voronoi DROP TABLE IF EXISTS model_draft.ego_grid_lv_griddistrict_cut CASCADE; @@ -64,7 +64,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict_cut AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_lv_griddistrict_cut','ego_dp_lv_loadcut.sql',' '); /* -- Validate (geom) @@ -117,10 +117,10 @@ CREATE INDEX ego_grid_lv_griddistrict_cut_1subst_geom_idx -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict_cut_1subst IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut_1subst','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_lv_griddistrict_cut_1subst','ego_dp_lv_loadcut.sql',' '); -- Select parts with no LV Substation @@ -149,10 +149,10 @@ CREATE INDEX ego_grid_lv_griddistrict_cut_0subst_geom_idx -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict_cut_0subst IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut_0subst','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_lv_griddistrict_cut_0subst','ego_dp_lv_loadcut.sql',' '); -- Select parts with more than one substation @@ -181,10 +181,10 @@ CREATE INDEX ego_grid_lv_griddistrict_cut_xsubst_geom_idx -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict_cut_xsubst IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut_xsubst','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_lv_griddistrict_cut_xsubst','ego_dp_lv_loadcut.sql',' '); -- Combine parts with Next Neighbor @@ -232,10 +232,10 @@ ALTER TABLE model_draft.ego_grid_lv_griddistrict_cut_nn OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict_cut_nn IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut_nn','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_lv_griddistrict_cut_nn','ego_dp_lv_loadcut.sql',' '); -- Collect and union all parts @@ -303,7 +303,7 @@ UPDATE model_draft.ego_grid_lv_griddistrict_cut_nn_collect AS t1 -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_griddistrict_cut_nn_collect IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_griddistrict_cut_nn_collect','ego_dp_lv_loadcut.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_lv_griddistrict_cut_nn_collect','ego_dp_lv_loadcut.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_lv_substation.sql b/dataprocessing/sql_snippets/ego_dp_lv_substation.sql index 1767dd1d..ad383600 100644 --- a/dataprocessing/sql_snippets/ego_dp_lv_substation.sql +++ b/dataprocessing/sql_snippets/ego_dp_lv_substation.sql @@ -19,7 +19,7 @@ CREATE TABLE model_draft.ego_lattice_360m_lv ( CONSTRAINT ego_lattice_360m_lv_pkey PRIMARY KEY (id) ); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_loadarea','ego_dp_lv_substation.sql',' '); -- lattice on the bbox of loadareas INSERT INTO model_draft.ego_lattice_360m_lv (geom, la_id) @@ -57,10 +57,10 @@ ALTER TABLE model_draft.ego_lattice_360m_lv OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_lattice_360m_lv IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_lattice_360m_lv','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_lattice_360m_lv','ego_dp_lv_substation.sql',' '); -- Create MVLV Substation from lattice centroid @@ -113,10 +113,10 @@ ALTER TABLE model_draft.ego_grid_mvlv_substation OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mvlv_substation IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation.sql',' '); -- Lege Buffer um ONT-Standorte und ermittle die Teile der Lastgebiete, die sich nicht innerhalb dieser Buffer befinden @@ -163,10 +163,10 @@ UPDATE model_draft.ego_grid_lv_loadarea_rest -- metadata COMMENT ON TABLE model_draft.ego_grid_lv_loadarea_rest IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_lv_loadarea_rest','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_lv_loadarea_rest','ego_dp_lv_substation.sql',' '); -- Bestimme die Mittelpunkte der Gebiete, die noch nicht durch ONT abgedeckt sind, und lege diese Mittelpunkte als ONT-Standorte fest @@ -177,7 +177,7 @@ INSERT INTO model_draft.ego_grid_mvlv_substation (la_id, geom) FROM model_draft.ego_grid_lv_loadarea_rest; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict','ego_dp_lv_substation.sql',' '); -- subst_id from MV-griddistrict UPDATE model_draft.ego_grid_mvlv_substation AS t1 @@ -195,10 +195,10 @@ UPDATE model_draft.ego_grid_mvlv_substation AS t1 -- metadata COMMENT ON TABLE model_draft.ego_grid_mvlv_substation IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation.sql',' '); -- drop diff --git a/dataprocessing/sql_snippets/ego_dp_lv_substation_voronoi.sql b/dataprocessing/sql_snippets/ego_dp_lv_substation_voronoi.sql index 3354da80..c695d652 100644 --- a/dataprocessing/sql_snippets/ego_dp_lv_substation_voronoi.sql +++ b/dataprocessing/sql_snippets/ego_dp_lv_substation_voronoi.sql @@ -10,8 +10,8 @@ __author__ = "Ludee, jong42" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation_voronoi.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation_dummy','ego_dp_lv_substation_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mvlv_substation','ego_dp_lv_substation_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_hvmv_substation_dummy','ego_dp_lv_substation_voronoi.sql',' '); -- add Dummy points to substations (18 Points) ALTER TABLE model_draft.ego_grid_mvlv_substation @@ -45,7 +45,7 @@ ALTER TABLE model_draft.ego_grid_mvlv_substation_voronoi OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mvlv_substation_voronoi IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- loop over MV Griddistrict DO @@ -123,4 +123,4 @@ $$; DELETE FROM model_draft.ego_grid_mvlv_substation WHERE is_dummy = TRUE; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mvlv_substation_voronoi','ego_dp_lv_substation_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_mvlv_substation_voronoi','ego_dp_lv_substation_voronoi.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_mv_griddistrict.sql b/dataprocessing/sql_snippets/ego_dp_mv_griddistrict.sql index 2d6c8db5..4ca352c0 100644 --- a/dataprocessing/sql_snippets/ego_dp_mv_griddistrict.sql +++ b/dataprocessing/sql_snippets/ego_dp_mv_griddistrict.sql @@ -15,7 +15,7 @@ __author__ = "Ludee" ---------- ---------- ---------- -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_mv_griddistrict.sql',' '); -- municipalities DROP TABLE IF EXISTS model_draft.ego_boundaries_hvmv_subst_per_gem CASCADE; @@ -36,7 +36,7 @@ CREATE INDEX ego_boundaries_hvmv_subst_per_gem_geom_idx ALTER TABLE model_draft.ego_boundaries_hvmv_subst_per_gem OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_hvmv_substation','ego_dp_mv_griddistrict.sql',' '); -- HVMV subst count UPDATE model_draft.ego_boundaries_hvmv_subst_per_gem AS t1 @@ -54,10 +54,10 @@ UPDATE model_draft.ego_boundaries_hvmv_subst_per_gem AS t1 -- metadata COMMENT ON TABLE model_draft.ego_boundaries_hvmv_subst_per_gem IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_boundaries_hvmv_subst_per_gem','ego_dp_mv_griddistrict.sql',' '); -- SELECT sum(mun.subst_sum) AS sum -- FROM model_draft.ego_boundaries_hvmv_subst_per_gem AS mun; @@ -97,10 +97,10 @@ ALTER TABLE model_draft.ego_boundaries_hvmv_subst_per_gem_1_mview OWNER TO oeuse -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_boundaries_hvmv_subst_per_gem_1_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_1_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_1_mview','ego_dp_mv_griddistrict.sql',' '); -- MView II. @@ -133,10 +133,10 @@ UPDATE model_draft.ego_boundaries_hvmv_subst_per_gem AS t1 -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_boundaries_hvmv_subst_per_gem_2_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_2_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_2_mview','ego_dp_mv_griddistrict.sql',' '); -- Substation Type 2 @@ -161,10 +161,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_mun_2_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_mun_2_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_mun_2_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_hvmv_substation_mun_2_mview','ego_dp_mv_griddistrict.sql',' '); -- MView III. @@ -197,10 +197,10 @@ UPDATE model_draft.ego_boundaries_hvmv_subst_per_gem AS t1 -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_boundaries_hvmv_subst_per_gem_3_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -255,10 +255,10 @@ UPDATE model_draft.ego_grid_mv_griddistrict_type1 AS t1 -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_type1 IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_type1','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_mv_griddistrict_type1','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- ---------- ---------- ---------- @@ -266,7 +266,7 @@ SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddis ---------- ---------- ---------- ---------- ---------- ---------- -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_mv_griddistrict.sql',' '); -- Substation ID UPDATE model_draft.ego_grid_hvmv_substation_voronoi AS t1 @@ -319,10 +319,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_hvmv_substation_voronoi_mview','ego_dp_mv_griddistrict.sql',' '); -- -- Validate (geom) @@ -407,10 +407,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- -- -- Validate (geom) (OK!) -> 22.000ms =0 @@ -458,10 +458,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_1subst_mview OWNER -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_1subst_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_1subst_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_1subst_mview','ego_dp_mv_griddistrict.sql',' '); -- Parts without substation @@ -491,10 +491,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_mview OWNER -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -553,10 +553,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_mview OWN -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -599,10 +599,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_line_mvie -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_line_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_line_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_line_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -628,10 +628,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_union_mvi -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_0subst_nn_union_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_union_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_0subst_nn_union_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -665,10 +665,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_nn_collect OWNER TO -- metadata COMMENT ON TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_nn_collect IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_nn_collect','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_nn_collect','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -694,10 +694,10 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_voronoi_cut_nn_mview OWNER TO o -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_grid_hvmv_substation_voronoi_cut_nn_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_nn_mview','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_hvmv_substation_voronoi_cut_nn_mview','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -742,10 +742,10 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_type2 OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_type2 IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_type2','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_mv_griddistrict_type2','ego_dp_mv_griddistrict.sql',' '); -- -- Validate (geom) (OK!) -> 22.000ms =0 @@ -813,10 +813,10 @@ ALTER TABLE model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -860,10 +860,10 @@ ALTER TABLE model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn_line OWNER TO oeu -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn_line IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn_line','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn_line','ego_dp_mv_griddistrict.sql',' '); -- UNION @@ -894,10 +894,10 @@ ALTER TABLE model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn_union OWNER TO oe -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_boundaries_hvmv_subst_per_gem_3_nn_union IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn_union','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_boundaries_hvmv_subst_per_gem_3_nn_union','ego_dp_mv_griddistrict.sql',' '); -- Substations Template @@ -940,10 +940,10 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_type3 OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_type3 IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_type3','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_mv_griddistrict_type3','ego_dp_mv_griddistrict.sql',' '); ---------- ---------- ---------- @@ -998,10 +998,10 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_collect OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_collect IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_collect','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_mv_griddistrict_collect','ego_dp_mv_griddistrict.sql',' '); -- NEW PART @@ -1032,7 +1032,7 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_union OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_union IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- Clean Polygons and Snap to Grid UPDATE model_draft.ego_grid_mv_griddistrict_union AS t1 @@ -1096,7 +1096,7 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_dump OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_dump IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- dump centre fragments (a) @@ -1178,10 +1178,10 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_dump_nn OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_dump_nn IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_dump_nn','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_mv_griddistrict_dump_nn','ego_dp_mv_griddistrict.sql',' '); -- connect nn points @@ -1219,7 +1219,7 @@ ALTER TABLE model_draft.ego_grid_mv_griddistrict_dump_nn_line OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_dump_nn_line IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- collect @@ -1289,10 +1289,10 @@ CREATE INDEX ego_grid_mv_griddistrict_dump_nn_collect_union_geom_idx -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict_dump_nn_collect_union IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_grid_mv_griddistrict_dump_nn_collect_union','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_grid_mv_griddistrict_dump_nn_collect_union','ego_dp_mv_griddistrict.sql',' '); -- Clean Polygons and Snap to Grid UPDATE model_draft.ego_grid_mv_griddistrict_dump_nn_collect_union AS t1 @@ -1404,7 +1404,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 -- metadata COMMENT ON TABLE model_draft.ego_grid_mv_griddistrict IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_mv_griddistrict','ego_dp_mv_griddistrict.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_mv_griddistrict','ego_dp_mv_griddistrict.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql index 8fb08780..41b35973 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql @@ -184,7 +184,7 @@ COMMENT ON TABLE model_draft.ego_supply_pf_generator_single IS SELECT obj_description('model_draft.ego_supply_pf_generator_single' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_pf_generator_single','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_pf_generator_single','ego_dp_powerflow_assignment_generator.sql',' '); @@ -192,7 +192,7 @@ SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_pf_gen -- Insert generator data into powerflow schema, that contains all generators seperately -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_pf_hv_source','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','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 @@ -235,7 +235,7 @@ UPDATE model_draft.ego_supply_pf_generator_single a -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','climate','cosmoclmgrid','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','climate','cosmoclmgrid','ego_dp_powerflow_assignment_generator.sql',' '); -- Identify climate point IDs for each renewables generator @@ -411,7 +411,7 @@ UPDATE model_draft.ego_grid_pf_hv_generator -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_assignment_generator.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_aggr_weather CASCADE; @@ -437,4 +437,4 @@ AS ALTER TABLE model_draft.ego_supply_aggr_weather OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_aggr_weather','ego_dp_powerflow_assignment_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_aggr_weather','ego_dp_powerflow_assignment_generator.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_load.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_load.sql index 20c7316f..77055ef2 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_load.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_load.sql @@ -194,7 +194,7 @@ WHERE a.bus IS NOT NULL GROUP BY a.bus; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_assignment_load.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_assignment_load.sql',' '); @@ -221,4 +221,4 @@ FROM model_draft.ego_grid_pf_hv_load a WHERE scn_name= 'Status Quo'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_assignment_load_nep2035.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_assignment_load_nep2035.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql index 071e6d9a..24fc5a27 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql @@ -103,6 +103,6 @@ UPDATE model_draft.ego_dp_supply_res_powerplant a -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_powerflow_assignment_otgid.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_powerflow_assignment_otgid.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_powerflow_assignment_otgid.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_powerflow_assignment_otgid.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_storage.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_storage.sql index dba41f25..cba8f963 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_storage.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_storage.sql @@ -880,4 +880,4 @@ INSERT into model_draft.ego_grid_pf_hv_storage ( DROP TABLE IF EXISTS model_draft.ego_grid_pf_hv_storage_pumped_temp; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_assignment_storage.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_assignment_storage.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql index 40cb68da..3b9eed73 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_unid.sql @@ -45,7 +45,7 @@ CREATE INDEX ego_supply_generator_idx -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_generator','ego_dp_powerflow_assignment_unid.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_generator','ego_dp_powerflow_assignment_unid.sql',' '); -- Update power plant tables and add information on unified id of generators @@ -69,8 +69,8 @@ UPDATE model_draft.ego_dp_supply_res_powerplant a -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_powerflow_assignment_unid.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_powerflow_assignment_unid.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_powerflow_assignment_unid.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_powerflow_assignment_unid.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_create_pp_mview.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_create_pp_mview.sql index ee77e2cb..b399a624 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_create_pp_mview.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_create_pp_mview.sql @@ -99,9 +99,9 @@ ALTER MATERIALIZED VIEW model_draft.ego_supply_conv_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_conv_powerplant_sq_mview','ego_dp_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_conv_powerplant_nep2035_mview','ego_dp_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_conv_powerplant_ego100_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_conv_powerplant_sq_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_conv_powerplant_nep2035_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_conv_powerplant_ego100_mview','ego_dp_powerflow_create_pp_mview.sql',' '); -------------------------------------------------------------------------------- @@ -241,6 +241,6 @@ ALTER MATERIALIZED VIEW model_draft.ego_supply_res_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_res_powerplant_sq_mview','ego_dp_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_res_powerplant_nep2035_mview','ego_dp_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_res_powerplant_ego100_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_res_powerplant_sq_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_res_powerplant_nep2035_mview','ego_dp_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_res_powerplant_ego100_mview','ego_dp_powerflow_create_pp_mview.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql index b1bd19a5..197134fb 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_fix_ehv_subnetworks.sql @@ -298,6 +298,6 @@ VALUES ('Status Quo', DELETE FROM model_draft.ego_grid_pf_hv_transformer WHERE bus1 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus) OR bus0 NOT IN (SELECT bus_id FROM model_draft.ego_grid_pf_hv_bus); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_fix_ehv_subnetworks.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_grid_future_scenarios.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_grid_future_scenarios.sql index af36c1e4..94e44038 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_grid_future_scenarios.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_grid_future_scenarios.sql @@ -102,6 +102,6 @@ FROM model_draft.ego_grid_pf_hv_transformer a WHERE scn_name= 'Status Quo'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_grid_future_scenarios.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_grid_future_scenarios.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_grid_future_scenarios.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_grid_future_scenarios.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_grid_future_scenarios.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_grid_future_scenarios.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql index 1fae53e2..9256cbd3 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_hv_setup.sql @@ -180,7 +180,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_scenario_settings IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_scenario_settings' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_scenario_settings','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_scenario_settings','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV source @@ -274,7 +274,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_source IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_source' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_source','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_source','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV bus @@ -483,7 +483,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_busmap IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_bus' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV generator @@ -679,7 +679,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_generator IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_generator' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV line @@ -878,7 +878,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_line IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_line' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV link @@ -1038,7 +1038,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_link IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_link' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_link','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_link','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV load @@ -1201,7 +1201,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_load IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_load' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_load','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV storage @@ -1426,7 +1426,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_storage IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_storage' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV temp resolution @@ -1524,7 +1524,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_temp_resolution IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_temp_resolution' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_temp_resolution','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_temp_resolution','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV transformer @@ -1710,7 +1710,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_transformer IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_transformer' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_hv_setup.sql',' '); -------------------------------------------------------------------- @@ -1804,7 +1804,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_bus_v_mag_set IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_bus_v_mag_set' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_bus_v_mag_set','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_bus_v_mag_set','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV generator PQ set @@ -1925,7 +1925,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_generator_pq_set IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_generator_pq_set' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV load PQ set @@ -2027,7 +2027,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_load_pq_set IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_load_pq_set' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_hv_setup.sql',' '); -- PF HV storage PQ set @@ -2160,7 +2160,7 @@ COMMENT ON TABLE model_draft.ego_grid_pf_hv_storage_pq_set IS '{ SELECT obj_description('model_draft.ego_grid_pf_hv_storage_pq_set' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_storage_pq_set','ego_dp_powerflow_hv_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_storage_pq_set','ego_dp_powerflow_hv_setup.sql',' '); ------------------------------------------------------------------- --------------------------- Grant rights -------------------------- diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql index 2b5025dd..2636df13 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_lopf_data.sql @@ -71,7 +71,7 @@ where scn_name = 'eGo 100'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_lopf_data.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_generator','ego_dp_powerflow_lopf_data.sql',' '); -- set p_max_pu @@ -418,7 +418,7 @@ WHERE model_draft.ego_grid_hvmv_substation.subst_id IN ( AND ST_CONTAINS(salt.geom,model_draft.ego_grid_hvmv_substation.point)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_lopf_data.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_storage','ego_dp_powerflow_lopf_data.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_lopf_data.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_lopf_data.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_osmtgmod_to_pypsa.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_osmtgmod_to_pypsa.sql index 43d08f97..2ad9d16d 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_osmtgmod_to_pypsa.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_osmtgmod_to_pypsa.sql @@ -26,7 +26,7 @@ SELECT WHERE result_id = 1; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_bus','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); -- BRANCH DATA INSERT INTO model_draft.ego_grid_pf_hv_line (line_id, bus0, bus1, x, r, b, s_nom, cables, frequency, geom, topo) @@ -46,7 +46,7 @@ SELECT WHERE result_id = 1 and (link_type = 'line' or link_type = 'cable'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_line','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); -- TRANSFORMER DATA INSERT INTO model_draft.ego_grid_pf_hv_transformer (trafo_id, bus0, bus1, x, s_nom, tap_ratio, phase_shift, geom, topo) @@ -64,7 +64,7 @@ SELECT WHERE result_id = 1 and link_type = 'transformer'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_transformer','ego_dp_powerflow_osmtgmod_to_pypsa.sql',' '); -- per unit to absolute values diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_demand.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_demand.sql index 4a598311..bba139d4 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_demand.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_demand.sql @@ -51,7 +51,7 @@ INSERT INTO model_draft.ego_grid_pf_hv_load_pq_set (scn_name, load_id, temp_id, GROUP BY C.load_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_timeseries_demand.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_timeseries_demand.sql',' '); --------------- @@ -79,4 +79,4 @@ FROM model_draft.ego_grid_pf_hv_load_pq_set a WHERE scn_name= 'Status Quo'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_load_timeseries_NEP2035.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_load_pq_set','ego_dp_powerflow_load_timeseries_NEP2035.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql index 1ffdd24d..819306ff 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_timeseries_generator.sql @@ -1067,4 +1067,4 @@ INSERT INTO model_draft.ego_grid_pf_hv_load_pq_set (scn_name, load_id, temp_id, */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_timeseries_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_generator_pq_set','ego_dp_powerflow_timeseries_generator.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_structure_input_verification.sql b/dataprocessing/sql_snippets/ego_dp_structure_input_verification.sql index a3f2c116..0b9a0c0f 100644 --- a/dataprocessing/sql_snippets/ego_dp_structure_input_verification.sql +++ b/dataprocessing/sql_snippets/ego_dp_structure_input_verification.sql @@ -11,22 +11,22 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','check','boundaries','bkg_vg250_1_sta','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','boundaries','bkg_vg250_2_lan','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','boundaries','bkg_vg250_4_krs','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','boundaries','bkg_vg250_6_gem','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','openstreetmap','osm_deu_polygon','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','openstreetmap','osm_deu_ways','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','openstreetmap','osm_deu_nodes','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','openstreetmap','osm_deu_line','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','scenario','ego_slp_parameters','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','grid','otg_ehvhv_bus_data','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','society','destatis_zensus_population_per_ha','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','economy','destatis_gva_per_district','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','demand','ego_demand_federalstate','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','supply','vernetzen_wind_potential_area','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','model_draft','ego_supply_res_powerplant_sq_mview','ego_dp_structure_input_verification.sql','preprocessing verification'); -SELECT scenario_log('eGo_DP', 'v0.4.4','check','model_draft','ego_supply_conv_powerplant_sq_mview','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','boundaries','bkg_vg250_1_sta','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','boundaries','bkg_vg250_2_lan','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','boundaries','bkg_vg250_4_krs','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','boundaries','bkg_vg250_6_gem','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','openstreetmap','osm_deu_polygon','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','openstreetmap','osm_deu_ways','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','openstreetmap','osm_deu_nodes','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','openstreetmap','osm_deu_line','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','scenario','ego_slp_parameters','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','grid','otg_ehvhv_bus_data','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','society','destatis_zensus_population_per_ha','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','economy','destatis_gva_per_district','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','demand','ego_demand_federalstate','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','supply','vernetzen_wind_potential_area','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','model_draft','ego_supply_res_powerplant_sq_mview','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','check','model_draft','ego_supply_conv_powerplant_sq_mview','ego_dp_structure_input_verification.sql','preprocessing verification'); /* -- input tables @@ -94,12 +94,12 @@ COMMENT ON TABLE model_draft.ego_scenario_input IS '{ SELECT obj_description('model_draft.test_table' ::regclass) ::json; -- scenario log (project, version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','setup','model_draft','ego_scenario_input','ego_dp_structure_input_verification.sql','preprocessing verification'); +SELECT scenario_log('eGo_DP', 'v0.4.5','setup','model_draft','ego_scenario_input','ego_dp_structure_input_verification.sql','preprocessing verification'); */ -- insert version INSERT INTO model_draft.ego_scenario_input(version,oid,database,table_schema,table_name,path,metadata_title,metadata_reference_date,meta_data) - SELECT 'v0.4.4' AS version, + SELECT 'v0.4.5' AS version, sub.oid, sub.database, sub.table_schema, diff --git a/dataprocessing/sql_snippets/ego_dp_substation_ehv.sql b/dataprocessing/sql_snippets/ego_dp_substation_ehv.sql index aa61adde..07f2dd11 100644 --- a/dataprocessing/sql_snippets/ego_dp_substation_ehv.sql +++ b/dataprocessing/sql_snippets/ego_dp_substation_ehv.sql @@ -36,15 +36,15 @@ ALTER TABLE model_draft.ego_grid_ehv_substation OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_ehv_substation IS '{ "comment": "eGoDP - Versioning table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_ways','ego_dp_substation_ehv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon','ego_dp_substation_ehv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_line','ego_dp_substation_ehv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_nodes','ego_dp_substation_ehv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_rels','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_ways','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_line','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_nodes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_rels','ego_dp_substation_ehv.sql',' '); --> WAY: Erzeuge einen VIEW aus OSM way substations: @@ -63,7 +63,7 @@ ALTER VIEW model_draft.way_substations OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','way_substations','ego_dp_substation_ehv.sql',' '); -- @@ -79,7 +79,7 @@ ALTER VIEW model_draft.way_substations_with_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations_with_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','way_substations_with_hoes','ego_dp_substation_ehv.sql',' '); --> NODE: Erzeuge einen VIEW aus OSM node substations: @@ -97,7 +97,7 @@ ALTER VIEW model_draft.node_substations_with_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','node_substations_with_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','node_substations_with_hoes','ego_dp_substation_ehv.sql',' '); --> RELATION: Erzeuge einen VIEW aus OSM relation substations: @@ -119,7 +119,7 @@ ALTER VIEW model_draft.relation_substations_with_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','relation_substations_with_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','relation_substations_with_hoes','ego_dp_substation_ehv.sql',' '); -- @@ -148,7 +148,7 @@ ALTER VIEW model_draft.substation_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','substation_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','substation_hoes','ego_dp_substation_ehv.sql',' '); -- create view summary_total_hoes that contains substations without any filter @@ -182,7 +182,7 @@ ALTER VIEW model_draft.summary_total_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary_total_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','summary_total_hoes','ego_dp_substation_ehv.sql',' '); -- create view that filters irrelevant tags @@ -200,7 +200,7 @@ CREATE INDEX summary_hoes_gix ON model_draft.summary_hoes USING GIST (polygon); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','summary_hoes','ego_dp_substation_ehv.sql',' '); -- eliminate substation that are not within VG250 @@ -215,8 +215,8 @@ CREATE VIEW model_draft.summary_de_hoes AS ALTER VIEW model_draft.summary_de_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_substation_ehv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary_de_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','summary_de_hoes','ego_dp_substation_ehv.sql',' '); -- create view with buffer of 75m around polygons @@ -229,7 +229,7 @@ CREATE MATERIALIZED VIEW model_draft.buffer_75_hoes AS ALTER MATERIALIZED VIEW model_draft.buffer_75_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','buffer_75_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','buffer_75_hoes','ego_dp_substation_ehv.sql',' '); -- create second view with same data to compare @@ -243,7 +243,7 @@ ALTER MATERIALIZED VIEW model_draft.buffer_75_a_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','buffer_75_a_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','buffer_75_a_hoes','ego_dp_substation_ehv.sql',' '); -- create view to eliminate smaller substations where buffers intersect @@ -261,7 +261,7 @@ CREATE MATERIALIZED VIEW model_draft.substations_to_drop_hoes AS ALTER MATERIALIZED VIEW model_draft.substations_to_drop_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','substations_to_drop_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','substations_to_drop_hoes','ego_dp_substation_ehv.sql',' '); -- filter those substations and create final_result_hoes @@ -275,7 +275,7 @@ CREATE VIEW model_draft.final_result_hoes AS ALTER VIEW model_draft.final_result_hoes OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','final_result_hoes','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','final_result_hoes','ego_dp_substation_ehv.sql',' '); -- insert results @@ -284,7 +284,7 @@ INSERT INTO model_draft.ego_grid_ehv_substation (lon, lat, point, polygon, volta FROM model_draft.final_result_hoes; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_ehv_substation','ego_dp_substation_ehv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_ehv_substation','ego_dp_substation_ehv.sql',' '); -- drop diff --git a/dataprocessing/sql_snippets/ego_dp_substation_hvmv.sql b/dataprocessing/sql_snippets/ego_dp_substation_hvmv.sql index 26531b93..e472333e 100644 --- a/dataprocessing/sql_snippets/ego_dp_substation_hvmv.sql +++ b/dataprocessing/sql_snippets/ego_dp_substation_hvmv.sql @@ -37,13 +37,13 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation OWNER TO oeuser; COMMENT ON TABLE model_draft.ego_grid_hvmv_substation IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_ways','ego_dp_substation_hvmv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_polygon','ego_dp_substation_hvmv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_nodes','ego_dp_substation_hvmv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','openstreetmap','osm_deu_line','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_ways','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_polygon','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_nodes','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','openstreetmap','osm_deu_line','ego_dp_substation_hvmv.sql',' '); --> WAY: create view of way substations: @@ -62,7 +62,7 @@ ALTER VIEW model_draft.way_substations OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','way_substations','ego_dp_substation_hvmv.sql',' '); --> WAY: create view of way substations with 110kV: @@ -78,7 +78,7 @@ ALTER VIEW model_draft.way_substations_with_110kV OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations_with_110kV','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','way_substations_with_110kV','ego_dp_substation_hvmv.sql',' '); --> WAY: create view of substations without 110kV @@ -95,7 +95,7 @@ ALTER VIEW model_draft.way_substations_without_110kV OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations_without_110kV','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','way_substations_without_110kV','ego_dp_substation_hvmv.sql',' '); --> NODE: create view of 110kV node substations: @@ -113,7 +113,7 @@ ALTER VIEW model_draft.node_substations_with_110kV OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','node_substations_with_110kV','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','node_substations_with_110kV','ego_dp_substation_hvmv.sql',' '); --> LINES 110kV: create view of 110kV lines @@ -131,7 +131,7 @@ ALTER VIEW model_draft.way_lines_110kV OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_lines_110kV','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','way_lines_110kV','ego_dp_substation_hvmv.sql',' '); -- INTERSECTION: create view from substations without 110kV tag that contain 110kV line @@ -147,7 +147,7 @@ ALTER VIEW model_draft.way_substations_without_110kV_intersected_by_110kV_line O -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','way_substations_without_110kV_intersected_by_110kV_line','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','way_substations_without_110kV_intersected_by_110kV_line','ego_dp_substation_hvmv.sql',' '); -- @@ -176,7 +176,7 @@ ALTER VIEW model_draft.substation_110kV OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','substation_110kV','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','substation_110kV','ego_dp_substation_hvmv.sql',' '); -- create view summary_total that contains substations without any filter @@ -210,7 +210,7 @@ ALTER VIEW model_draft.summary_total OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary_total','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','summary_total','ego_dp_substation_hvmv.sql',' '); -- create view that filters irrelevant tags @@ -228,7 +228,7 @@ ALTER MATERIALIZED VIEW model_draft.summary OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','summary','ego_dp_substation_hvmv.sql',' '); -- eliminate substation that are not within VG250 @@ -244,8 +244,8 @@ ALTER VIEW model_draft.summary_de OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_substation_hvmv.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','summary_de','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','summary_de','ego_dp_substation_hvmv.sql',' '); -- create view with buffer of 75m around polygons @@ -259,7 +259,7 @@ ALTER MATERIALIZED VIEW model_draft.buffer_75 OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','buffer_75','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','buffer_75','ego_dp_substation_hvmv.sql',' '); -- create second view with same data to compare @@ -272,7 +272,7 @@ CREATE MATERIALIZED VIEW model_draft.buffer_75_a AS ALTER MATERIALIZED VIEW model_draft.buffer_75_a OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','buffer_75_a','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','buffer_75_a','ego_dp_substation_hvmv.sql',' '); -- create view to eliminate smaller substations where buffers intersect @@ -291,7 +291,7 @@ ALTER MATERIALIZED VIEW model_draft.substations_to_drop OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','substations_to_drop','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','substations_to_drop','ego_dp_substation_hvmv.sql',' '); -- filter those substations and create final_result @@ -306,7 +306,7 @@ ALTER VIEW model_draft.final_result OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','final_result','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','final_result','ego_dp_substation_hvmv.sql',' '); -- insert results @@ -315,7 +315,7 @@ INSERT INTO model_draft.ego_grid_hvmv_substation (lon, lat, point, polygon, volt FROM model_draft.final_result; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv.sql',' '); -- drop diff --git a/dataprocessing/sql_snippets/ego_dp_substation_hvmv_voronoi.sql b/dataprocessing/sql_snippets/ego_dp_substation_hvmv_voronoi.sql index 4ad88161..78278eec 100644 --- a/dataprocessing/sql_snippets/ego_dp_substation_hvmv_voronoi.sql +++ b/dataprocessing/sql_snippets/ego_dp_substation_hvmv_voronoi.sql @@ -10,7 +10,7 @@ __author__ = "Ludee" */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv_voronoi.sql',' '); -- set id as subst_id - move to get_substation.sql ALTER TABLE model_draft.ego_grid_hvmv_substation @@ -29,7 +29,7 @@ CREATE INDEX ego_grid_hvmv_substation_geom_idx ON model_draft.ego_grid_hvmv_substation USING GIST (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_substation_hvmv_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_boundaries_bkg_vg250_6_gem_clean','ego_dp_substation_hvmv_voronoi.sql',' '); -- Gemeindeschlüssel UPDATE model_draft.ego_grid_hvmv_substation AS t1 @@ -45,7 +45,7 @@ UPDATE model_draft.ego_grid_hvmv_substation AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_hvmv_voronoi.sql',' '); -- create dummy points for voronoi calculation @@ -87,13 +87,13 @@ ALTER TABLE model_draft.ego_grid_hvmv_substation_dummy OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_grid_hvmv_substation_dummy IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- select description SELECT obj_description('model_draft.ego_grid_hvmv_substation_dummy' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_hvmv_substation_dummy','ego_dp_substation_hvmv_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_hvmv_substation_dummy','ego_dp_substation_hvmv_voronoi.sql',' '); -- voronoi polygons with eucldean distance @@ -165,10 +165,10 @@ DELETE FROM model_draft.ego_grid_hvmv_substation_voronoi WHERE subst_id IS NULL; -- metadata COMMENT ON TABLE model_draft.ego_grid_hvmv_substation_voronoi IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }' ; + "version": "v0.4.5" }' ; -- select description SELECT obj_description('model_draft.ego_grid_hvmv_substation_voronoi' ::regclass) ::json; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_substation_hvmv_voronoi.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_hvmv_substation_voronoi','ego_dp_substation_hvmv_voronoi.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_substation_id_to_generator.sql b/dataprocessing/sql_snippets/ego_dp_substation_id_to_generator.sql index fb1337f7..d45b9529 100644 --- a/dataprocessing/sql_snippets/ego_dp_substation_id_to_generator.sql +++ b/dataprocessing/sql_snippets/ego_dp_substation_id_to_generator.sql @@ -62,7 +62,7 @@ ALTER TABLE model_draft.ego_dp_supply_conv_powerplant DROP COLUMN subst_id_NN; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_conv_powerplant','ego_dp_substation_id_to_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_dp_supply_conv_powerplant','ego_dp_substation_id_to_generator.sql',' '); ------------------ @@ -94,4 +94,4 @@ The assignment and reallocation of RES generators which are located outside Germ */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_substation_id_to_generator.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_substation_id_to_generator.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_substation_otg.sql b/dataprocessing/sql_snippets/ego_dp_substation_otg.sql index feed4bd7..bc078e6c 100644 --- a/dataprocessing/sql_snippets/ego_dp_substation_otg.sql +++ b/dataprocessing/sql_snippets/ego_dp_substation_otg.sql @@ -10,9 +10,9 @@ __author__ = "lukasol, C. Matke" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','grid','otg_ehvhv_bus_data','ego_dp_substation_otg.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_substation_otg.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_ehv_substation','ego_dp_substation_otg.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','grid','otg_ehvhv_bus_data','ego_dp_substation_otg.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_hvmv_substation','ego_dp_substation_otg.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_ehv_substation','ego_dp_substation_otg.sql',' '); -- update model_draft.ego_grid_hvmv_substation table with new column of respective osmtgmod bus_i @@ -28,7 +28,7 @@ UPDATE model_draft.ego_grid_hvmv_substation DELETE FROM model_draft.ego_grid_hvmv_substation WHERE otg_id IS NULL; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_otg.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_hvmv_substation','ego_dp_substation_otg.sql',' '); -- do the same with model_draft.ego_grid_ehv_substation @@ -46,4 +46,4 @@ UPDATE model_draft.ego_grid_ehv_substation DELETE FROM model_draft.ego_grid_ehv_substation WHERE otg_id IS NULL; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_ehv_substation','ego_dp_substation_otg.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_ehv_substation','ego_dp_substation_otg.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_supply_dp_powerflow_create_pp_mview.sql b/dataprocessing/sql_snippets/ego_dp_supply_dp_powerflow_create_pp_mview.sql index 2c22f895..f44c1ec1 100644 --- a/dataprocessing/sql_snippets/ego_dp_supply_dp_powerflow_create_pp_mview.sql +++ b/dataprocessing/sql_snippets/ego_dp_supply_dp_powerflow_create_pp_mview.sql @@ -27,7 +27,7 @@ CREATE MATERIALIZED VIEW supply.ego_supply_conv_powerplant_sq_mview AS WHERE scenario = 'Status Quo' AND shutdown IS NULL or shutdown >= 2015 AND capacity > 0 - AND version = 'v0.4.4'; + AND version = 'v0.4.5'; ALTER MATERIALIZED VIEW supply.ego_supply_conv_powerplant_sq_mview OWNER TO oeuser; @@ -41,7 +41,7 @@ CREATE MATERIALIZED VIEW supply.ego_supply_conv_powerplant_nep2035_mview AS AND capacity > 0 AND fuel not in ('hydro', 'run_of_river', 'reservoir') AND shutdown IS NULL or shutdown >= 2034 - AND version = 'v0.4.4'; + AND version = 'v0.4.5'; ALTER MATERIALIZED VIEW supply.ego_supply_conv_powerplant_nep2035_mview OWNER TO oeuser; @@ -97,15 +97,15 @@ CREATE MATERIALIZED VIEW supply.ego_supply_conv_powerplant_ego100_mview AS AND fuel = 'pumped_storage' AND capacity > 0 AND shutdown IS NULL or shutdown >= 2049 - AND version = 'v0.4.4'; + AND version = 'v0.4.5'; ALTER MATERIALIZED VIEW supply.ego_supply_conv_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_conv_powerplant_sq_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_conv_powerplant_nep2035_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_conv_powerplant_ego100_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','supply','ego_supply_conv_powerplant_sq_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','supply','ego_supply_conv_powerplant_nep2035_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','supply','ego_supply_conv_powerplant_ego100_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); -------------------------------------------------------------------------------- @@ -120,7 +120,7 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_sq_mview AS FROM supply.ego_dp_supply_res_powerplant WHERE scenario = 'Status Quo' AND electrical_capacity > 0 - AND version = 'v0.4.4'; + AND version = 'v0.4.5'; ALTER MATERIALIZED VIEW supply.ego_supply_res_powerplant_sq_mview OWNER TO oeuser; @@ -138,12 +138,12 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_nep2035_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_supply_res_powerplant - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' - And version = 'v0.4.4' + And version = 'v0.4.5' AND electrical_capacity > 0 ORDER BY id ) as sub @@ -159,11 +159,11 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_nep2035_mview AS SELECT id FROM supply.ego_dp_supply_res_powerplant WHERE scenario in ('NEP 2035') - AND version = 'v0.4.4' + AND version = 'v0.4.5' Group BY id Order by id) AND scenario in ('NEP 2035') - And version = 'v0.4.4' + And version = 'v0.4.5' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -185,12 +185,12 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_ego100_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_supply_res_powerplant - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' - And version = 'v0.4.4' + And version = 'v0.4.5' AND electrical_capacity > 0 AND generation_type in ('solar','wind') ORDER BY id @@ -209,11 +209,11 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_ego100_mview AS Where scenario in ('eGo 100') AND generation_type not in ('gas') AND flag in ('commissioning', 'repowering') - AND version = 'v0.4.4' + AND version = 'v0.4.5' Group BY id Order by id) AND scenario in ('eGo 100') - And version = 'v0.4.4' + And version = 'v0.4.5' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -231,11 +231,11 @@ CREATE MATERIALIZED VIEW supply.ego_supply_res_powerplant_ego100_mview AS Where scenario in ('NEP 2035') AND generation_type not in ('biomass','gas','reservoir','run_of_river') AND flag in ('commissioning', 'repowering') - And version = 'v0.4.4' + And version = 'v0.4.5' Group BY id Order by id) AND scenario in ('NEP 2035') - And version = 'v0.4.4' + And version = 'v0.4.5' AND electrical_capacity > 0 ORDER BY id ) sub3 @@ -245,6 +245,6 @@ ALTER MATERIALIZED VIEW supply.ego_supply_res_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_res_powerplant_sq_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_res_powerplant_nep2035_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','supply','ego_supply_res_powerplant_ego100_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','supply','ego_supply_res_powerplant_sq_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','supply','ego_supply_res_powerplant_nep2035_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','supply','ego_supply_res_powerplant_ego100_mview','ego_dp_supply_powerflow_create_pp_mview.sql',' '); diff --git a/dataprocessing/sql_snippets/ego_dp_versioning.sql b/dataprocessing/sql_snippets/ego_dp_versioning.sql index 49e6e071..6dcc44ca 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning.sql @@ -13,82 +13,82 @@ __author__ = "Ludee" -- EHV Substation versioning /* DELETE FROM grid.ego_dp_ehv_substation - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_dp_ehv_substation - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_ehv_substation; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_ehv_substation','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_dp_ehv_substation','ego_dp_versioning.sql','versioning'); -- HVMV Substation versioning /* DELETE FROM grid.ego_dp_hvmv_substation - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_dp_hvmv_substation - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_hvmv_substation; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_hvmv_substation','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_dp_hvmv_substation','ego_dp_versioning.sql','versioning'); -- MVLV Substation versioning /* DELETE FROM grid.ego_dp_mvlv_substation - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_dp_mvlv_substation - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_mvlv_substation; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_mvlv_substation','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_dp_mvlv_substation','ego_dp_versioning.sql','versioning'); -- CATCHMENT AREA -- EHV Griddistrict versioning /* DELETE FROM grid.ego_dp_ehv_griddistrict - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_dp_ehv_griddistrict - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_ehv_substation_voronoi; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_ehv_griddistrict','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_dp_ehv_griddistrict','ego_dp_versioning.sql','versioning'); -- MV Griddistrict versioning /* DELETE FROM grid.ego_dp_mv_griddistrict - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_dp_mv_griddistrict - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_mv_griddistrict; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_mv_griddistrict','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_dp_mv_griddistrict','ego_dp_versioning.sql','versioning'); -- LV Griddistrict versioning /* DELETE FROM grid.ego_dp_lv_griddistrict - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ --INSERT INTO grid.ego_dp_lv_griddistrict --- SELECT 'v0.4.4', +-- SELECT 'v0.4.5', -- * -- FROM model_draft.ego_grid_lv_griddistrict; INSERT INTO grid.ego_dp_lv_griddistrict - SELECT 'v0.4.4', + SELECT 'v0.4.5', id, mvlv_subst_id, subst_id, @@ -128,32 +128,32 @@ INSERT INTO grid.ego_dp_lv_griddistrict FROM model_draft.ego_grid_lv_griddistrict; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_dp_lv_griddistrict','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_dp_lv_griddistrict','ego_dp_versioning.sql','versioning'); -- LOADAREA -- Loadarea versioning /* DELETE FROM demand.ego_dp_loadarea - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO demand.ego_dp_loadarea - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_demand_loadarea; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','demand','ego_dp_loadarea','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','demand','ego_dp_loadarea','ego_dp_versioning.sql','versioning'); -- GENERATOR -- conv versioning /* DELETE FROM supply.ego_dp_conv_powerplant - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO supply.ego_dp_conv_powerplant - SELECT 'v0.4.4', + SELECT 'v0.4.5', id, bnetza_id, company, @@ -198,14 +198,14 @@ INSERT INTO supply.ego_dp_conv_powerplant FROM model_draft.ego_dp_supply_conv_powerplant; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_conv_powerplant','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_dp_conv_powerplant','ego_dp_versioning.sql','versioning'); -- res versioning /* DELETE FROM supply.ego_dp_res_powerplant - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO supply.ego_dp_res_powerplant - SELECT 'v0.4.4', + SELECT 'v0.4.5', id, start_up_date, electrical_capacity, @@ -250,359 +250,359 @@ INSERT INTO supply.ego_dp_res_powerplant FROM 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.4','result','supply','ego_dp_res_powerplant','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_dp_res_powerplant','ego_dp_versioning.sql','versioning'); -- POWERFLOW -- hv pf bus /* DELETE FROM grid.ego_pf_hv_bus - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_bus - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_bus; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_bus','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_bus','ego_dp_versioning.sql','versioning'); -- hv pf generator /* DELETE FROM grid.ego_pf_hv_generator - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_generator - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_generator; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_generator','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_generator','ego_dp_versioning.sql','versioning'); -- hv pf generator_pq_set /* DELETE FROM grid.ego_pf_hv_generator_pq_set - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_generator_pq_set - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_generator_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_generator_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_generator_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf line /* DELETE FROM grid.ego_pf_hv_line - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_line - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_line; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_line','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_line','ego_dp_versioning.sql','versioning'); -- hv pf link /* DELETE FROM grid.ego_pf_hv_link - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_link - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_link; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_line','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_line','ego_dp_versioning.sql','versioning'); -- hv pf load /* DELETE FROM grid.ego_pf_hv_load - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_load - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_load; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_load','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_load','ego_dp_versioning.sql','versioning'); -- hv pf load_pq_set /* DELETE FROM grid.ego_pf_hv_load_pq_set - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_load_pq_set - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_load_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_load_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_load_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf source /* DELETE FROM grid.ego_pf_hv_source - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_source - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_source; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_source','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_source','ego_dp_versioning.sql','versioning'); -- hv pf storage /* DELETE FROM grid.ego_pf_hv_storage - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_storage - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_storage; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_storage','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_storage','ego_dp_versioning.sql','versioning'); -- hv pf storage_pq_set /* DELETE FROM grid.ego_pf_hv_storage_pq_set - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_storage_pq_set - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_storage_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_storage_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_storage_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf temp_resolution /* DELETE FROM grid.ego_pf_hv_temp_resolution - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_temp_resolution - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_temp_resolution; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_temp_resolution','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_temp_resolution','ego_dp_versioning.sql','versioning'); -- hv pf transformer /* DELETE FROM grid.ego_pf_hv_transformer - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_transformer - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_transformer; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_transformer','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_transformer','ego_dp_versioning.sql','versioning'); -- hv pf extension bus /* DELETE FROM grid.ego_pf_hv_extension_bus - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_bus - SELECT 'v0.4.4', + SELECT 'v0.4.5', scn_name, bus_id, v_nom, current_type, v_mag_pu_min, v_mag_pu_max, geom FROM model_draft.ego_grid_pf_hv_extension_bus; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_bus','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_bus','ego_dp_versioning.sql','versioning'); -- hv pf extension generator /* DELETE FROM grid.ego_pf_hv_extension_generator - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_generator - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_extension_generator; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_generator','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_generator','ego_dp_versioning.sql','versioning'); -- hv pf extension generator_pq_set /* DELETE FROM grid.ego_pf_hv_generator_pq_set - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_generator_pq_set - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_extension_generator_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_generator_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_generator_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf extension line /* DELETE FROM grid.ego_pf_hv_extension_line - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_line - SELECT 'v0.4.4', + SELECT 'v0.4.5', scn_name, line_id , bus0, bus1, x, r, g, b, s_nom, s_nom_extendable, s_nom_min, s_nom_max, capital_cost, length, cables, frequency, terrain_factor, geom, topo, v_nom, project, project_id FROM model_draft.ego_grid_pf_hv_extension_line; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_line','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_line','ego_dp_versioning.sql','versioning'); -- hv pf extension link /* DELETE FROM grid.ego_pf_hv_extension_link - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_link - SELECT 'v0.4.4', + SELECT 'v0.4.5', scn_name, link_id, bus0, bus1, efficiency, marginal_cost, p_nom, p_nom_extendable, p_nom_min, p_nom_max, capital_cost, length, terrain_factor,geom, topo, project, project_id FROM model_draft.ego_grid_pf_hv_extension_link; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_link','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_link','ego_dp_versioning.sql','versioning'); -- hv pf extension load /* DELETE FROM grid.ego_pf_hv_extension_load - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_load - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_extension_load; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_load','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_load','ego_dp_versioning.sql','versioning'); -- hv pf extension load_pq_set /* DELETE FROM grid.ego_pf_hv_extension_load_pq_set - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_load_pq_set - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_extension_load_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_load_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_load_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf extension source /* DELETE FROM grid.ego_pf_hv_source - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_source - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_extension_source; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_source','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_source','ego_dp_versioning.sql','versioning'); -- hv pf extension storage /* DELETE FROM grid.ego_pf_hv_extension_storage - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_storage - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_extension_storage; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_storage','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_storage','ego_dp_versioning.sql','versioning'); -- hv pf extension storage_pq_set /* DELETE FROM grid.ego_pf_hv_extension_storage_pq_set - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_storage_pq_set - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_extension_storage_pq_set; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_storage_pq_set','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_storage_pq_set','ego_dp_versioning.sql','versioning'); -- hv pf extension temp_resolution /* DELETE FROM grid.ego_pf_hv_extension_temp_resolution - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_temp_resolution - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_pf_hv_extension_temp_resolution; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_temp_resolution','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_temp_resolution','ego_dp_versioning.sql','versioning'); -- hv pf extension transformer /* DELETE FROM grid.ego_pf_hv_extension_transformer - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_pf_hv_extension_transformer - SELECT 'v0.4.4', + SELECT 'v0.4.5', scn_name, trafo_id, bus0,bus1, x, r, g, b, s_nom, s_nom_extendable, s_nom_min, s_nom_max, tap_ratio, phase_shift, capital_cost, geom, topo, project FROM model_draft.ego_grid_pf_hv_extension_transformer; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_extension_transformer','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_extension_transformer','ego_dp_versioning.sql','versioning'); -- hv pf line expansion cost /* DELETE FROM grid.ego_line_expansion_costs - WHERE version = 'v0.4.4'; */ + WHERE version = 'v0.4.5'; */ INSERT INTO grid.ego_line_expansion_costs - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_grid_line_expansion_costs; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_line_expansion_costs','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_line_expansion_costs','ego_dp_versioning.sql','versioning'); -- renewable time series INSERT INTO supply.ego_renewable_feedin - SELECT 'v0.4.4', + SELECT 'v0.4.5', weather_scenario_id, w_id, source, weather_year, feedin, power_class FROM model_draft.ego_renewable_feedin; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_renewable_feedin','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_renewable_feedin','ego_dp_versioning.sql','versioning'); -- renewable wind parameters INSERT INTO supply.ego_power_class - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_power_class; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_power_class','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_power_class','ego_dp_versioning.sql','versioning'); -- subset of generator single to match aggr_id and w_id INSERT INTO supply.ego_aggr_weather - SELECT 'v0.4.4', + SELECT 'v0.4.5', * FROM model_draft.ego_supply_aggr_weather; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_aggr_weather','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_aggr_weather','ego_dp_versioning.sql','versioning'); -- pf data check @@ -611,4 +611,4 @@ SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_aggr_weather','ego_ -- FROM model_draft.ego_grid_pf_hv_data_check; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) ---SELECT scenario_log('eGo_DP','v0.4.4','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning'); +--SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning'); diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql index ecd85234..528cb9b7 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql @@ -19,7 +19,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS AND (shutdown IS NULL or shutdown >= 2015) AND capacity > 0; -- AND preversion = 'v0.3.0' - --AND version = 'v0.4.4'; + --AND version = 'v0.4.5'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview @@ -35,7 +35,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS AND fuel not in ('hydro', 'run_of_river', 'reservoir') AND (shutdown IS NULL or shutdown >= 2034); --AND preversion = 'v0.3.0' - --AND version = 'v0.4.4'; + --AND version = 'v0.4.5'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview @@ -93,16 +93,16 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS AND capacity > 0 AND (shutdown IS NULL or shutdown >= 2049); --AND preversion = 'v0.3.0' - --AND version = 'v0.4.4'; + --AND version = 'v0.4.5'; ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_conv_powerplant_sq_mview','ego_dp_versioning_mviews.sql','versioning'); -SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_conv_powerplant_nep2035_mview','ego_dp_versioning_mviews.sql','versioning'); -SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_conv_powerplant_ego100_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_dp_conv_powerplant_sq_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_dp_conv_powerplant_nep2035_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_dp_conv_powerplant_ego100_mview','ego_dp_versioning_mviews.sql','versioning'); -- Create View with full dataset per scenario and renewables power plants @@ -114,7 +114,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS WHERE scenario = 'Status Quo' AND electrical_capacity > 0; --AND preversion = 'v0.3.0' - --AND version = 'v0.4.4'; + --AND version = 'v0.4.5'; ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview @@ -133,13 +133,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_res_powerplant - --WHERE version = 'v0.4.4' + --WHERE version = 'v0.4.5' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' --And preversion = 'v0.3.0' - --AND version = 'v0.4.4' + --AND version = 'v0.4.5' AND electrical_capacity > 0 ORDER BY id @@ -156,12 +156,12 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS SELECT id FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - --AND version = 'v0.4.4' + --AND version = 'v0.4.5' Group BY id Order by id) AND scenario in ('NEP 2035') --And preversion = 'v0.3.0' - -- AND version = 'v0.4.4' + -- AND version = 'v0.4.5' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -183,13 +183,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS WHERE id not in ( SELECT id FROM supply.ego_dp_res_powerplant - -- WHERE version = 'v0.4.4' + -- WHERE version = 'v0.4.5' Group BY id HAVING count(*) > 1 Order by id) AND scenario = 'Status Quo' -- AND preversion = 'v0.3.0' - -- AND version = 'v0.4.4' + -- AND version = 'v0.4.5' AND electrical_capacity > 0 AND generation_type in ('solar','wind') AND generation_subtype not in ('wind_offshore') @@ -208,13 +208,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario in ('eGo 100') AND generation_type not in ('gas') - --AND version = 'v0.4.4' + --AND version = 'v0.4.5' AND flag in ('commissioning', 'repowering') Group BY id Order by id) AND scenario in ('eGo 100') --And preversion = 'v0.3.0' - --AND version = 'v0.4.4' + --AND version = 'v0.4.5' AND electrical_capacity > 0 ORDER BY id ) sub2 @@ -230,7 +230,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS SELECT id FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - --AND version = 'v0.4.4' + --AND version = 'v0.4.5' AND generation_type not in ('biomass','gas','reservoir','run_of_river') AND flag in ('commissioning', 'repowering') AND generation_subtype not in ('wind_offshore') @@ -238,7 +238,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS Order by id) AND scenario in ('NEP 2035') --And preversion = 'v0.3.0' - --AND version = 'v0.4.4' + --AND version = 'v0.4.5' AND electrical_capacity > 0 ORDER BY id ) sub3 @@ -248,6 +248,6 @@ ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_res_powerplant_sq_mview','ego_dp_versioning_mviews.sql','versioning'); -SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_res_powerplant_nep2035_mview','ego_dp_versioning_mviews.sql','versioning'); -SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_res_powerplant_ego100_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_dp_res_powerplant_sq_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_dp_res_powerplant_nep2035_mview','ego_dp_versioning_mviews.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_dp_res_powerplant_ego100_mview','ego_dp_versioning_mviews.sql','versioning'); diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_overview.sql b/dataprocessing/sql_snippets/ego_dp_versioning_overview.sql index 710349d7..caa5b0da 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_overview.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_overview.sql @@ -20,12 +20,12 @@ ORDER BY name, version, id; -- Select one version SELECT * FROM model_draft.ego_scenario_overview -WHERE version = 'v0.4.4' +WHERE version = 'v0.4.5' ORDER BY id; -- Remove version DELETE FROM model_draft.ego_scenario_overview -WHERE version = 'v0.4.4'; +WHERE version = 'v0.4.5'; */ @@ -36,7 +36,7 @@ SELECT schema_name AS schema, table_name AS table, version FROM model_draft.scenario_log -WHERE version = 'v0.4.4' +WHERE version = 'v0.4.5' AND io = 'result' AND comment = 'versioning' GROUP BY schema_name, table_name, version @@ -53,7 +53,7 @@ BEGIN table_name AS table, version FROM model_draft.scenario_log - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' AND io = 'result' AND comment = 'versioning' GROUP BY schema_name, table_name, version @@ -75,182 +75,182 @@ INSERT INTO model_draft.ego_scenario_overview (name,version,cnt) version, count(*) AS cnt FROM grid.ego_dp_ehv_substation - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_dp_hvmv_substation' AS name, version, count(*) AS cnt FROM grid.ego_dp_hvmv_substation - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_dp_mvlv_substation' AS name, version, count(*) AS cnt FROM grid.ego_dp_mvlv_substation - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_dp_ehv_griddistrict' AS name, version, count(*) AS cnt FROM grid.ego_dp_ehv_griddistrict - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_dp_mv_griddistrict' AS name, version, count(*) AS cnt FROM grid.ego_dp_mv_griddistrict - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_dp_lv_griddistrict' AS name, version, count(*) AS cnt FROM grid.ego_dp_lv_griddistrict - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'demand.ego_dp_loadarea' AS name, version, count(*) AS cnt FROM demand.ego_dp_loadarea - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'supply.ego_dp_conv_powerplant' AS name, version, count(*) AS cnt FROM supply.ego_dp_conv_powerplant - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'supply.ego_dp_res_powerplant' AS name, version, count(*) AS cnt FROM supply.ego_dp_res_powerplant - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_bus' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_bus - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_generator' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_generator - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_generator_pq_set' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_generator_pq_set - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_line' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_line - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_load' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_load - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_load_pq_set' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_load_pq_set - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_source' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_source - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_storage' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_storage - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_storage_pq_set' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_storage_pq_set - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_temp_resolution' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_temp_resolution - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'grid.ego_pf_hv_transformer' AS name, version, count(*) AS cnt FROM grid.ego_pf_hv_transformer - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL -- supply SELECT 'supply.ego_dp_conv_powerplant_sq_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_conv_powerplant_sq_mview - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'supply.ego_dp_conv_powerplant_nep2035_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_conv_powerplant_nep2035_mview - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'supply.ego_dp_conv_powerplant_ego100_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_conv_powerplant_ego100_mview - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'supply.ego_dp_res_powerplant_sq_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_res_powerplant_sq_mview - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'supply.ego_dp_res_powerplant_nep2035_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_res_powerplant_nep2035_mview - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version UNION ALL SELECT 'supply.ego_dp_res_powerplant_ego100_mview' AS name, version, count(*) AS cnt FROM supply.ego_dp_res_powerplant_ego100_mview - WHERE version = 'v0.4.4' + WHERE version = 'v0.4.5' GROUP BY version ; */ diff --git a/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql b/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql index 6ca72834..e255fbd4 100644 --- a/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql +++ b/dataprocessing/sql_snippets/ego_pp_nep2035_grid_variations.sql @@ -1459,7 +1459,7 @@ AND bus_id NOT IN (SELECT bus0 FROM model_draft.ego_grid_pf_hv_extension_link WH AND bus_id NOT IN (SELECT bus0 FROM model_draft.ego_grid_pf_hv_extension_transformer WHERE scn_name = a.scn_name) AND bus_id NOT IN (SELECT bus1 FROM model_draft.ego_grid_pf_hv_extension_transformer WHERE scn_name = a.scn_name); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_extension_bus','ego_pp_nep2035_grid_variations.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_extension_line','ego_pp_nep2035_grid_variations.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_extension_link','ego_pp_nep2035_grid_variations.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_pf_hv_extension_transformer','ego_pp_nep2035_grid_variations.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_extension_bus','ego_pp_nep2035_grid_variations.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_extension_line','ego_pp_nep2035_grid_variations.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_extension_link','ego_pp_nep2035_grid_variations.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_pf_hv_extension_transformer','ego_pp_nep2035_grid_variations.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_conv.sql b/dataprocessing/sql_snippets/rea/ego_dp_conv.sql index a70f41e5..ad25845a 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_conv.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_conv.sql @@ -9,7 +9,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' '); -- la_id ALTER TABLE model_draft.ego_dp_supply_conv_powerplant @@ -31,4 +31,4 @@ UPDATE model_draft.ego_dp_supply_conv_powerplant AS t1 WHERE t1.gid = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_dp_supply_conv_powerplant','ego_dp_conv.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_lattice_500m.sql b/dataprocessing/sql_snippets/rea/ego_dp_lattice_500m.sql index 3822cbe2..7ac776ea 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_lattice_500m.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_lattice_500m.sql @@ -20,7 +20,7 @@ CREATE TABLE model_draft.ego_lattice_500m ( CONSTRAINT ego_lattice_500m_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_500m.sql',' '); -- lattice on bbox of Germany with 500m INSERT INTO model_draft.ego_lattice_500m (geom_box) @@ -52,7 +52,7 @@ ALTER TABLE model_draft.ego_lattice_500m OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_lattice_500m IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_500m','ego_dp_lattice_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_lattice_500m','ego_dp_lattice_500m.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_lattice_50m.sql b/dataprocessing/sql_snippets/rea/ego_dp_lattice_50m.sql index 5c430ad1..bdce96a8 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_lattice_50m.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_lattice_50m.sql @@ -19,7 +19,7 @@ CREATE TABLE model_draft.ego_lattice_50m ( CONSTRAINT ego_lattice_50m_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','boundaries','bkg_vg250_1_sta_union_mview','ego_dp_lattice_50m.sql',' '); -- insert lattice INSERT INTO model_draft.ego_lattice_50m (geom_box) @@ -51,7 +51,7 @@ ALTER TABLE model_draft.ego_lattice_50m OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_lattice_50m IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_50m','ego_dp_lattice_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_lattice_50m','ego_dp_lattice_50m.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_500m.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_500m.sql index f1afe60b..6dd4fbf4 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_500m.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_500m.sql @@ -13,7 +13,7 @@ __author__ = "Ludee" */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_500m.sql',' '); -- substation id from mv-griddistrict UPDATE model_draft.ego_lattice_500m AS t1 @@ -35,7 +35,7 @@ UPDATE model_draft.ego_lattice_500m AS t1 -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_lattice_per_area_500m.sql',' '); -- area type for wind potential area (wpa) UPDATE model_draft.ego_lattice_500m AS t1 @@ -51,7 +51,7 @@ UPDATE model_draft.ego_lattice_500m AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_500m.sql',' '); -- area type for loadarea (la) UPDATE model_draft.ego_lattice_500m AS t1 @@ -82,7 +82,7 @@ UPDATE model_draft.ego_lattice_500m AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_500m','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_lattice_500m','ego_dp_rea_lattice_per_area_500m.sql',' '); -- mview points inside wpa @@ -103,7 +103,7 @@ ALTER TABLE model_draft.ego_lattice_500m_wpa_mview OWNER TO oeuser; SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_wpa_mview'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_500m_wpa_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_lattice_500m_wpa_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); -- mview points inside la @@ -124,7 +124,7 @@ ALTER TABLE model_draft.ego_lattice_500m_la_mview OWNER TO oeuser; SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_la_mview'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_lattice_500m_la_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_lattice_500m_la_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); -- mview points inside wpa and la @@ -145,7 +145,7 @@ ALTER TABLE model_draft.ego_lattice_500m_x_mview OWNER TO oeuser; SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_x_mview'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_lattice_500m_x_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_lattice_500m_x_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); -- mview points outside area @@ -166,4 +166,4 @@ ALTER TABLE model_draft.ego_lattice_500m_out_mview OWNER TO oeuser; SELECT copy_comment_mview('model_draft.ego_lattice_500m','model_draft.ego_lattice_500m_out_mview'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_lattice_500m_out_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_lattice_500m_out_mview','ego_dp_rea_lattice_per_area_500m.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_50m.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_50m.sql index 889fb864..ad30f654 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_50m.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_lattice_per_area_50m.sql @@ -10,7 +10,7 @@ __author__ = "Ludee" */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_lattice_per_area_50m.sql',' '); -- substation id from mv-griddistrict UPDATE model_draft.ego_lattice_50m AS t1 @@ -26,7 +26,7 @@ UPDATE model_draft.ego_lattice_50m AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_demand_loadarea','ego_dp_rea_lattice_per_area_50m.sql',' '); -- area type for loadarea (la) UPDATE model_draft.ego_lattice_50m AS t1 @@ -42,7 +42,7 @@ UPDATE model_draft.ego_lattice_50m AS t1 WHERE t1.id = t2.id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_50m','ego_dp_rea_lattice_per_area_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_lattice_50m','ego_dp_rea_lattice_per_area_50m.sql',' '); -- mview points inside la @@ -63,4 +63,4 @@ ALTER TABLE model_draft.ego_lattice_50m_la_mview OWNER TO oeuser; SELECT copy_comment_mview('model_draft.ego_lattice_50m','model_draft.ego_lattice_50m_la_mview'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_lattice_50m_la_mview','ego_dp_rea_lattice_per_area_50m.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_lattice_50m_la_mview','ego_dp_rea_lattice_per_area_50m.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_m1.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_m1.sql index eb5383b9..bdb20368 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_m1.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_m1.sql @@ -11,7 +11,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m1.sql',' '); -- MView M1-1 DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m1_1_a_mview CASCADE; @@ -39,7 +39,7 @@ CREATE INDEX ego_supply_rea_m1_1_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m1_1_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_1_a_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m1_1_a_mview','ego_dp_rea_m1.sql',' '); -- rea_flag M1-1 @@ -70,7 +70,7 @@ CREATE INDEX ego_supply_rea_m1_1_dea_temp_geom_idx ON model_draft.ego_supply_rea_m1_1_dea_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_1_dea_temp','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m1_1_dea_temp','ego_dp_rea_m1.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_1_osm_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m1_1_osm_temp ( @@ -85,7 +85,7 @@ CREATE INDEX ego_supply_rea_m1_1_osm_temp_geom_idx ON model_draft.ego_supply_rea_m1_1_osm_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_1_osm_temp','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m1_1_osm_temp','ego_dp_rea_m1.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_1_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m1_1_jnt_temp ( @@ -99,10 +99,10 @@ CREATE INDEX ego_supply_rea_m1_1_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m1_1_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) --- SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_1_jnt_temp','ego_dp_rea_m1.sql',' '); +-- SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m1_1_jnt_temp','ego_dp_rea_m1.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_m1.sql',' '); -- loop for grid_district DO @@ -175,7 +175,7 @@ CREATE INDEX ego_supply_rea_m1_1_mview_rea_geom_new_idx ALTER TABLE model_draft.ego_supply_rea_m1_1_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m1_1_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m1_1_mview','ego_dp_rea_m1.sql',' '); -- M1-1 rest @@ -200,7 +200,7 @@ CREATE INDEX ego_supply_rea_m1_1_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m1_1_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m1_1_rest_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m1_1_rest_mview','ego_dp_rea_m1.sql',' '); -- Drop temp DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_1_dea_temp CASCADE; @@ -237,7 +237,7 @@ CREATE INDEX ego_supply_rea_m1_2_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m1_2_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_2_a_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m1_2_a_mview','ego_dp_rea_m1.sql',' '); -- rea_flag M1-2 @@ -266,7 +266,7 @@ CREATE INDEX ego_supply_rea_m1_2_dea_temp_geom_idx ON model_draft.ego_supply_rea_m1_2_dea_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_2_dea_temp','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m1_2_dea_temp','ego_dp_rea_m1.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_2_osm_temp ; CREATE TABLE model_draft.ego_supply_rea_m1_2_osm_temp ( @@ -281,7 +281,7 @@ CREATE INDEX ego_supply_rea_m1_2_osm_temp_geom_idx ON model_draft.ego_supply_rea_m1_2_osm_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_2_osm_temp','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m1_2_osm_temp','ego_dp_rea_m1.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m1_2_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m1_2_jnt_temp ( @@ -301,7 +301,7 @@ CREATE INDEX ego_supply_rea_m1_2_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m1_2_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m1_2_jnt_temp','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m1_2_jnt_temp','ego_dp_rea_m1.sql',' '); -- loop for grid_district DO @@ -381,7 +381,7 @@ GRANT ALL ON TABLE model_draft.ego_supply_rea_m1_2_mview TO oeuser WITH GRANT OP ALTER TABLE model_draft.ego_supply_rea_m1_2_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m1_2_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m1_2_mview','ego_dp_rea_m1.sql',' '); -- M1-2 rest DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m1_2_rest_mview CASCADE; @@ -405,7 +405,7 @@ CREATE INDEX ego_supply_rea_m1_2_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m1_2_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m1_2_rest_mview','ego_dp_rea_m1.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m1_2_rest_mview','ego_dp_rea_m1.sql',' '); -- Drop temp diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_m2.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_m2.sql index 5eadf8ea..b832a092 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_m2.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_m2.sql @@ -11,7 +11,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m2.sql',' '); -- MView M2 DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m2_a_mview CASCADE; @@ -38,7 +38,7 @@ CREATE INDEX ego_supply_rea_m2_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m2_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m2_a_mview','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m2_a_mview','ego_dp_rea_m2.sql',' '); -- rea_flag M2 @@ -117,7 +117,7 @@ UPDATE model_draft.ego_supply_rea_m2_windfarm AS t1 WHERE t1.farm_id = t2.farm_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m2_windfarm','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m2_windfarm','ego_dp_rea_m2.sql',' '); -- update DEA in wind farms UPDATE model_draft.ego_dp_supply_res_powerplant AS t1 @@ -155,7 +155,7 @@ CREATE INDEX ego_supply_rea_m2_farm_temp_geom_idx ON model_draft.ego_supply_rea_m2_farm_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m2_farm_temp','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m2_farm_temp','ego_dp_rea_m2.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m2_wpa_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m2_wpa_temp ( @@ -170,7 +170,7 @@ CREATE INDEX ego_supply_rea_m2_wpa_temp_geom_idx ON model_draft.ego_supply_rea_m2_wpa_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m2_wpa_temp','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m2_wpa_temp','ego_dp_rea_m2.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m2_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m2_jnt_temp ( @@ -185,10 +185,10 @@ CREATE INDEX ego_supply_rea_m2_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m2_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m2_jnt_temp','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m2_jnt_temp','ego_dp_rea_m2.sql',' '); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_m2.sql',' '); -- loop for grid_district @@ -260,7 +260,7 @@ CREATE INDEX ego_supply_rea_m2_mview_rea_geom_new_idx ALTER TABLE model_draft.ego_supply_rea_m2_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m2_mview','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m2_mview','ego_dp_rea_m2.sql',' '); -- M2 rest @@ -285,7 +285,7 @@ CREATE INDEX ego_supply_rea_m2_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m2_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m2_rest_mview','ego_dp_rea_m2.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m2_rest_mview','ego_dp_rea_m2.sql',' '); -- Drop temp diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_m3.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_m3.sql index 98aa8717..7d183c40 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_m3.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_m3.sql @@ -12,7 +12,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m3.sql',' '); -- MView M3 DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m3_a_mview CASCADE; @@ -41,7 +41,7 @@ CREATE INDEX ego_supply_rea_m3_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m3_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m3_a_mview','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m3_a_mview','ego_dp_rea_m3.sql',' '); -- rea_flag M3 @@ -73,7 +73,7 @@ CREATE INDEX ego_supply_rea_m3_dea_temp_geom_idx ON model_draft.ego_supply_rea_m3_dea_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m3_dea_temp','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m3_dea_temp','ego_dp_rea_m3.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m3_grid_wpa_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m3_grid_wpa_temp ( @@ -88,7 +88,7 @@ CREATE INDEX ego_supply_rea_m3_grid_wpa_temp_geom_idx ON model_draft.ego_supply_rea_m3_grid_wpa_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m3_grid_wpa_temp','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m3_grid_wpa_temp','ego_dp_rea_m3.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m3_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m3_jnt_temp ( @@ -102,7 +102,7 @@ CREATE INDEX ego_supply_rea_m3_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m3_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m3_jnt_temp','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m3_jnt_temp','ego_dp_rea_m3.sql',' '); -- loop for grid_district @@ -176,7 +176,7 @@ CREATE INDEX ego_supply_rea_m3_mview_rea_geom_new_idx ALTER TABLE model_draft.ego_supply_rea_m3_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m3_mview','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m3_mview','ego_dp_rea_m3.sql',' '); -- M3 rest @@ -201,7 +201,7 @@ CREATE INDEX ego_supply_rea_m3_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m3_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m3_rest_mview','ego_dp_rea_m3.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m3_rest_mview','ego_dp_rea_m3.sql',' '); -- Drop temp diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_m4.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_m4.sql index ea72081e..84b8b983 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_m4.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_m4.sql @@ -13,7 +13,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m4.sql',' '); -- MView M4 DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m4_a_mview CASCADE; @@ -45,7 +45,7 @@ CREATE INDEX ego_supply_rea_m4_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m4_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m4_a_mview','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m4_a_mview','ego_dp_rea_m4.sql',' '); -- rea_flag M4 @@ -80,7 +80,7 @@ CREATE INDEX ego_supply_rea_m4_dea_temp_geom_idx ON model_draft.ego_supply_rea_m4_dea_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m4_dea_temp','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m4_dea_temp','ego_dp_rea_m4.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m4_grid_wpa_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m4_grid_wpa_temp ( @@ -96,7 +96,7 @@ CREATE INDEX ego_supply_rea_m4_grid_wpa_temp_geom_idx ON model_draft.ego_supply_rea_m4_grid_wpa_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m4_grid_wpa_temp','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m4_grid_wpa_temp','ego_dp_rea_m4.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m4_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m4_jnt_temp ( @@ -110,7 +110,7 @@ CREATE INDEX ego_supply_rea_m4_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m4_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m4_jnt_temp','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m4_jnt_temp','ego_dp_rea_m4.sql',' '); -- loop for grid_district @@ -181,7 +181,7 @@ CREATE INDEX ego_supply_rea_m4_mview_rea_geom_new_idx ALTER TABLE model_draft.ego_supply_rea_m4_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m4_mview','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m4_mview','ego_dp_rea_m4.sql',' '); -- M4 rest @@ -206,7 +206,7 @@ CREATE INDEX ego_supply_rea_m4_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m4_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m4_rest_mview','ego_dp_rea_m4.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m4_rest_mview','ego_dp_rea_m4.sql',' '); -- Drop temp diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_m5.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_m5.sql index 69c8c782..4907f3ee 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_m5.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_m5.sql @@ -11,7 +11,7 @@ __author__ = "Ludee" -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_m5.sql',' '); -- MView M5 DEA DROP MATERIALIZED VIEW IF EXISTS model_draft.ego_supply_rea_m5_a_mview CASCADE; @@ -40,7 +40,7 @@ CREATE INDEX ego_supply_rea_m5_a_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m5_a_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m5_a_mview','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m5_a_mview','ego_dp_rea_m5.sql',' '); -- rea_flag M5 @@ -73,7 +73,7 @@ CREATE INDEX ego_supply_rea_m5_dea_temp_geom_idx ON model_draft.ego_supply_rea_m5_dea_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m5_dea_temp','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m5_dea_temp','ego_dp_rea_m5.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m5_grid_la_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m5_grid_la_temp ( @@ -89,7 +89,7 @@ CREATE INDEX ego_supply_rea_m5_grid_la_temp_geom_idx ON model_draft.ego_supply_rea_m5_grid_la_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m5_grid_la_temp','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m5_grid_la_temp','ego_dp_rea_m5.sql',' '); DROP TABLE IF EXISTS model_draft.ego_supply_rea_m5_jnt_temp CASCADE; CREATE TABLE model_draft.ego_supply_rea_m5_jnt_temp ( @@ -103,7 +103,7 @@ CREATE INDEX ego_supply_rea_m5_jnt_temp_geom_idx ON model_draft.ego_supply_rea_m5_jnt_temp USING gist (geom); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_rea_m5_jnt_temp','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_rea_m5_jnt_temp','ego_dp_rea_m5.sql',' '); -- loop for grid_district @@ -176,7 +176,7 @@ CREATE INDEX ego_supply_rea_m5_rest_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m5_rest_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m5_rest_mview','ego_dp_rea_m5.sql','Should be 0!'); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m5_rest_mview','ego_dp_rea_m5.sql','Should be 0!'); -- Second loop for m5 rest for grid_district @@ -249,7 +249,7 @@ CREATE INDEX ego_supply_rea_m5_rest_2_mview_geom_idx ALTER TABLE model_draft.ego_supply_rea_m5_rest_2_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m5_rest_2_mview','ego_dp_rea_m5.sql','Should be 0!'); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m5_rest_2_mview','ego_dp_rea_m5.sql','Should be 0!'); -- M5 result @@ -275,7 +275,7 @@ CREATE INDEX ego_supply_rea_m5_mview_rea_geom_new_idx ALTER TABLE model_draft.ego_supply_rea_m5_mview OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_m5_mview','ego_dp_rea_m5.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_m5_mview','ego_dp_rea_m5.sql',' '); -- update la_id from loadarea diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_results.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_results.sql index 6416ee4f..f0ff2eeb 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_results.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_results.sql @@ -15,7 +15,7 @@ Results */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_results.sql',' '); -- dea capacity and count per generation types and voltage level DROP TABLE IF EXISTS model_draft.ego_supply_rea_per_gentype_and_voltlevel CASCADE; @@ -35,7 +35,7 @@ ALTER TABLE model_draft.ego_supply_rea_per_gentype_and_voltlevel OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_per_gentype_and_voltlevel','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_per_gentype_and_voltlevel','ego_dp_rea_results.sql',' '); /* @@ -67,7 +67,7 @@ ALTER TABLE model_draft.ego_supply_rea_per_mvgd OWNER TO oeuser; */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_results.sql',' '); UPDATE model_draft.ego_grid_mv_griddistrict AS t1 SET dea_cnt = t2.dea_cnt, @@ -114,7 +114,7 @@ UPDATE model_draft.ego_grid_mv_griddistrict AS t1 WHERE t1.subst_id = t2.subst_id; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_results.sql',' '); -- DEA capacity and count per load area @@ -153,7 +153,7 @@ FROM model_draft.ego_supply_rea_per_loadarea AS la, */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_per_loadarea','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_per_loadarea','ego_dp_rea_results.sql',' '); -- DEA capacity and count per load area @@ -224,7 +224,7 @@ ALTER TABLE model_draft.ego_supply_rea_per_method OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_rea_per_method','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_rea_per_method','ego_dp_rea_results.sql',' '); -- Hotfix to fill empty rea_geom_new cells in table @@ -244,4 +244,4 @@ CREATE INDEX ego_dp_supply_res_powerplant_geom_new_idx (rea_geom_new); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_results.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_results.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_setup.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_setup.sql index 527c4b26..330e74b8 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_setup.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_setup.sql @@ -17,7 +17,7 @@ SELECT COUNT(*) FROM model_draft.ego_grid_mv_griddistrict; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_setup.sql',' '); ALTER TABLE model_draft.ego_dp_supply_res_powerplant DROP COLUMN IF EXISTS la_id CASCADE, @@ -34,7 +34,7 @@ ALTER TABLE model_draft.ego_dp_supply_res_powerplant ADD COLUMN rea_geom_new geometry(Point,3035); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_setup.sql',' '); -- rea_flag reset UPDATE model_draft.ego_dp_supply_res_powerplant @@ -57,7 +57,7 @@ UPDATE model_draft.ego_dp_supply_res_powerplant WHERE generation_subtype = 'wind_offshore'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_dp_supply_res_powerplant','ego_dp_rea_setup.sql',' '); /* @@ -91,14 +91,14 @@ ALTER TABLE model_draft.ego_dp_supply_res_powerplant_out_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_dp_supply_res_powerplant_out_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_dp_supply_res_powerplant_out_mview','ego_dp_rea_setup.sql','First check if RES are outside Germany'); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_dp_supply_res_powerplant_out_mview','ego_dp_rea_setup.sql','First check if RES are outside Germany'); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_hvmv_substation','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_hvmv_substation','ego_dp_rea_setup.sql',' '); -- new geom, DEA to next substation DROP TABLE IF EXISTS model_draft.ego_dp_supply_res_powerplant_out_nn CASCADE; @@ -122,10 +122,10 @@ ALTER TABLE model_draft.ego_dp_supply_res_powerplant_out_nn -- metadata COMMENT ON TABLE model_draft.ego_dp_supply_res_powerplant_out_nn IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_dp_supply_res_powerplant_out_nn','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_dp_supply_res_powerplant_out_nn','ego_dp_rea_setup.sql',' '); -- new subst_id and rea_geom_new with line UPDATE model_draft.ego_dp_supply_res_powerplant AS t1 @@ -169,10 +169,10 @@ ALTER TABLE model_draft.ego_dp_supply_res_powerplant_out_mview OWNER TO oeuser; -- metadata COMMENT ON MATERIALIZED VIEW model_draft.ego_dp_supply_res_powerplant_out_mview IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_dp_supply_res_powerplant_out_mview','ego_dp_rea_setup.sql','Second check if RES outside Germany'); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_dp_supply_res_powerplant_out_mview','ego_dp_rea_setup.sql','Second check if RES outside Germany'); -- drop DROP TABLE IF EXISTS model_draft.ego_dp_supply_res_powerplant_out_nn CASCADE; @@ -185,7 +185,7 @@ In Germany a lot of farmyard builings are used for renewable energy production w */ -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_setup.sql',' '); ALTER TABLE model_draft.ego_osm_sector_per_griddistrict_4_agricultural DROP COLUMN IF EXISTS subst_id, @@ -211,4 +211,4 @@ UPDATE model_draft.ego_osm_sector_per_griddistrict_4_agricultural SET area_ha = ST_AREA(geom)/10000; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_setup.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_osm_sector_per_griddistrict_4_agricultural','ego_dp_rea_setup.sql',' '); diff --git a/dataprocessing/sql_snippets/rea/ego_dp_rea_wpa_per_mvgd.sql b/dataprocessing/sql_snippets/rea/ego_dp_rea_wpa_per_mvgd.sql index 50751142..51166a80 100644 --- a/dataprocessing/sql_snippets/rea/ego_dp_rea_wpa_per_mvgd.sql +++ b/dataprocessing/sql_snippets/rea/ego_dp_rea_wpa_per_mvgd.sql @@ -19,7 +19,7 @@ CREATE TABLE model_draft.ego_supply_wpa ( CONSTRAINT ego_supply_wpa_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','supply','vernetzen_wind_potential_area','ego_dp_rea_wpa_per_mvgd.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','supply','vernetzen_wind_potential_area','ego_dp_rea_wpa_per_mvgd.sql',' '); -- insert wpa dump INSERT INTO model_draft.ego_supply_wpa (geom) @@ -36,7 +36,7 @@ CREATE INDEX ego_supply_wpa_geom_idx ALTER TABLE model_draft.ego_supply_wpa OWNER TO oeuser; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','temp','model_draft','ego_supply_wpa','ego_dp_rea_wpa_per_mvgd.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','temp','model_draft','ego_supply_wpa','ego_dp_rea_wpa_per_mvgd.sql',' '); */ /* -- validate (geom) @@ -69,8 +69,8 @@ CREATE TABLE model_draft.ego_supply_wpa_per_mvgd ( CONSTRAINT ego_supply_wpa_per_mvgd_pkey PRIMARY KEY (id)); -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_wpa_per_mvgd.sql',' '); -SELECT scenario_log('eGo_DP', 'v0.4.4','input','supply','vernetzen_wind_potential_area','ego_dp_rea_wpa_per_mvgd.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','model_draft','ego_grid_mv_griddistrict','ego_dp_rea_wpa_per_mvgd.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','input','supply','vernetzen_wind_potential_area','ego_dp_rea_wpa_per_mvgd.sql',' '); -- insert wpa per mv-griddistrict WITH wpa_dump AS ( @@ -112,10 +112,10 @@ ALTER TABLE model_draft.ego_supply_wpa_per_mvgd OWNER TO oeuser; -- metadata COMMENT ON TABLE model_draft.ego_supply_wpa_per_mvgd IS '{ "comment": "eGoDP - Temporary table", - "version": "v0.4.4" }'; + "version": "v0.4.5" }'; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) -SELECT scenario_log('eGo_DP', 'v0.4.4','output','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_wpa_per_mvgd.sql',' '); +SELECT scenario_log('eGo_DP', 'v0.4.5','output','model_draft','ego_supply_wpa_per_mvgd','ego_dp_rea_wpa_per_mvgd.sql',' '); -- DROP TABLE IF EXISTS model_draft.ego_supply_wpa CASCADE; From 2d9abacf1bf536d6354507c0eb1ba5af2fd10f1d Mon Sep 17 00:00:00 2001 From: ulfmueller Date: Sat, 18 Aug 2018 16:07:52 +0200 Subject: [PATCH 29/36] adjust executing python script --- dataprocessing/eGo_data_processing.py | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dataprocessing/eGo_data_processing.py b/dataprocessing/eGo_data_processing.py index 1deb041a..42ebfc5c 100644 --- a/dataprocessing/eGo_data_processing.py +++ b/dataprocessing/eGo_data_processing.py @@ -47,7 +47,7 @@ def data_processing(): # 'ego_dp_substation_hvmv.sql', # Abstract HVMV Substations of the high voltage level from OSM # 'ego_dp_substation_ehv.sql', # Abstract EHV Substations of the extra high voltage level from OSM # 'ego_dp_substation_otg.sql', # Assign osmTGmod-id to HVMV and EHV substations -# 'ego_dp_substation_hvmv_voronoi.sql', # HVMV Voronoi cells based on HVMV substations +# 'ego_dp_substation_hvmv_voronoi.sql', # HVMV Voronoi cells based on HVMV substations # 'ego_dp_substation_ehv_voronoi.sql', # EHV Voronoi cells based on EHV substations ## GRIDDISTRICT @@ -95,23 +95,23 @@ def data_processing(): # 'ego_dp_powerflow_electrical_neighbour.sql', # Create border crossing lines and buses in neighbouring countries # 'ego_dp_powerflow_fix_ehv_subnetworks.sql', # Fix topological errors in eHV grid # 'ego_dp_powerflow_grid_future_scenarios.sql', # Copy grid to future scenarios -# 'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists -# 'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv) -# 'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario -# 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation (SQ, NEP2035, eGo100) -# 'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation (SQ, NEP2035, eGo100) -# 'ego_dp_powerflow_assignment_storage.sql', # Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100) -# 'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table -# 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict -# 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100) -# 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages -# 'ego_dp_data_check.sql', # Check powerflow data for plausibility + 'ego_dp_powerflow_assignment_otgid.sql', # assign otg_id to pp lists + 'ego_dp_powerflow_assignment_unid.sql', # create a unified_id over all pp (res and conv) + 'ego_dp_powerflow_create_pp_mview.sql', # create mviews to display power plants per scenario + 'ego_dp_powerflow_assignment_generator.sql', # Assign generators to corresponding substation (SQ, NEP2035, eGo100) + 'ego_dp_powerflow_assignment_load.sql', # Assign loads to their corresponding substation (SQ, NEP2035, eGo100) + 'ego_dp_powerflow_assignment_storage.sql', # Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100) + 'ego_dp_powerflow_timeseries_generator.sql', # Transfer renpassG!S results into the corresponding powerflow table + 'ego_dp_powerflow_griddistrict_demand.py', # Demand per MV Griddistrict + 'ego_dp_powerflow_timeseries_demand.sql', # Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100) + 'ego_dp_powerflow_lopf_data.sql', # Set marginal costs for generators and storages + 'ego_dp_data_check.sql', # Check powerflow data for plausibility ## POST-PROCESSING -# 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data + 'ego_pp_nep2035_grid_variations.sql' # Create extension_tables and insert NEP-data ## VERSIONING -# 'ego_dp_versioning.sql', # Versioning - 'ego_dp_versioning_mviews.sql' , # Versioning of mviews + 'ego_dp_versioning.sql', # Versioning +# 'ego_dp_versioning_mviews.sql' , # Versioning of mviews From 21dab4ae42b30a9f0e6351d4b720052f8447176e Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Sat, 18 Aug 2018 16:25:24 +0200 Subject: [PATCH 30/36] remove and create column otg_id --- .../ego_dp_powerflow_assignment_otgid.sql | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql index 24fc5a27..0959cdf8 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql @@ -11,8 +11,11 @@ __author__ = "IlkaCu" */ -- Set column otg_id to NULL -UPDATE model_draft.ego_dp_supply_res_powerplant - SET otg_id = NULL; +ALTER TABLE model_draft.ego_dp_supply_res_powerplant + DROP COLUMN otg_id; + +ALTER TABLE model_draft.ego_dp_supply_res_powerplant + ADD COLUMN otg_id; -- Insert otg_id of bus for res pp UPDATE model_draft.ego_dp_supply_res_powerplant a @@ -27,8 +30,11 @@ UPDATE model_draft.ego_dp_supply_res_powerplant a -- Set column otg_id to NULL -UPDATE model_draft.ego_dp_supply_conv_powerplant - SET otg_id = NULL; +ALTER TABLE model_draft.ego_dp_supply_conv_powerplant + DROP COLUMN otg_id; + +ALTER TABLE model_draft.ego_dp_supply_conv_powerplant + ADD COLUMN otg_id; -- Insert otg_id of bus for conv pp UPDATE model_draft.ego_dp_supply_conv_powerplant a From 1381c5dedabbf61e5c1eba3987b8edea930ddd88 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Mon, 20 Aug 2018 11:29:38 +0200 Subject: [PATCH 31/36] Revert "remove and create column otg_id" This reverts commit 21dab4ae42b30a9f0e6351d4b720052f8447176e. --- .../ego_dp_powerflow_assignment_otgid.sql | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql index 0959cdf8..24fc5a27 100644 --- a/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql +++ b/dataprocessing/sql_snippets/ego_dp_powerflow_assignment_otgid.sql @@ -11,11 +11,8 @@ __author__ = "IlkaCu" */ -- Set column otg_id to NULL -ALTER TABLE model_draft.ego_dp_supply_res_powerplant - DROP COLUMN otg_id; - -ALTER TABLE model_draft.ego_dp_supply_res_powerplant - ADD COLUMN otg_id; +UPDATE model_draft.ego_dp_supply_res_powerplant + SET otg_id = NULL; -- Insert otg_id of bus for res pp UPDATE model_draft.ego_dp_supply_res_powerplant a @@ -30,11 +27,8 @@ UPDATE model_draft.ego_dp_supply_res_powerplant a -- Set column otg_id to NULL -ALTER TABLE model_draft.ego_dp_supply_conv_powerplant - DROP COLUMN otg_id; - -ALTER TABLE model_draft.ego_dp_supply_conv_powerplant - ADD COLUMN otg_id; +UPDATE model_draft.ego_dp_supply_conv_powerplant + SET otg_id = NULL; -- Insert otg_id of bus for conv pp UPDATE model_draft.ego_dp_supply_conv_powerplant a From 3008ce57e050f660f7768f2eecbb4d12384df836 Mon Sep 17 00:00:00 2001 From: wolfbunke Date: Tue, 21 Aug 2018 09:38:38 +0200 Subject: [PATCH 32/36] fix version select --- .../sql_snippets/ego_dp_versioning_mviews.sql | 137 +++++++++--------- 1 file changed, 68 insertions(+), 69 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql index ecd85234..8ce9fcb5 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql @@ -1,4 +1,4 @@ -/* +/* eGo Data Processing result data versioning Copy a version of mvies from model_draft to OEP schema @@ -13,13 +13,13 @@ __author__ = "wolfbunke" -- MView for Status Quo DROP MATERIALIZED VIEW IF EXISTS supply.ego_dp_conv_powerplant_sq_mview CASCADE; CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS - SELECT * + SELECT DISTINCT * FROM supply.ego_dp_conv_powerplant WHERE scenario = 'Status Quo' AND (shutdown IS NULL or shutdown >= 2015) - AND capacity > 0; - -- AND preversion = 'v0.3.0' - --AND version = 'v0.4.4'; + AND capacity > 0 + AND preversion = 'v0.3.0' + AND version in ('v0.4.2','v0.4.4'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview @@ -28,14 +28,14 @@ ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview -- MView for NEP 2035 DROP MATERIALIZED VIEW IF EXISTS supply.ego_dp_conv_powerplant_nep2035_mview CASCADE; CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS - SELECT * + SELECT DISTINCT* FROM supply.ego_dp_conv_powerplant WHERE scenario = 'NEP 2035' AND capacity > 0 AND fuel not in ('hydro', 'run_of_river', 'reservoir') - AND (shutdown IS NULL or shutdown >= 2034); - --AND preversion = 'v0.3.0' - --AND version = 'v0.4.4'; + AND (shutdown IS NULL or shutdown >= 2034) + AND preversion = 'v0.3.0' + AND version in ('v0.4.2','v0.4.4'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview @@ -44,7 +44,7 @@ ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview -- MView for eGo 100 DROP MATERIALIZED VIEW IF EXISTS supply.ego_dp_conv_powerplant_ego100_mview CASCADE; CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS - SELECT + SELECT DISTINCT version, preversion, id, @@ -91,9 +91,9 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS WHERE scenario in('NEP 2035') AND fuel = 'pumped_storage' AND capacity > 0 - AND (shutdown IS NULL or shutdown >= 2049); - --AND preversion = 'v0.3.0' - --AND version = 'v0.4.4'; + AND (shutdown IS NULL or shutdown >= 2049) + AND preversion = 'v0.3.0' + AND version in ('v0.4.2','v0.4.4'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview @@ -109,12 +109,12 @@ SELECT scenario_log('eGo_DP','v0.4.4','result','supply','ego_dp_conv_powerplant_ -- MView for Status Quo DROP MATERIALIZED VIEW IF EXISTS supply.ego_dp_res_powerplant_sq_mview CASCADE; CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS - SELECT * + SELECT DISTINCT* FROM supply.ego_dp_res_powerplant WHERE scenario = 'Status Quo' - AND electrical_capacity > 0; - --AND preversion = 'v0.3.0' - --AND version = 'v0.4.4'; + AND electrical_capacity > 0 + AND preversion = 'v0.3.0' + AND version in ('v0.4.2','v0.4.4'); ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview @@ -123,124 +123,123 @@ ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview -- MView for NEP 2035 DROP MATERIALIZED VIEW IF EXISTS supply.ego_dp_res_powerplant_nep2035_mview CASCADE; CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS - SELECT + SELECT sub.* FROM ( - SELECT DISTINCT ON (id) + SELECT DISTINCT ON (id||version) * FROM supply.ego_dp_res_powerplant - WHERE id not in ( - SELECT id + WHERE id||version not in ( + SELECT id||version FROM supply.ego_dp_res_powerplant - --WHERE version = 'v0.4.4' - Group BY id + WHERE version in ('v0.4.2','v0.4.4') + Group BY id||version HAVING count(*) > 1 - Order by id) + Order by id||version) AND scenario = 'Status Quo' - --And preversion = 'v0.3.0' - --AND version = 'v0.4.4' - + And preversion = 'v0.3.0' + AND version in ('v0.4.2','v0.4.4') AND electrical_capacity > 0 - ORDER BY id + ORDER BY id||version ) as sub UNION - SELECT + SELECT sub2.* FROM ( - SELECT DISTINCT ON (id) + SELECT DISTINCT ON (id||version) * FROM supply.ego_dp_res_powerplant - WHERE id in ( - SELECT id + WHERE id||version in ( + SELECT id||version FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - --AND version = 'v0.4.4' - Group BY id - Order by id) + AND version in ('v0.4.2','v0.4.4') + Group BY id||version + Order by id||version) AND scenario in ('NEP 2035') - --And preversion = 'v0.3.0' - -- AND version = 'v0.4.4' + And preversion = 'v0.3.0' + AND version in ('v0.4.2','v0.4.4') AND electrical_capacity > 0 - ORDER BY id + ORDER BY id||version ) sub2 Order by id; ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview - OWNER TO oeuser; + OWNER TO oeuser; -- 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 DISTINCT ON (id) + SELECT DISTINCT ON (id||version) sub.* FROM ( - SELECT DISTINCT ON (id) + SELECT DISTINCT ON (id||version) * FROM supply.ego_dp_res_powerplant - WHERE id not in ( - SELECT id + WHERE id||version not in ( + SELECT id||version FROM supply.ego_dp_res_powerplant - -- WHERE version = 'v0.4.4' - Group BY id + WHERE version in ('v0.4.2','v0.4.4') + Group BY id||version HAVING count(*) > 1 - Order by id) + Order by id||version) AND scenario = 'Status Quo' - -- AND preversion = 'v0.3.0' - -- AND version = 'v0.4.4' + AND preversion = 'v0.3.0' + AND version in ('v0.4.2','v0.4.4') AND electrical_capacity > 0 AND generation_type in ('solar','wind') AND generation_subtype not in ('wind_offshore') - ORDER BY id + ORDER BY id||version ) as sub UNION - SELECT DISTINCT ON (id) + SELECT DISTINCT ON (id||version) sub2.* FROM ( - SELECT DISTINCT ON (id) + SELECT DISTINCT ON (id||version) * FROM supply.ego_dp_res_powerplant - WHERE id in ( - SELECT id + WHERE id||version in ( + SELECT id||version FROM supply.ego_dp_res_powerplant WHERE scenario in ('eGo 100') AND generation_type not in ('gas') - --AND version = 'v0.4.4' + AND version in ('v0.4.2','v0.4.4') AND flag in ('commissioning', 'repowering') - Group BY id - Order by id) + Group BY id||version + Order by id||version) AND scenario in ('eGo 100') - --And preversion = 'v0.3.0' - --AND version = 'v0.4.4' + And preversion = 'v0.3.0' + AND version in ('v0.4.2','v0.4.4') AND electrical_capacity > 0 - ORDER BY id + ORDER BY id||version ) sub2 UNION - SELECT DISTINCT ON (id) + SELECT DISTINCT ON (id||version) sub3.* FROM ( - SELECT DISTINCT ON (id) + SELECT DISTINCT ON (id||version) * FROM supply.ego_dp_res_powerplant - WHERE id in ( - SELECT id + WHERE id||version in ( + SELECT id||version FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - --AND version = 'v0.4.4' + AND version in ('v0.4.2','v0.4.4') 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) + Group BY id||version + Order by id||version) AND scenario in ('NEP 2035') - --And preversion = 'v0.3.0' - --AND version = 'v0.4.4' + And preversion = 'v0.3.0' + AND version in ('v0.4.2','v0.4.4') AND electrical_capacity > 0 - ORDER BY id + ORDER BY id||version ) sub3 Order by id; From 83bbb45262b4d36af435b3d25fd071cc01225d1b Mon Sep 17 00:00:00 2001 From: WolfBunke Date: Tue, 21 Aug 2018 11:58:59 +0200 Subject: [PATCH 33/36] add 'v0.4.5' --- .../sql_snippets/ego_dp_versioning_mviews.sql | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql index ffa01b9c..5d4c76b4 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql @@ -19,7 +19,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS AND (shutdown IS NULL or shutdown >= 2015) AND capacity > 0 AND preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4'); + AND version in ('v0.4.2','v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview @@ -36,7 +36,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS AND (shutdown IS NULL or shutdown >= 2034) AND preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4'); + AND version in ('v0.4.2','v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview @@ -94,7 +94,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS AND capacity > 0 AND (shutdown IS NULL or shutdown >= 2049) AND preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4'); + AND version in ('v0.4.2','v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview OWNER TO oeuser; @@ -114,7 +114,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS WHERE scenario = 'Status Quo' AND electrical_capacity > 0 AND preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4'); + AND version in ('v0.4.2','v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview @@ -133,13 +133,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS WHERE id||version not in ( SELECT id||version FROM supply.ego_dp_res_powerplant - WHERE version in ('v0.4.2','v0.4.4') + WHERE version in ('v0.4.2','v0.4.4','v0.4.5') Group BY id||version HAVING count(*) > 1 Order by id||version) AND scenario = 'Status Quo' And preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4') + AND version in ('v0.4.2','v0.4.4','v0.4.5') AND electrical_capacity > 0 ORDER BY id||version ) as sub @@ -156,12 +156,12 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - AND version in ('v0.4.2','v0.4.4') + AND version in ('v0.4.2','v0.4.4','v0.4.5') Group BY id||version Order by id||version) AND scenario in ('NEP 2035') And preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4') + AND version in ('v0.4.2','v0.4.4','v0.4.5') AND electrical_capacity > 0 ORDER BY id||version ) sub2 @@ -183,13 +183,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS WHERE id||version not in ( SELECT id||version FROM supply.ego_dp_res_powerplant - WHERE version in ('v0.4.2','v0.4.4') + WHERE version in ('v0.4.2','v0.4.4','v0.4.5') Group BY id||version HAVING count(*) > 1 Order by id||version) AND scenario = 'Status Quo' AND preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4') + AND version in ('v0.4.2','v0.4.4','v0.4.5') AND electrical_capacity > 0 AND generation_type in ('solar','wind') AND generation_subtype not in ('wind_offshore') @@ -208,13 +208,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario in ('eGo 100') AND generation_type not in ('gas') - AND version in ('v0.4.2','v0.4.4') + AND version in ('v0.4.2','v0.4.4','v0.4.5') AND flag in ('commissioning', 'repowering') Group BY id||version Order by id||version) AND scenario in ('eGo 100') And preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4') + AND version in ('v0.4.2','v0.4.4','v0.4.5') AND electrical_capacity > 0 ORDER BY id||version ) sub2 @@ -230,7 +230,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS SELECT id||version FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - AND version in ('v0.4.2','v0.4.4') + AND version in ('v0.4.2','v0.4.4','v0.4.5') AND generation_type not in ('biomass','gas','reservoir','run_of_river') AND flag in ('commissioning', 'repowering') AND generation_subtype not in ('wind_offshore') @@ -238,7 +238,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS Order by id||version) AND scenario in ('NEP 2035') And preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4') + AND version in ('v0.4.2','v0.4.4','v0.4.5') AND electrical_capacity > 0 ORDER BY id||version ) sub3 From 52469966d7aff160d9e5ea01eb3a44dc6d66d386 Mon Sep 17 00:00:00 2001 From: WolfBunke Date: Tue, 21 Aug 2018 12:13:11 +0200 Subject: [PATCH 34/36] remove version except for RES NEP and ego100 --- .../sql_snippets/ego_dp_versioning_mviews.sql | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql index 5d4c76b4..4e7be2a5 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql @@ -18,8 +18,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS WHERE scenario = 'Status Quo' AND (shutdown IS NULL or shutdown >= 2015) AND capacity > 0 - AND preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4','v0.4.5'); + AND preversion = 'v0.3.0'; + --AND version in ('v0.4.2','v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview @@ -35,8 +35,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS AND fuel not in ('hydro', 'run_of_river', 'reservoir') AND (shutdown IS NULL or shutdown >= 2034) - AND preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4','v0.4.5'); + AND preversion = 'v0.3.0'; + --AND version in ('v0.4.2','v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview @@ -93,8 +93,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS AND fuel = 'pumped_storage' AND capacity > 0 AND (shutdown IS NULL or shutdown >= 2049) - AND preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4','v0.4.5'); + AND preversion = 'v0.3.0'; + --AND version in ('v0.4.2','v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview OWNER TO oeuser; @@ -113,8 +113,8 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario = 'Status Quo' AND electrical_capacity > 0 - AND preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4','v0.4.5'); + AND preversion = 'v0.3.0'; + --AND version in ('v0.4.2','v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_res_powerplant_sq_mview From 0f55f658c5503abcc4813b49c3337ebee3728407 Mon Sep 17 00:00:00 2001 From: WolfBunke Date: Thu, 23 Aug 2018 10:39:45 +0200 Subject: [PATCH 35/36] update version selection * select all versions for SQ * select v0.4.4 and v0.4.5 version for NEP2035 and eGo100 --- .../sql_snippets/ego_dp_versioning_mviews.sql | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql index 4e7be2a5..e8ad692a 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning_mviews.sql @@ -19,7 +19,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview AS AND (shutdown IS NULL or shutdown >= 2015) AND capacity > 0 AND preversion = 'v0.3.0'; - --AND version in ('v0.4.2','v0.4.4','v0.4.5'); + --AND version in ('v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_sq_mview @@ -36,7 +36,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview AS AND (shutdown IS NULL or shutdown >= 2034) AND preversion = 'v0.3.0'; - --AND version in ('v0.4.2','v0.4.4','v0.4.5'); + AND version in ('v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_nep2035_mview @@ -94,7 +94,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview AS AND capacity > 0 AND (shutdown IS NULL or shutdown >= 2049) AND preversion = 'v0.3.0'; - --AND version in ('v0.4.2','v0.4.4','v0.4.5'); + AND version in ('v0.4.4','v0.4.5'); ALTER MATERIALIZED VIEW supply.ego_dp_conv_powerplant_ego100_mview OWNER TO oeuser; @@ -133,13 +133,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS WHERE id||version not in ( SELECT id||version FROM supply.ego_dp_res_powerplant - WHERE version in ('v0.4.2','v0.4.4','v0.4.5') + WHERE version in ('v0.4.4','v0.4.5') Group BY id||version HAVING count(*) > 1 Order by id||version) AND scenario = 'Status Quo' And preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4','v0.4.5') + AND version in ('v0.4.4','v0.4.5') AND electrical_capacity > 0 ORDER BY id||version ) as sub @@ -156,12 +156,12 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_nep2035_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - AND version in ('v0.4.2','v0.4.4','v0.4.5') + AND version in ('v0.4.4','v0.4.5') Group BY id||version Order by id||version) AND scenario in ('NEP 2035') And preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4','v0.4.5') + AND version in ('v0.4.4','v0.4.5') AND electrical_capacity > 0 ORDER BY id||version ) sub2 @@ -183,13 +183,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS WHERE id||version not in ( SELECT id||version FROM supply.ego_dp_res_powerplant - WHERE version in ('v0.4.2','v0.4.4','v0.4.5') + WHERE version in ('v0.4.4','v0.4.5') Group BY id||version HAVING count(*) > 1 Order by id||version) AND scenario = 'Status Quo' AND preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4','v0.4.5') + AND version in ('v0.4.4','v0.4.5') AND electrical_capacity > 0 AND generation_type in ('solar','wind') AND generation_subtype not in ('wind_offshore') @@ -208,13 +208,13 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS FROM supply.ego_dp_res_powerplant WHERE scenario in ('eGo 100') AND generation_type not in ('gas') - AND version in ('v0.4.2','v0.4.4','v0.4.5') + AND version in ('v0.4.4','v0.4.5') AND flag in ('commissioning', 'repowering') Group BY id||version Order by id||version) AND scenario in ('eGo 100') And preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4','v0.4.5') + AND version in ('v0.4.4','v0.4.5') AND electrical_capacity > 0 ORDER BY id||version ) sub2 @@ -230,7 +230,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS SELECT id||version FROM supply.ego_dp_res_powerplant WHERE scenario in ('NEP 2035') - AND version in ('v0.4.2','v0.4.4','v0.4.5') + AND version in ('v0.4.4','v0.4.5') AND generation_type not in ('biomass','gas','reservoir','run_of_river') AND flag in ('commissioning', 'repowering') AND generation_subtype not in ('wind_offshore') @@ -238,7 +238,7 @@ CREATE MATERIALIZED VIEW supply.ego_dp_res_powerplant_ego100_mview AS Order by id||version) AND scenario in ('NEP 2035') And preversion = 'v0.3.0' - AND version in ('v0.4.2','v0.4.4','v0.4.5') + AND version in ('v0.4.4','v0.4.5') AND electrical_capacity > 0 ORDER BY id||version ) sub3 From d552ca8bc8e320ecc6f473f4d696773cbe4bf4d4 Mon Sep 17 00:00:00 2001 From: IlkaCu Date: Thu, 23 Aug 2018 10:50:36 +0200 Subject: [PATCH 36/36] include data_check in versioning --- dataprocessing/sql_snippets/ego_dp_versioning.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dataprocessing/sql_snippets/ego_dp_versioning.sql b/dataprocessing/sql_snippets/ego_dp_versioning.sql index 6dcc44ca..5d2bb8f6 100644 --- a/dataprocessing/sql_snippets/ego_dp_versioning.sql +++ b/dataprocessing/sql_snippets/ego_dp_versioning.sql @@ -606,9 +606,9 @@ SELECT scenario_log('eGo_DP','v0.4.5','result','supply','ego_aggr_weather','ego_ -- pf data check ---INSERT INTO grid.ego_pf_hv_data_check --- SELECT * --- FROM model_draft.ego_grid_pf_hv_data_check; +INSERT INTO grid.ego_pf_hv_data_check + SELECT * + FROM model_draft.ego_grid_pf_hv_data_check; -- scenario log (project,version,io,schema_name,table_name,script_name,comment) ---SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning'); +SELECT scenario_log('eGo_DP','v0.4.5','result','grid','ego_pf_hv_data_check','ego_dp_versioning.sql','versioning');