From 3eaa8df294fb14abe5992f224ae767257bc58fb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Omn=C3=A8s?= Date: Thu, 12 Sep 2024 17:42:00 +0200 Subject: [PATCH] Remove unused CoutDeDefaillanceEnReserve (#2392) --- .../optimisation/opt_pilotage_optimisation_lineaire.cpp | 5 ----- .../solver/simulation/sim_structure_probleme_economique.h | 1 - src/solver/simulation/sim_alloc_probleme_hebdo.cpp | 1 - src/solver/simulation/sim_calcul_economique.cpp | 2 -- 4 files changed, 9 deletions(-) diff --git a/src/solver/optimisation/opt_pilotage_optimisation_lineaire.cpp b/src/solver/optimisation/opt_pilotage_optimisation_lineaire.cpp index 669b2943c9..de1732d43c 100644 --- a/src/solver/optimisation/opt_pilotage_optimisation_lineaire.cpp +++ b/src/solver/optimisation/opt_pilotage_optimisation_lineaire.cpp @@ -36,11 +36,6 @@ bool OPT_PilotageOptimisationLineaire(const OptimizationOptions& options, { if (problemeHebdo->TypeDOptimisation == OPTIMISATION_LINEAIRE) { - for (uint32_t pays = 0; pays < problemeHebdo->NombreDePays; pays++) - { - problemeHebdo->CoutDeDefaillanceEnReserve[pays] = 1.e+6; - } - problemeHebdo->NombreDeJours = (int)(problemeHebdo->NombreDePasDeTemps / problemeHebdo->NombreDePasDeTempsDUneJournee); 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 11d1ea116a..aa46e5962d 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 @@ -493,7 +493,6 @@ struct PROBLEME_HEBDO std::vector CoutDeDefaillancePositive; std::vector CoutDeDefaillanceNegative; - std::vector CoutDeDefaillanceEnReserve; std::vector PaliersThermiquesDuPays; std::vector CaracteristiquesHydrauliques; diff --git a/src/solver/simulation/sim_alloc_probleme_hebdo.cpp b/src/solver/simulation/sim_alloc_probleme_hebdo.cpp index 305d5fb31b..57f84225b1 100644 --- a/src/solver/simulation/sim_alloc_probleme_hebdo.cpp +++ b/src/solver/simulation/sim_alloc_probleme_hebdo.cpp @@ -84,7 +84,6 @@ void SIM_AllocationProblemeDonneesGenerales(PROBLEME_HEBDO& problem, problem.CoutDeDefaillancePositive.assign(nbPays, 0); problem.CoutDeDefaillanceNegative.assign(nbPays, 0); - problem.CoutDeDefaillanceEnReserve.assign(nbPays, 0); problem.NumeroDeContrainteEnergieHydraulique.assign(nbPays, 0); problem.NumeroDeContrainteMinEnergieHydraulique.assign(nbPays, 0); diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp index b6984936aa..f31d1e4523 100644 --- a/src/solver/simulation/sim_calcul_economique.cpp +++ b/src/solver/simulation/sim_calcul_economique.cpp @@ -152,8 +152,6 @@ void SIM_InitialisationProblemeHebdo(Data::Study& study, problem.CoutDeDefaillanceNegative[i] = area.thermal.spilledEnergyCost; - problem.CoutDeDefaillanceEnReserve[i] = area.thermal.unsuppliedEnergyCost; - problem.DefaillanceNegativeUtiliserPMinThermique[i] = (anoOtherDispatchPower & area.nodalOptimization) != 0;