Skip to content

minor db merge queries #1374

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
anamileva merged 2 commits into from
May 28, 2026
+8 −21
Merged

minor db merge queries #1374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a4706f
Minor SQL cost query fixes
eranschweitzer May 22, 2026
c2a3fa3
Remove merge on period from timepoint hurdle rate table
eranschweitzer May 22, 2026
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
23 changes: 5 additions & 18 deletions db/db_schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8934,8 +8934,7 @@ SELECT a.scenario_id,
startup_cost,
shutdown_cost,
tx_capacity_cost,
tx_hurdle_cost,
tx_hurdle_cost_by_timepoint
tx_hurdle_cost
FROM results_project_costs_capacity_agg AS a

LEFT JOIN
Expand All @@ -8945,7 +8944,7 @@ FROM results_project_costs_capacity_agg AS a
AND a.stage_id = b.stage_id
AND a.period = b.period
AND a.load_zone = b.load_zone
AND a.spinup_or_lookahead = b.spinup_or_lookahead
AND COALESCE(a.spinup_or_lookahead, 0) = COALESCE(b.spinup_or_lookahead, 0)
)

LEFT JOIN
Expand All @@ -8963,7 +8962,7 @@ FROM results_project_costs_capacity_agg AS a
AND a.stage_id = c.stage_id
AND a.period = c.period
AND a.load_zone = c.load_zone
AND a.spinup_or_lookahead = c.spinup_or_lookahead
AND COALESCE(a.spinup_or_lookahead, 0) = COALESCE(c.spinup_or_lookahead, 0)
)

LEFT JOIN
Expand All @@ -8973,17 +8972,7 @@ FROM results_project_costs_capacity_agg AS a
AND a.stage_id = d.stage_id
AND a.period = d.period
AND a.load_zone = d.load_zone
AND a.spinup_or_lookahead = d.spinup_or_lookahead
)

LEFT JOIN
results_transmission_hurdle_costs_by_timepoint_agg as e
ON (a.scenario_id = d.scenario_id
AND a.subproblem_id = d.subproblem_id
AND a.stage_id = d.stage_id
AND a.period = d.period
AND a.load_zone = d.load_zone
AND a.spinup_or_lookahead = d.spinup_or_lookahead
AND COALESCE(a.spinup_or_lookahead, 0) = COALESCE(d.spinup_or_lookahead, 0)
)
;

Expand All @@ -9003,7 +8992,6 @@ SELECT a.scenario_id,
shutdown_cost,
tx_capacity_cost,
tx_hurdle_cost,
tx_hurdle_cost_by_timepoint,
deliverable_capacity_cost
FROM (SELECT scenario_id,
subproblem_id,
Expand All @@ -9016,8 +9004,7 @@ FROM (SELECT scenario_id,
SUM(startup_cost) AS startup_cost,
SUM(shutdown_cost) AS shutdown_cost,
SUM(tx_capacity_cost) AS tx_capacity_cost,
SUM(tx_hurdle_cost) AS tx_hurdle_cost,
SUM(tx_hurdle_cost_by_timepoint) AS tx_hurdle_cost_by_timepoint
SUM(tx_hurdle_cost) AS tx_hurdle_cost
FROM results_costs_by_period_load_zone
GROUP BY scenario_id, subproblem_id, stage_id, period,
spinup_or_lookahead) AS a
Expand Down
6 changes: 3 additions & 3 deletions gridpath/project/operations/costs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,10 +745,10 @@ def process_results(db, c, scenario_id, subscenarios, quiet):
variable_om_cost, fuel_cost, startup_cost, shutdown_cost)
SELECT scenario_id, subproblem_id, stage_id, period, load_zone,
spinup_or_lookahead,
SUM(fuel_cost * timepoint_weight * number_of_hours_in_timepoint)
AS fuel_cost,
SUM(variable_om_cost * timepoint_weight * number_of_hours_in_timepoint)
SUM(variable_om_cost * timepoint_weight * number_of_hours_in_timepoint)
AS variable_om_cost,
SUM(fuel_cost * timepoint_weight * number_of_hours_in_timepoint)
AS fuel_cost,
SUM(startup_cost * timepoint_weight) AS startup_cost,
SUM(shutdown_cost * timepoint_weight) AS shutdown_cost
FROM results_project_timepoint
Expand Down
Loading