Fix

AntaresSimulatorTeam · Sep 12, 2024 · 69d4ef7 · 69d4ef7
1 parent ba54eed
commit 69d4ef7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp b/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp
@@ -205,12 +205,6 @@ int OPT_DecompteDesVariablesEtDesContraintesDuProblemeAOptimiser(PROBLEME_HEBDO*
                                                            variations (14a in the reference
                                                            document) */
         }
-        if (!Pump && !TurbEntreBornes && MonitorHourlyLev)
-        {
-            const std::string areaName(problemeHebdo->NomsDesPays[pays]);
-            throw FatalError("Level explicit modeling requires flexible generation in area "
-                             + areaName);
-        }
     }
 
     // Short term storage

diff --git a/src/solver/simulation/include/antares/solver/simulation/sim_structure_probleme_economique.h b/src/solver/simulation/include/antares/solver/simulation/sim_structure_probleme_economique.h
@@ -302,7 +302,7 @@ struct ENERGIES_ET_PUISSANCES_HYDRAULIQUES
 
     bool TurbinageEntreBornes;
     bool SansHeuristique;
-    const bool SuiviNiveauHoraire = true;
+    bool SuiviNiveauHoraire;
 
     std::vector<double> NiveauHoraireSup;
     std::vector<double> NiveauHoraireInf;

diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp
@@ -185,6 +185,8 @@ void SIM_InitialisationProblemeHebdo(Data::Study& study,
                                                                               .useHeuristicTarget
                                                                            || area.hydro.useLeeway);
 
+        problem.CaracteristiquesHydrauliques[i].SuiviNiveauHoraire = area.hydro.reservoirManagement;
+
         problem.CaracteristiquesHydrauliques[i].DirectLevelAccess = false;
         problem.CaracteristiquesHydrauliques[i].AccurateWaterValue = false;
         if (problem.WaterValueAccurate && area.hydro.useWaterValue)