Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions gridpath/project/operations/carbon_tax.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ def load_model_data(
)
periods_file = os.path.join(
scenario_directory,
weather_iteration,
hydro_iteration,
availability_iteration,
subproblem,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,13 @@ def get_model_inputs_from_database(
FROM inputs_temporal_periods
WHERE temporal_scenario_id = {subscenarios.TEMPORAL_SCENARIO_ID}
)
AND period in (
SELECT DISTINCT period
FROM inputs_temporal
WHERE temporal_scenario_id = {subscenarios.TEMPORAL_SCENARIO_ID}
AND subproblem_id = {db_subproblem}
AND stage_id = {db_stage}
)
AND (project, base_net_requirement_scenario_id) IN (
SELECT project, base_net_requirement_scenario_id
FROM inputs_project_operational_chars
Expand All @@ -532,6 +539,13 @@ def get_model_inputs_from_database(
AND subproblem_id = {db_subproblem}
AND stage_id = {db_stage}
)
AND period in (
SELECT DISTINCT period
FROM inputs_temporal
WHERE temporal_scenario_id = {subscenarios.TEMPORAL_SCENARIO_ID}
AND subproblem_id = {db_subproblem}
AND stage_id = {db_stage}
)
AND (project, peak_deviation_demand_charge_scenario_id) IN (
SELECT project, peak_deviation_demand_charge_scenario_id
FROM inputs_project_operational_chars
Expand Down
Loading