Skip to content

Commit

Permalink
Merge branch 'develop' into Instant_pen
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexrob18
alexrob18 committed Sep 24, 2024
2 parents 53c67b4 + c4f1f00 commit 92f1490
Show file tree
Hide file tree
Showing 39 changed files with 304 additions and 220 deletions.
38 changes: 36 additions & 2 deletions db/db_schema.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1245,9 +1245,10 @@ DROP TABLE IF EXISTS subscenarios_project_relative_capacity_requirements_map;
CREATE TABLE subscenarios_project_relative_capacity_requirements_map
(
project VARCHAR(64),
prj_for_lim_map_id INTEGER PRIMARY KEY AUTOINCREMENT,
prj_for_lim_map_id INTEGER ,
name VARCHAR(32),
description VARCHAR(128)
description VARCHAR(128),
PRIMARY KEY (project, prj_for_lim_map_id)
);

DROP TABLE IF EXISTS inputs_project_relative_capacity_requirements_map;
Expand Down Expand Up @@ -6413,6 +6414,39 @@ FROM inputs_temporal
USING (temporal_scenario_id, stage_id, timepoint)
;

-- This view shows the possible operational horizons for each project based
-- based on its operational periods (see project_operational_periods), its
-- balancing type, and the periods-horizons mapping for that balancing type
-- (see periods_horizons). It also includes the operational type and the
-- hydro_operational_chars_scenario_id, since these are useful to slice out
-- operational types of interest (namely hydro) and join the hydro inputs,
-- which are indexed by project-horizon.
DROP VIEW IF EXISTS project_operational_horizons;
CREATE VIEW project_operational_horizons AS
SELECT project_portfolio_scenario_id,
project_operational_chars_scenario_id,
project_specified_capacity_scenario_id,
project_new_cost_scenario_id,
temporal_scenario_id,
operational_type,
hydro_operational_chars_scenario_id,
stage_id,
project,
balancing_type_project,
horizon
-- Get all projects in the portfolio (with their opchars)
FROM project_portfolio_opchars
-- Add all the periods horizons for the matching balancing type
LEFT OUTER JOIN
periods_horizons
ON (project_portfolio_opchars.balancing_type_project
= periods_horizons.balancing_type_horizon)
-- Only select horizons from the actual operational periods
INNER JOIN
project_operational_periods
USING (temporal_scenario_id, project, period)
;

-- This view shows the possible operational timepoints for each project based
-- based on its operational periods (see project_operational_periods), and
-- the timepoints in the temporal subscenario (see inputs_temporal). It also
Expand Down
6 changes: 3 additions & 3 deletions examples/2horizons_w_hydro/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202001 0.33333 0.16667 1.0
Hydro 202002 0.66667 0.16667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202001 0.33333 0.16667 1.0
Hydro day 202002 0.66667 0.16667 1.0
6 changes: 3 additions & 3 deletions ...zons_w_hydro_and_nuclear_binary_availability/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202001 0.333333 0.166667 1.0
Hydro 202002 0.666667 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202001 0.333333 0.166667 1.0
Hydro day 202002 0.666667 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/2horizons_w_hydro_w_balancing_types/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 2020 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro year 2020 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/multi_stage_prod_cost_w_hydro/1/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202001 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202001 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/multi_stage_prod_cost_w_hydro/1/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202001 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202001 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/multi_stage_prod_cost_w_hydro/1/3/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202001 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202001 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/multi_stage_prod_cost_w_hydro/2/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202002 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202002 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/multi_stage_prod_cost_w_hydro/2/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202002 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202002 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/multi_stage_prod_cost_w_hydro/2/3/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202002 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202002 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/multi_stage_prod_cost_w_hydro/3/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202003 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202003 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/multi_stage_prod_cost_w_hydro/3/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202003 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202003 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/multi_stage_prod_cost_w_hydro/3/3/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202003 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202003 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions ...ro_iteration_2010/availability_iteration_2/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 1 0.392070515 0.174664086 0.591861914
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 1 0.392070515 0.174664086 0.591861914
4 changes: 2 additions & 2 deletions ...ro_iteration_2010/availability_iteration_2/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 2 0.392070515 0.174664086 0.591861914
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 2 0.392070515 0.174664086 0.591861914
4 changes: 2 additions & 2 deletions ...ro_iteration_2011/availability_iteration_1/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 1 0.577652249 0.338706466 0.710315668
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 1 0.577652249 0.338706466 0.710315668
4 changes: 2 additions & 2 deletions ...ro_iteration_2011/availability_iteration_1/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 2 0.577652249 0.338706466 0.710315668
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 2 0.577652249 0.338706466 0.710315668
4 changes: 2 additions & 2 deletions ...ro_iteration_2010/availability_iteration_1/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 1 0.392070515 0.174664086 0.591861914
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 1 0.392070515 0.174664086 0.591861914
4 changes: 2 additions & 2 deletions ...ro_iteration_2010/availability_iteration_1/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 2 0.392070515 0.174664086 0.591861914
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 2 0.392070515 0.174664086 0.591861914
4 changes: 2 additions & 2 deletions ...ro_iteration_2011/availability_iteration_2/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 1 0.577652249 0.338706466 0.710315668
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 1 0.577652249 0.338706466 0.710315668
4 changes: 2 additions & 2 deletions ...ro_iteration_2011/availability_iteration_2/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 2 0.577652249 0.338706466 0.710315668
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 2 0.577652249 0.338706466 0.710315668
4 changes: 2 additions & 2 deletions ...ro_iteration_2010/availability_iteration_3/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 1 0.392070515 0.174664086 0.591861914
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 1 0.392070515 0.174664086 0.591861914
4 changes: 2 additions & 2 deletions ...ro_iteration_2010/availability_iteration_3/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 2 0.392070515 0.174664086 0.591861914
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 2 0.392070515 0.174664086 0.591861914
4 changes: 2 additions & 2 deletions ...ro_iteration_2011/availability_iteration_4/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 1 0.577652249 0.338706466 0.710315668
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 1 0.577652249 0.338706466 0.710315668
4 changes: 2 additions & 2 deletions ...ro_iteration_2011/availability_iteration_4/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 2 0.577652249 0.338706466 0.710315668
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 2 0.577652249 0.338706466 0.710315668
4 changes: 2 additions & 2 deletions ...ro_iteration_2010/availability_iteration_1/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 1 0.392070515 0.174664086 0.591861914
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 1 0.392070515 0.174664086 0.591861914
4 changes: 2 additions & 2 deletions ...ro_iteration_2010/availability_iteration_1/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 2 0.392070515 0.174664086 0.591861914
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro week 2 0.392070515 0.174664086 0.591861914
4 changes: 2 additions & 2 deletions ...stage_prod_cost_linked_subproblems_w_hydro/1/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202001 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202001 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions ...stage_prod_cost_linked_subproblems_w_hydro/2/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202002 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202002 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions ...stage_prod_cost_linked_subproblems_w_hydro/3/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202003 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202003 0.5 0.166667 1.0
4 changes: 2 additions & 2 deletions examples/test_w_hydro/inputs/hydro_conventional_horizon_params.tab
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro 202001 0.5 0.166667 1.0
project balancing_type_project horizon average_power_fraction min_power_fraction max_power_fraction
Hydro day 202001 0.5 0.166667 1.0
Loading

0 comments on commit 92f1490

Please sign in to comment.