From 2ca407491323df2e396228254ef675382618a18c Mon Sep 17 00:00:00 2001 From: Juliette-Gerbaux Date: Thu, 1 Aug 2024 13:58:51 +0200 Subject: [PATCH 1/2] Change lower bound --- .../hydro/daily/h2o_j_initialiser_les_bornes_des_variables.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/solver/hydro/daily/h2o_j_initialiser_les_bornes_des_variables.cpp b/src/solver/hydro/daily/h2o_j_initialiser_les_bornes_des_variables.cpp index 50f6e72bd5..fa7dab5a4c 100644 --- a/src/solver/hydro/daily/h2o_j_initialiser_les_bornes_des_variables.cpp +++ b/src/solver/hydro/daily/h2o_j_initialiser_les_bornes_des_variables.cpp @@ -53,7 +53,7 @@ void H2O_J_InitialiserLesBornesdesVariables(DONNEES_MENSUELLES* DonneesMensuelle int Var = CorrespondanceDesVariables.NumeroDeVariableTurbine[Pdt]; Xmax[Var] = TurbineMax[Pdt]; - Xmin[Var] = std::min(TurbineMax[Pdt], std::max(TurbineCible[Pdt], TurbineMin[Pdt])); + Xmin[Var] = std::min(TurbineMax[Pdt], TurbineMin[Pdt]); AdresseOuPlacerLaValeurDesVariablesOptimisees[Var] = &(Turbine[Pdt]); } From cf9f0d97a04b0def72b7bb21bfb041852af44068 Mon Sep 17 00:00:00 2001 From: Florian OMNES Date: Thu, 1 Aug 2024 14:25:48 +0200 Subject: [PATCH 2/2] Remove unused --- .../hydro/daily/h2o_j_initialiser_les_bornes_des_variables.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/solver/hydro/daily/h2o_j_initialiser_les_bornes_des_variables.cpp b/src/solver/hydro/daily/h2o_j_initialiser_les_bornes_des_variables.cpp index fa7dab5a4c..82c26a614f 100644 --- a/src/solver/hydro/daily/h2o_j_initialiser_les_bornes_des_variables.cpp +++ b/src/solver/hydro/daily/h2o_j_initialiser_les_bornes_des_variables.cpp @@ -29,7 +29,6 @@ void H2O_J_InitialiserLesBornesdesVariables(DONNEES_MENSUELLES* DonneesMensuelle { const std::vector& TurbineMax = DonneesMensuelles->TurbineMax; const std::vector& TurbineMin = DonneesMensuelles->TurbineMin; - const std::vector& TurbineCible = DonneesMensuelles->TurbineCible; std::vector& Turbine = DonneesMensuelles->Turbine; PROBLEME_HYDRAULIQUE& ProblemeHydraulique = DonneesMensuelles->ProblemeHydraulique;