refac: restructure CBA outputs to align with SB outputs; add benchmarks for CBA rules - #809
Open
measrainsey wants to merge 5 commits into
Open
refac: restructure CBA outputs to align with SB outputs; add benchmarks for CBA rules#809measrainsey wants to merge 5 commits into
measrainsey wants to merge 5 commits into
Conversation
otherwise it shares output path with `plot_weather_benchmark` rule and that can sometimes lead to issue when running collected scenario
for more information, see https://pre-commit.ci
This was
linked to
issues
Jul 27, 2026
measrainsey
marked this pull request as ready for review
July 30, 2026 09:00
Collaborator
|
@measrainsey concerning the duplication of the plots:
|
lisazeyen
approved these changes
Jul 31, 2026
lisazeyen
left a comment
Collaborator
There was a problem hiding this comment.
@measrainsey changes look good to me. We can tackle the duplication also in a separate issue. Just as a small clean up (not related to the changes in this PR), can we remove the uncommented rule
# rule plot_all_cba_benchmark:
# input:
# indicators=rules.combine_indicators.output.indicators,
# output:
# plot_dir=directory(RESULTS + "cba/validation/{planning_horizons}"),
# script:
# scripts("cba/plot_benchmark_indicators.py")
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes:
Changes proposed in this Pull Request
PR to restructure the CBA outputs to be more aligned with SB outputs and to add benchmarks for CBA rules
Tasks
Outputs (plots, indicators, etc)
The CBA outputs have been restructured to be more aligned with the SB outputs structure.
Single scenario run (e.g.,
NT)Outputs folder
results/NT/cba:Collection scenario run (e.g.,
NT-cyears)Individual climate year, such as
NT-cy2009:Collection of all climate years,
NT-cyears:Logs and benchmarks
Benchmarks have been added for CBA rules that did not have them before (in
benchmarks/[run]/peformances/cba/), as well as logs (inlogs/[run]/cba/). The exception for this would be thesolve_*rules in the CBA workflow, whose logs and benchmarks are saved in theresults/folder of the run instead. For example,solve_cba_msv_extraction:log: solver=RESULTS + "logs/cba/msv/{planning_horizons}_solver.log", memory=RESULTS + "logs/cba/msv/{planning_horizons}_memory.log", python=RESULTS + "logs/cba/msv/{planning_horizons}_python.log", benchmark: RESULTS + "benchmarks/performances/cba/msv/{planning_horizons}"Open issues
There seems to be duplication of plots in a number of places, when running
NT-cyears. For example, in theNT-cy2009folder:NT-cy2009/cba/graphs/[horizon]/ensemble_*_[horizon].pngplots in the look the same as in theNT-cy2009/cba/validation/[horizon]/project_t4_[horizon].pngNT-cy2009/cba/graphs/[horizon]/indicatorsare the same as inNT-cy2009/cba/graphs/[horizon]/summaryNotes
Checklist
Required:
doc/release_notes.md.If applicable:
scripts/lib/validation.config/test/*.yaml.pixi run -e open-tyndp tyndp-cyears-test).doc/*.mdfiles.doc/index.md.