[DEV] Removed file surtubines

AntaresSimulatorTeam · Sep 21, 2023 · 1157ea5 · 1157ea5
1 parent f948eb7
commit 1157ea5
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 133 deletions.
diff --git a/src/solver/hydro/CMakeLists.txt b/src/solver/hydro/CMakeLists.txt
@@ -12,7 +12,6 @@ set(SRC_EXT_SOLVER_H2O_DAILY
 	daily/h2o_j_instanciation.cpp
 	daily/h2o_j_optimiser_un_mois.cpp
 	daily/h2o_j_resoudre_le_probleme_lineaire.cpp
-	daily/h2o_j_lisser_les_sur_turbines.cpp
 	daily/h2o_j_sys.h
     daily/h2o_j_ajouter_bruit_au_cout.cpp
 )

diff --git a/src/solver/hydro/daily/h2o_j_fonctions.h b/src/solver/hydro/daily/h2o_j_fonctions.h
@@ -52,7 +52,6 @@ void H2O_j_ConstruireLesVariables(int,
 void H2O_J_InitialiserLesBornesdesVariables(DONNEES_MENSUELLES*, int);
 void H2O_J_InitialiserLeSecondMembre(DONNEES_MENSUELLES*, int);
 void H2O_J_ResoudreLeProblemeLineaire(DONNEES_MENSUELLES*, int);
-void H2O_J_LisserLesSurTurbines(DONNEES_MENSUELLES*, int);
 void H2O_J_AjouterBruitAuCout(DONNEES_MENSUELLES&);
 
 #endif /* __SOLVER_H2O_J_FONCTIONS__ */
diff --git a/src/solver/hydro/daily/h2o_j_lisser_les_sur_turbines.cpp b/src/solver/hydro/daily/h2o_j_lisser_les_sur_turbines.cpp
diff --git a/src/solver/hydro/daily/h2o_j_optimiser_un_mois.cpp b/src/solver/hydro/daily/h2o_j_optimiser_un_mois.cpp
@@ -52,7 +52,6 @@ void H2O_J_OptimiserUnMois(DONNEES_MENSUELLES* DonneesMensuelles)
     H2O_J_InitialiserLeSecondMembre(DonneesMensuelles, NumeroDeProbleme);
     H2O_J_InitialiserLesBornesdesVariables(DonneesMensuelles, NumeroDeProbleme);
     H2O_J_ResoudreLeProblemeLineaire(DonneesMensuelles, NumeroDeProbleme);
-    H2O_J_LisserLesSurTurbines(DonneesMensuelles, NumeroDeProbleme);
 
     return;
 }
diff --git a/src/solver/simulation/sim_alloc_probleme_hebdo.cpp b/src/solver/simulation/sim_alloc_probleme_hebdo.cpp
@@ -128,15 +128,12 @@ void SIM_AllocationProblemeDonneesGenerales(PROBLEME_HEBDO& problem,
     problem.previousYearFinalLevels.resize(0);
     if (problem.hydroHotStart)
     {
-        for (uint i = 0; i <= nbPays; i++)
+        if (std::any_of(study.areas.cbegin(), study.areas.cend(), [](const auto& pair)
+                    { return pair.second->hydro.reservoirManagement; }))
         {
-            auto& area = *(study.areas[i]);
-            if (area.hydro.reservoirManagement)
-            {
-                problem.previousYearFinalLevels.assign(nbPays, 0.);
-                break;
-            }
+            problem.previousYearFinalLevels.assign(nbPays, 0.);
         }
+
     }
 
     problem.ReserveJMoins1.resize(nbPays);