Release 8.8.9 (#2393)

Reverts PR #2258 commit 8cc64f9.
AntaresSimulatorTeam · Sep 12, 2024 · eb52850 · eb52850
1 parent b3d5d60
commit eb52850
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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)