Skip to content

Feature/adjust generator single #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfbunke merged 2 commits into from
Mar 22, 2018
Merged

Feature/adjust generator single #240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dc6f04
Include voltage_level column
Dec 20, 2017
47dc238
update meta data
Dec 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions dataprocessing/sql_snippets/ego_dp_powerflow_assignment_generator.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ CREATE TABLE model_draft.ego_supply_pf_generator_single (
w_id bigint,
aggr_id bigint,
source_name character varying,
voltage_level smallint,
CONSTRAINT generator_single_data_pkey PRIMARY KEY (scn_name, generator_id),
CONSTRAINT generator_data_source_fk FOREIGN KEY (source)
REFERENCES model_draft.ego_grid_pf_hv_source (source_id) MATCH SIMPLE
Expand All @@ -40,41 +41,41 @@ CREATE TABLE model_draft.ego_supply_pf_generator_single (

-- DELETE FROM model_draft.ego_supply_pf_generator_single WHERE scn_name = 'Status Quo';

INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name)
SELECT 'Status Quo', un_id, otg_id, capacity, fuel
INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name, voltage_level)
SELECT 'Status Quo', un_id, otg_id, capacity, fuel, voltage_level
FROM model_draft.ego_supply_conv_powerplant_sq_mview a
WHERE a.fuel <> 'pumped_storage' AND a.un_id IS NOT NULL AND a.capacity IS NOT NULL; -- pumped storage units are ignored here and will be listed in storage table

INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name)
SELECT 'Status Quo', un_id, otg_id, electrical_capacity/1000, generation_type
INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name, voltage_level)
SELECT 'Status Quo', un_id, otg_id, electrical_capacity/1000, generation_type, voltage_level
FROM model_draft.ego_supply_res_powerplant_sq_mview a
WHERE a.un_id IS NOT NULL AND a.electrical_capacity IS NOT NULL;

-- NEP 2035

-- DELETE FROM model_draft.ego_supply_pf_generator_single WHERE scn_name = 'NEP 2035';

INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name)
SELECT 'NEP 2035', un_id, otg_id, capacity, fuel
INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name, voltage_level)
SELECT 'NEP 2035', un_id, otg_id, capacity, fuel, voltage_level
FROM model_draft.ego_supply_conv_powerplant_nep2035_mview a
WHERE a.fuel <> 'pumped_storage' AND a.un_id IS NOT NULL AND a.capacity IS NOT NULL; -- pumped storage units are ignored here and will be listed in storage table

INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name)
SELECT 'NEP 2035', un_id, otg_id, electrical_capacity/1000, generation_type
INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name, voltage_level)
SELECT 'NEP 2035', un_id, otg_id, electrical_capacity/1000, generation_type, voltage_level
FROM model_draft.ego_supply_res_powerplant_nep2035_mview a
WHERE a.un_id IS NOT NULL AND a.electrical_capacity IS NOT NULL;

-- eGo 100

-- DELETE FROM model_draft.ego_supply_pf_generator_single WHERE scn_name = 'eGo 100';

INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name)
SELECT 'eGo 100', un_id, otg_id, capacity, fuel
INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name, voltage_level)
SELECT 'eGo 100', un_id, otg_id, capacity, fuel, voltage_level
FROM model_draft.ego_supply_conv_powerplant_ego100_mview a
WHERE a.fuel <> 'pumped_storage' AND a.un_id IS NOT NULL AND a.capacity IS NOT NULL; -- pumped storage units are ignored here and will be listed in storage table

INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name)
SELECT 'eGo 100', un_id, otg_id, electrical_capacity/1000, generation_type
INSERT INTO model_draft.ego_supply_pf_generator_single (scn_name, generator_id, bus, p_nom, source_name, voltage_level)
SELECT 'eGo 100', un_id, otg_id, electrical_capacity/1000, generation_type, voltage_level
FROM model_draft.ego_supply_res_powerplant_ego100_mview a
WHERE a.un_id IS NOT NULL AND a.electrical_capacity IS NOT NULL;

Expand Down Expand Up @@ -148,6 +149,9 @@ COMMENT ON TABLE model_draft.ego_supply_pf_generator_single IS
"Unit": "" },
{"Name": "aggr_id",
"Description": "aggregate id",
"Unit": "" },
{"Name": "voltage_level",
"Description": "voltage level to which the power plant is assigned",
"Unit": "" }],
"Changes":[
{"Name": "Mario Kropshofer",
Expand Down