From eb52850ac02a24904e8d91ce891cbc97d0ea78fb Mon Sep 17 00:00:00 2001 From: payetvin <113102157+payetvin@users.noreply.github.com> Date: Thu, 12 Sep 2024 11:18:23 +0200 Subject: [PATCH] Release 8.8.9 (#2393) Reverts PR #2258 commit 8cc64f998723b7facb69a0fa2c63d47eeb175482. --- docs/CHANGELOG.md | 4 ++++ src/CMakeLists.txt | 2 +- src/solver/simulation/sim_calcul_economique.cpp | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 0524dc44e5..efb9c82a67 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ Antares Changelog ================= +8.8.9 (09/2024) +-------------------- +* Revert "Fix bug hydro heuristic with mingen (ANT-1825) (#2258)" + 8.8.8 (09/2024) -------------------- ## Bugfix diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6a587082ce..67ff5781cf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.14) # FetchContent_MakeAvailable # Version set(ANTARES_VERSION_HI 8) set(ANTARES_VERSION_LO 8) -set(ANTARES_VERSION_REVISION 8) +set(ANTARES_VERSION_REVISION 9) # Beta release set(ANTARES_BETA 0) diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp index 9c76279c5e..929c7d051d 100644 --- a/src/solver/simulation/sim_calcul_economique.cpp +++ b/src/solver/simulation/sim_calcul_economique.cpp @@ -785,6 +785,12 @@ void SIM_RenseignementProblemeHebdo(const Study& study, weekGenerationTarget = weekTarget_tmp; marginGen = weekGenerationTarget; + + if (problem.CaracteristiquesHydrauliques[k].NiveauInitialReservoir + < weekTarget_tmp) + { + marginGen = problem.CaracteristiquesHydrauliques[k].NiveauInitialReservoir; + } } if (not problem.CaracteristiquesHydrauliques[k].TurbinageEntreBornes)