SuiviNiveauHoraire = true

AntaresSimulatorTeam · Sep 11, 2024 · de425d1 · de425d1
1 parent 862c092
commit de425d1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
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;
-    bool SuiviNiveauHoraire;
+    const bool SuiviNiveauHoraire = true;
 
     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,17 +185,11 @@ void SIM_InitialisationProblemeHebdo(Data::Study& study,
                                                                               .useHeuristicTarget
                                                                            || area.hydro.useLeeway);
 
-        problem.CaracteristiquesHydrauliques[i].SuiviNiveauHoraire
-          = area.hydro.reservoirManagement && (problem.OptimisationAuPasHebdomadaire)
-            && (!area.hydro.useHeuristicTarget
-                || problem.CaracteristiquesHydrauliques[i].PresenceDePompageModulable);
-
         problem.CaracteristiquesHydrauliques[i].DirectLevelAccess = false;
         problem.CaracteristiquesHydrauliques[i].AccurateWaterValue = false;
         if (problem.WaterValueAccurate && area.hydro.useWaterValue)
         {
             problem.CaracteristiquesHydrauliques[i].AccurateWaterValue = true;
-            problem.CaracteristiquesHydrauliques[i].SuiviNiveauHoraire = true;
             problem.CaracteristiquesHydrauliques[i].DirectLevelAccess = true;
         }