Skip to content

Commit

Permalink
GridPath v2025.4.0
Browse files Browse the repository at this point in the history 
GridPath v2025.4.0
  • Loading branch information
@anamileva
anamileva authored Feb 26, 2025
2 parents dd1d3fb + 717e9de commit dbe6608
Show file tree
Hide file tree
Showing 103 changed files with 1,008 additions and 557 deletions.
13 changes: 7 additions & 6 deletions db/csvs_test_examples/csv_structure.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ project/project_variable_om_curves,data_dependent,variable_om_curves_scenario_id
project/project_startup_chars,data_dependent,startup_chars_scenario_id,project_startup_chars,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_flex_load_static_profiles,data_dependent,flex_load_static_profile_scenario_id,project_flex_load_static_profiles,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_hydro_operational_chars,data_dependent,hydro_operational_chars_scenario_id,project_hydro_operational_chars,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_hydro_operational_chars/iterations,data_dependent,hydro_operational_chars_scenario_id,project_hydro_operational_chars_iterations,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_hydro_operational_chars/iterations,data_dependent,hydro_operational_chars_scenario_id,project_hydro_operational_chars_iterations,skip_subscenario,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_variable_generator_profiles,data_dependent,variable_generator_profile_scenario_id,project_variable_generator_profiles,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_variable_generator_profiles/iterations,data_dependent,variable_generator_profile_scenario_id,project_variable_generator_profiles_iterations,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_variable_generator_profiles/iterations,data_dependent,variable_generator_profile_scenario_id,project_variable_generator_profiles_iterations,skip_subscenario,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_energy_profiles,data_dependent,energy_profile_scenario_id,project_energy_profiles,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_energy_profiles/iterations,data_dependent,energy_profile_scenario_id,project_energy_profiles_iterations,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_energy_profiles/iterations,data_dependent,energy_profile_scenario_id,project_energy_profiles_iterations,skip_subscenario,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_energy_hrz_shaping,data_dependent,energy_hrz_shaping_scenario_id,project_energy_hrz_shaping,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_energy_hrz_shaping/iterations,data_dependent,energy_hrz_shaping_scenario_id,project_energy_hrz_shaping_iterations,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_energy_hrz_shaping/iterations,data_dependent,energy_hrz_shaping_scenario_id,project_energy_hrz_shaping_iterations,skip_subscenario,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_energy_slice_hrz_shaping,data_dependent,energy_slice_hrz_shaping_scenario_id,project_energy_slice_hrz_shaping,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_energy_slice_hrz_shaping/iterations,data_dependent,energy_slice_hrz_shaping_scenario_id,project_energy_slice_hrz_shaping_iterations,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_energy_slice_hrz_shaping/iterations,data_dependent,energy_slice_hrz_shaping_scenario_id,project_energy_slice_hrz_shaping_iterations,skip_subscenario,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/base_net_requirement,data_dependent,base_net_requirement_scenario_id,project_base_net_requirements,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/peak_deviation_demand_charge,data_dependent,peak_deviation_demand_charge_scenario_id,project_peak_deviation_demand_charges,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_stor_exog_soc,data_dependent,stor_exog_state_of_charge_scenario_id,project_stor_exog_state_of_charge,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_stor_exog_soc/iterations,data_dependent,stor_exog_state_of_charge_scenario_id,project_stor_exog_state_of_charge_iterations,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_stor_exog_soc/iterations,data_dependent,stor_exog_state_of_charge_scenario_id,project_stor_exog_state_of_charge_iterations,skip_subscenario,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_cycle_selection,data_dependent,cycle_selection_scenario_id,project_cycle_selection,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_supplemental_firing,data_dependent,supplemental_firing_scenario_id,project_supplemental_firing,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
project/project_cap_factor_limits,data_dependent,cap_factor_limits_scenario_id,project_cap_factor_limits,simple,,1,project,,,inputs_project_operational_chars,project_operational_chars_scenario_id
Expand Down Expand Up @@ -184,6 +184,7 @@ water/reservoirs,water,water_node_reservoir_scenario_id,system_water_node_reserv
water/flows,water,water_flow_scenario_id,system_water_flows,simple,,0,,,,,
water/flows/tmp_flow_bounds,water,water_flow_timepoint_bounds_scenario_id,system_water_flows_timepoint_bounds,simple,,1,water_link,,,inputs_system_water_flows,water_flow_scenario_id
water/flows/hrz_flow_bounds,water,water_flow_horizon_bounds_scenario_id,system_water_flows_horizon_bounds,simple,,1,water_link,,,inputs_system_water_flows,water_flow_scenario_id
water/flows/hrz_flow_bounds/upstream_node_map,water,water_flow_horizon_bounds_scenario_id,system_water_flows_horizon_bounds_upstream_node_map,simple,,1,water_link,,,inputs_system_water_flows,water_flow_scenario_id
water/flows/ramp_limits,water,water_flow_ramp_limit_scenario_id,system_water_flow_ramp_limits,simple,,1,water_link,,,inputs_system_water_flows,water_flow_scenario_id
water/flows/ramp_limits/bt_hrz_values,water,water_flow_ramp_limit_scenario_id,system_water_flow_ramp_limit_bt_hrz_values,simple,,1,water_link,,,inputs_system_water_flows,water_flow_scenario_id
water/powerhouses,water,water_powerhouse_scenario_id,system_water_powerhouses,simple,,0,,,,,
Expand Down
6 changes: 3 additions & 3 deletions db/csvs_test_examples/water/flows/hrz_flow_bounds/Water_Link_12-1-base_flows.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
balancing_type,horizon,min_bt_hrz_flow_avg_vol_per_second,max_bt_hrz_flow_avg_vol_per_second
half_day,1,,0.003
half_day,2,,0.003
balancing_type,horizon,min_bt_hrz_flow_avg_vol_per_second,max_bt_hrz_flow_avg_vol_per_second,threshold_side_stream_avg_vol_per_second
half_day,1,,0.003,
half_day,2,,0.003,
2 changes: 2 additions & 0 deletions ...est_examples/water/flows/hrz_flow_bounds/upstream_node_map/Water_Link_12-1-base_flows.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
upstream_water_node
Water_Node_1
4 changes: 2 additions & 2 deletions db/csvs_test_examples/water/reservoirs/target_volumes/Water_Node_1-1-base.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hydro_iteration,timepoint,reservoir_target_volume
1,1,23750
hydro_iteration,timepoint,reservoir_target_starting_volume,reservoir_target_ending_volume
1,1,23750,
4 changes: 2 additions & 2 deletions db/csvs_test_examples/water/reservoirs/target_volumes/Water_Node_2-1-base.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hydro_iteration,timepoint,reservoir_target_volume
1,1,1500
hydro_iteration,timepoint,reservoir_target_starting_volume,reservoir_target_ending_volume
1,1,1500,
4 changes: 2 additions & 2 deletions db/csvs_test_examples/water/reservoirs/target_volumes/Water_Node_3-1-base.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hydro_iteration,timepoint,reservoir_target_volume
1,1,62.5
hydro_iteration,timepoint,reservoir_target_starting_volume,reservoir_target_ending_volume
1,1,62.5,
86 changes: 45 additions & 41 deletions db/db_schema.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1198,11 +1198,12 @@ CREATE TABLE subscenarios_system_water_node_reservoirs_target_volumes
DROP TABLE IF EXISTS inputs_system_water_node_reservoirs_target_volumes;
CREATE TABLE inputs_system_water_node_reservoirs_target_volumes
(
water_node TEXT,
target_volume_scenario_id INTEGER,
hydro_iteration INTEGER DEFAULT 0 NOT NULL,
timepoint FLOAT,
reservoir_target_volume DECIMAL,
water_node TEXT,
target_volume_scenario_id INTEGER,
hydro_iteration INTEGER DEFAULT 0 NOT NULL,
timepoint FLOAT,
reservoir_target_starting_volume DECIMAL,
reservoir_target_ending_volume DECIMAL,
PRIMARY KEY (water_node, target_volume_scenario_id, timepoint,
hydro_iteration),
FOREIGN KEY (water_node, target_volume_scenario_id) REFERENCES
Expand Down Expand Up @@ -1347,15 +1348,39 @@ CREATE TABLE subscenarios_system_water_flows_horizon_bounds

DROP TABLE IF EXISTS inputs_system_water_flows_horizon_bounds;
CREATE TABLE inputs_system_water_flows_horizon_bounds
(
water_link TEXT,
water_flow_horizon_bounds_scenario_id INTEGER,
balancing_type TEXT,
horizon INTEGER,
min_bt_hrz_flow_avg_vol_per_second FLOAT,
max_bt_hrz_flow_avg_vol_per_second FLOAT,
threshold_side_stream_avg_vol_per_second FLOAT,
PRIMARY KEY (water_link, water_flow_horizon_bounds_scenario_id,
balancing_type, horizon),
FOREIGN KEY (water_link, water_flow_horizon_bounds_scenario_id) REFERENCES
subscenarios_system_water_flows_horizon_bounds
(water_link, water_flow_horizon_bounds_scenario_id)
);

DROP TABLE IF EXISTS subscenarios_system_water_flows_horizon_bounds_upstream_node_map;
CREATE TABLE subscenarios_system_water_flows_horizon_bounds_upstream_node_map
(
water_link TEXT,
water_flow_horizon_bounds_scenario_id INTEGER,
balancing_type TEXT,
horizon INTEGER,
min_bt_hrz_flow_avg_vol_per_second FLOAT,
max_bt_hrz_flow_avg_vol_per_second FLOAT,
name VARCHAR(32),
description VARCHAR(128),
PRIMARY KEY (water_link, water_flow_horizon_bounds_scenario_id)
);

DROP TABLE IF EXISTS inputs_system_water_flows_horizon_bounds_upstream_node_map;
CREATE TABLE inputs_system_water_flows_horizon_bounds_upstream_node_map
(
water_link TEXT,
water_flow_horizon_bounds_scenario_id INTEGER,
upstream_water_node TEXT,
PRIMARY KEY (water_link, water_flow_horizon_bounds_scenario_id,
balancing_type, horizon),
upstream_water_node),
FOREIGN KEY (water_link, water_flow_horizon_bounds_scenario_id) REFERENCES
subscenarios_system_water_flows_horizon_bounds
(water_link, water_flow_horizon_bounds_scenario_id)
Expand Down Expand Up @@ -2176,17 +2201,6 @@ CREATE TABLE inputs_project_variable_generator_profiles
(project, variable_generator_profile_scenario_id)
);

DROP TABLE IF EXISTS
subscenarios_project_variable_generator_profiles_iterations;
CREATE TABLE subscenarios_project_variable_generator_profiles_iterations
(
project VARCHAR(64),
variable_generator_profile_scenario_id INTEGER,
name VARCHAR(32),
description VARCHAR(128),
PRIMARY KEY (project, variable_generator_profile_scenario_id)
);

DROP TABLE IF EXISTS inputs_project_variable_generator_profiles_iterations;
CREATE TABLE inputs_project_variable_generator_profiles_iterations
(
Expand Down Expand Up @@ -2229,17 +2243,6 @@ CREATE TABLE inputs_project_hydro_operational_chars
(project, hydro_operational_chars_scenario_id)
);

DROP TABLE IF EXISTS
subscenarios_project_hydro_operational_chars_iterations;
CREATE TABLE subscenarios_project_hydro_operational_chars_iterations
(
project VARCHAR(64),
hydro_operational_chars_scenario_id INTEGER,
name VARCHAR(32),
description VARCHAR(128),
PRIMARY KEY (project, hydro_operational_chars_scenario_id)
);

DROP TABLE IF EXISTS inputs_project_hydro_operational_chars_iterations;
CREATE TABLE inputs_project_hydro_operational_chars_iterations
(
Expand Down Expand Up @@ -2557,14 +2560,14 @@ CREATE TABLE subscenarios_project_availability
DROP TABLE IF EXISTS inputs_project_availability;
CREATE TABLE inputs_project_availability
(
project_availability_scenario_id INTEGER,
project VARCHAR(64),
availability_type VARCHAR(32),
exogenous_availability_independent_scenario_id INTEGER,
exogenous_availability_weather_scenario_id INTEGER,
project_availability_scenario_id INTEGER,
project VARCHAR(64),
availability_type VARCHAR(32),
exogenous_availability_independent_scenario_id INTEGER,
exogenous_availability_weather_scenario_id INTEGER,
exogenous_availability_independent_bt_hrz_scenario_id INTEGER,
exogenous_availability_weather_bt_hrz_scenario_id INTEGER,
endogenous_availability_scenario_id INTEGER,
endogenous_availability_scenario_id INTEGER,
PRIMARY KEY (project_availability_scenario_id, project, availability_type)
);

Expand Down Expand Up @@ -2667,8 +2670,8 @@ CREATE TABLE inputs_project_availability_exogenous_weather_bt_hrz
exogenous_availability_weather_bt_hrz_scenario_id INTEGER,
weather_iteration INTEGER,
stage_id INTEGER,
balancing_type_project TEXT,
horizon INTEGER,
balancing_type_project TEXT,
horizon INTEGER,
availability_derate_weather_bt_hrz FLOAT,
PRIMARY KEY (project, exogenous_availability_weather_bt_hrz_scenario_id,
weather_iteration, stage_id, balancing_type_project, horizon),
Expand Down Expand Up @@ -6012,7 +6015,8 @@ CREATE TABLE results_transmission_period
fixed_cost FLOAT,
capacity_cost_wo_spinup_or_lookahead FLOAT,
PRIMARY KEY (scenario_id, transmission_line, period, weather_iteration,
hydro_iteration, subproblem_id, stage_id)
hydro_iteration, availability_iteration, subproblem_id,
stage_id)
);


Expand Down
Loading

0 comments on commit dbe6608

Please sign in to comment.