Hydro energy budgets by stage (blue-marble#1091)

milindsmart · Jan 31, 2024 · 738fbd7 · 738fbd7
1 parent 8b481a9
commit 738fbd7
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 25 deletions.
diff --git a/...ject/project_hydro_operational_chars/Hydro-1-project_hydro_operational_chars_2periods.csv b/...ject/project_hydro_operational_chars/Hydro-1-project_hydro_operational_chars_2periods.csv
@@ -1,7 +1,19 @@
-balancing_type_project,horizon,period,average_power_fraction,min_power_fraction,max_power_fraction
-day,202001,2020,0.5,0.166667,1
-day,202002,2020,0.5,0.166667,1
-day,202003,2020,0.5,0.166667,1
-day,203001,2030,0.5,0.166667,1
-day,203002,2030,0.5,0.166667,1
-day,203003,2030,0.5,0.166667,1
+stage_id,balancing_type_project,horizon,average_power_fraction,min_power_fraction,max_power_fraction
+1,day,202001,0.5,0.166667,1
+1,day,202002,0.5,0.166667,1
+1,day,202003,0.5,0.166667,1
+1,day,203001,0.5,0.166667,1
+1,day,203002,0.5,0.166667,1
+1,day,203003,0.5,0.166667,1
+2,day,202001,0.5,0.166667,1
+2,day,202002,0.5,0.166667,1
+2,day,202003,0.5,0.166667,1
+2,day,203001,0.5,0.166667,1
+2,day,203002,0.5,0.166667,1
+2,day,203003,0.5,0.166667,1
+3,day,202001,0.5,0.166667,1
+3,day,202002,0.5,0.166667,1
+3,day,202003,0.5,0.166667,1
+3,day,203001,0.5,0.166667,1
+3,day,203002,0.5,0.166667,1
+3,day,203003,0.5,0.166667,1
diff --git a/...ct/project_hydro_operational_chars/Hydro-2-project_hydro_operational_chars_2periods_2.csv b/...ct/project_hydro_operational_chars/Hydro-2-project_hydro_operational_chars_2periods_2.csv
@@ -1,7 +1,19 @@
-balancing_type_project,horizon,period,average_power_fraction,min_power_fraction,max_power_fraction
-day,202001,2020,0.33333,0.16667,1
-day,202002,2020,0.66667,0.16667,1
-day,202003,2020,0.66667,0.16667,1
-day,203001,2030,0.33333,0.16667,1
-day,203002,2030,0.66667,0.16667,1
-day,203003,2030,0.66667,0.16667,1
+stage_id,balancing_type_project,horizon,average_power_fraction,min_power_fraction,max_power_fraction
+1,day,202001,0.33333,0.16667,1
+1,day,202002,0.66667,0.16667,1
+1,day,202003,0.66667,0.16667,1
+1,day,203001,0.33333,0.16667,1
+1,day,203002,0.66667,0.16667,1
+1,day,203003,0.66667,0.16667,1
+2,day,202001,0.33333,0.16667,1
+2,day,202002,0.66667,0.16667,1
+2,day,202003,0.66667,0.16667,1
+2,day,203001,0.33333,0.16667,1
+2,day,203002,0.66667,0.16667,1
+2,day,203003,0.66667,0.16667,1
+3,day,202001,0.33333,0.16667,1
+3,day,202002,0.66667,0.16667,1
+3,day,202003,0.66667,0.16667,1
+3,day,203001,0.33333,0.16667,1
+3,day,203002,0.66667,0.16667,1
+3,day,203003,0.66667,0.16667,1
diff --git a/...ct/project_hydro_operational_chars/Hydro-3-project_hydro_operational_chars_2periods_3.csv b/...ct/project_hydro_operational_chars/Hydro-3-project_hydro_operational_chars_2periods_3.csv
@@ -1,2 +1,4 @@
-balancing_type_project,horizon,period,average_power_fraction,min_power_fraction,max_power_fraction
-year,2020,2020,0.5,0.166667,1
+stage_id,balancing_type_project,horizon,average_power_fraction,min_power_fraction,max_power_fraction
+1,year,2020,0.5,0.166667,1
+2,year,2020,0.5,0.166667,1
+3,year,2020,0.5,0.166667,1
diff --git a/...ct/project_hydro_operational_chars/Hydro-4-project_hydro_operational_chars_2periods_4.csv b/...ct/project_hydro_operational_chars/Hydro-4-project_hydro_operational_chars_2periods_4.csv
@@ -1,7 +1,19 @@
-balancing_type_project,horizon,period,average_power_fraction,min_power_fraction,max_power_fraction
-day,202001,2020,0.333333,0.166667,1
-day,202002,2020,0.666667,0.166667,1
-day,202003,2020,0.666667,0.166667,1
-day,203001,2030,0.333333,0.166667,1
-day,203002,2030,0.666667,0.166667,1
-day,203003,2030,0.666667,0.166667,1
+stage_id,balancing_type_project,horizon,average_power_fraction,min_power_fraction,max_power_fraction
+1,day,202001,0.333333,0.166667,1
+1,day,202002,0.666667,0.166667,1
+1,day,202003,0.666667,0.166667,1
+1,day,203001,0.333333,0.166667,1
+1,day,203002,0.666667,0.166667,1
+1,day,203003,0.666667,0.166667,1
+2,day,202001,0.333333,0.166667,1
+2,day,202002,0.666667,0.166667,1
+2,day,202003,0.666667,0.166667,1
+2,day,203001,0.333333,0.166667,1
+2,day,203002,0.666667,0.166667,1
+2,day,203003,0.666667,0.166667,1
+3,day,202001,0.333333,0.166667,1
+3,day,202002,0.666667,0.166667,1
+3,day,202003,0.666667,0.166667,1
+3,day,203001,0.333333,0.166667,1
+3,day,203002,0.666667,0.166667,1
+3,day,203003,0.666667,0.166667,1
diff --git a/db/db_schema.sql b/db/db_schema.sql
@@ -1565,13 +1565,13 @@ CREATE TABLE inputs_project_hydro_operational_chars
 (
     project                             VARCHAR(64),
     hydro_operational_chars_scenario_id INTEGER,
+    stage_id                            INTEGER,
     balancing_type_project              VARCHAR(64),
     horizon                             INTEGER,
-    period                              INTEGER,
     average_power_fraction              FLOAT,
     min_power_fraction                  FLOAT,
     max_power_fraction                  FLOAT,
-    PRIMARY KEY (project, hydro_operational_chars_scenario_id,
+    PRIMARY KEY (project, hydro_operational_chars_scenario_id, stage_id,
                  balancing_type_project, horizon),
     FOREIGN KEY (project, hydro_operational_chars_scenario_id) REFERENCES
         subscenarios_project_hydro_operational_chars

diff --git a/gridpath/project/operations/operational_types/common_functions.py b/gridpath/project/operations/operational_types/common_functions.py
@@ -706,6 +706,8 @@ def get_hydro_inputs_from_database(
             WHERE project_operational_chars_scenario_id
              = {subscenarios.PROJECT_OPERATIONAL_CHARS_SCENARIO_ID}
         )
+        -- Get the relevant stage
+        AND stage_id = {stage}
     ) as prj_tbl
     JOIN (
         SELECT DISTINCT balancing_type_horizon, horizon