feat: Multiple Hydro Rule Curves#2829
Merged
JasonMarechal25 merged 127 commits intodevelopfrom Apr 16, 2026
Merged
Conversation
…erage reservoir levels
…h input files reservoir levels should be loaded
This PR is based on the [PR about multiple hydro rule curves](#2829) (CR 24). It suggests quick and easy code improvements. --------- Co-authored-by: guilpier <guillaume.pierre_externe@rte-france.com>
|
flomnes
reviewed
Mar 25, 2026
| } | ||
|
|
||
| private: | ||
| bool load() final; |
Member
There was a problem hiding this comment.
Suggested change
| bool load() final; | |
| bool load() override final; |
Comment on lines
+105
to
+112
| ScenarizedRuleCurvesLoader(const std::filesystem::path& baseFolder, | ||
| const std::string& areaID, | ||
| TimeSeries& max, | ||
| TimeSeries& avg, | ||
| TimeSeries& min): | ||
| RuleCurvesLoader(baseFolder, areaID, max, avg, min) | ||
| { | ||
| } |
Member
There was a problem hiding this comment.
Simplification - use constructor delegation
Suggested change
| ScenarizedRuleCurvesLoader(const std::filesystem::path& baseFolder, | |
| const std::string& areaID, | |
| TimeSeries& max, | |
| TimeSeries& avg, | |
| TimeSeries& min): | |
| RuleCurvesLoader(baseFolder, areaID, max, avg, min) | |
| { | |
| } | |
| using RuleCurvesLoader::RuleCurvesLoader; |
Comment on lines
+88
to
+96
| StandardRuleCurvesLoader(const std::filesystem::path& baseFolder, | ||
| const std::string& areaID, | ||
| TimeSeries& max, | ||
| TimeSeries& avg, | ||
| TimeSeries& min): | ||
| RuleCurvesLoader(baseFolder, areaID, max, avg, min) | ||
|
|
||
| { | ||
| } |
Member
There was a problem hiding this comment.
Use constructor delegation - see below
|
|
||
| ### Input | ||
|
|
||
| #### New optional feature and compatibility flag for scenarized hydro reservoir levels |
Comment on lines
+477
to
+478
| const char* CompatibilityHydroRuleCurvesToCString( | ||
| const Parameters::Compatibility::HydroRuleCurves mode); |
Member
There was a problem hiding this comment.
unnecessary (no more save functions)
|
|
||
| auto& lowLevel = area.hydro.reservoirLevel[Data::PartHydro::minimum]; | ||
| uint32_t seriesIndex = area.hydro.series->ruleCurves.min.getSeriesIndex(y); | ||
| const auto& lowLevel = area.hydro.series->ruleCurves.min.timeSeries[seriesIndex]; |
Member
There was a problem hiding this comment.
Suggested change
| const auto& lowLevel = area.hydro.series->ruleCurves.min.timeSeries[seriesIndex]; | |
| const auto* lowLevel = area.hydro.series->ruleCurves.min.timeSeries[seriesIndex]; |
Comment on lines
+90
to
+92
| const auto& minRuleCurves = area.hydro.series->ruleCurves.min.getColumn(year); | ||
| const auto& avgRuleCurves = area.hydro.series->ruleCurves.avg.getColumn(year); | ||
| const auto& maxRuleCurves = area.hydro.series->ruleCurves.max.getColumn(year); |
Member
There was a problem hiding this comment.
Suggested change
| const auto& minRuleCurves = area.hydro.series->ruleCurves.min.getColumn(year); | |
| const auto& avgRuleCurves = area.hydro.series->ruleCurves.avg.getColumn(year); | |
| const auto& maxRuleCurves = area.hydro.series->ruleCurves.max.getColumn(year); | |
| const auto* minRuleCurves = area.hydro.series->ruleCurves.min.getColumn(year); | |
| const auto* avgRuleCurves = area.hydro.series->ruleCurves.avg.getColumn(year); | |
| const auto* maxRuleCurves = area.hydro.series->ruleCurves.max.getColumn(year); |
| else | ||
| { | ||
| auto& reservoirLevel = area.hydro.reservoirLevel[Data::PartHydro::average]; | ||
| const auto& ruleCurves = area.hydro.series->ruleCurves.avg.getColumn(y); |
Member
There was a problem hiding this comment.
Suggested change
| const auto& ruleCurves = area.hydro.series->ruleCurves.avg.getColumn(y); | |
| const auto* ruleCurves = area.hydro.series->ruleCurves.avg.getColumn(y); |
| .dayYear; | ||
| auto& minLvl = area.hydro.reservoirLevel[Data::PartHydro::minimum]; | ||
|
|
||
| const auto& minLvl = area.hydro.series->ruleCurves.min.getColumn( |
Member
There was a problem hiding this comment.
Suggested change
| const auto& minLvl = area.hydro.series->ruleCurves.min.getColumn( | |
| const auto* minLvl = area.hydro.series->ruleCurves.min.getColumn( |
| auto& maxLvl = area.hydro | ||
| .reservoirLevel[Data::PartHydro::maximum]; | ||
|
|
||
| const auto& maxLvl = area.hydro.series->ruleCurves.max |
Member
There was a problem hiding this comment.
Suggested change
| const auto& maxLvl = area.hydro.series->ruleCurves.max | |
| const auto* maxLvl = area.hydro.series->ruleCurves.max |
Contributor
|
Hi @flomnes I'll take a look asap. |
Member
|
@dusanparipovic I think I fixed most of the issues, the PR can finally be merged |
Contributor
If you want anything additional ping me, I'm looking for contribution on simulator :) @flomnes |
|
JasonMarechal25
approved these changes
Apr 16, 2026
JasonMarechal25
changed the title
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
5 participants
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.
This PR implements the Multiple Rule Curves for Hydro Reservoirs as an optional new feature, RTE-I's CR24.