From 69d4ef731bba9d4c918e562bbe038b0f99feda17 Mon Sep 17 00:00:00 2001 From: OMNES Florian Date: Thu, 12 Sep 2024 16:56:51 +0200 Subject: [PATCH] Fix --- .../optimisation/opt_decompte_variables_et_contraintes.cpp | 6 ------ .../solver/simulation/sim_structure_probleme_economique.h | 2 +- src/solver/simulation/sim_calcul_economique.cpp | 2 ++ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp b/src/solver/optimisation/opt_decompte_variables_et_contraintes.cpp index 1f773bb9ea..fc857cdd82 100644 --- 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 index 506357e35e..65b16ead38 100644 --- 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 NiveauHoraireSup; std::vector NiveauHoraireInf; diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp index bc45b3048b..1204065ade 100644 --- 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)