From ef945a792f8f16f12507acce716352b419328f2a Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Tue, 3 Oct 2023 15:11:35 +0200 Subject: [PATCH] [DEV] Remove NumeroChroniquesTireesParPays, struct NUMERO_CHRONIQUES_TIREES_PAR_PAYS --- .../aleatoire/alea_tirage_au_sort_chroniques.cpp | 10 ---------- src/solver/hydro/management/management.cpp | 2 -- src/solver/simulation/sim_allocation_tableaux.cpp | 6 ------ src/solver/simulation/sim_calcul_economique.cpp | 1 - src/solver/simulation/sim_extern_variables_globales.h | 1 - src/solver/simulation/sim_structure_donnees.h | 4 ---- src/solver/simulation/sim_variables_globales.cpp | 1 - 7 files changed, 25 deletions(-) diff --git a/src/solver/aleatoire/alea_tirage_au_sort_chroniques.cpp b/src/solver/aleatoire/alea_tirage_au_sort_chroniques.cpp index 8b95cd01db..3739933de0 100644 --- a/src/solver/aleatoire/alea_tirage_au_sort_chroniques.cpp +++ b/src/solver/aleatoire/alea_tirage_au_sort_chroniques.cpp @@ -37,16 +37,6 @@ void ApplyRandomTSnumbers(const Study& study, unsigned int year, uint numSpace) { - // each area - const unsigned int count = study.areas.size(); - for (unsigned int areaIndex = 0; areaIndex != count; ++areaIndex) - { - // Variables - the current area - NUMERO_CHRONIQUES_TIREES_PAR_PAYS& ptchro = NumeroChroniquesTireesParPays[numSpace][areaIndex]; - auto& area = *(study.areas.byIndex[areaIndex]); - - } // each area - // ------------------------------ // Transmission capacities // ------------------------------ diff --git a/src/solver/hydro/management/management.cpp b/src/solver/hydro/management/management.cpp index e1f0960ec9..49c2c30cfe 100644 --- a/src/solver/hydro/management/management.cpp +++ b/src/solver/hydro/management/management.cpp @@ -379,8 +379,6 @@ void HydroManagement::prepareNetDemand(uint numSpace, uint year) auto& scratchpad = area.scratchpad[numSpace]; - auto& ptchro = NumeroChroniquesTireesParPays[numSpace][z]; - auto& rormatrix = area.hydro.series->ror; auto tsIndex = area.hydro.series->getIndex(year); auto& ror = rormatrix[tsIndex < rormatrix.width ? tsIndex : 0]; diff --git a/src/solver/simulation/sim_allocation_tableaux.cpp b/src/solver/simulation/sim_allocation_tableaux.cpp index af7b21b159..3967b0fbd5 100644 --- a/src/solver/simulation/sim_allocation_tableaux.cpp +++ b/src/solver/simulation/sim_allocation_tableaux.cpp @@ -44,12 +44,6 @@ static void AllocateResultsForEconomicMode(const Data::Study& study) void SIM_AllocationTableaux(const Data::Study& study) { - NumeroChroniquesTireesParPays.resize(study.maxNbYearsInParallel); - - for (uint numSpace = 0; numSpace < study.maxNbYearsInParallel; numSpace++) - { - NumeroChroniquesTireesParPays[numSpace].resize(study.areas.size()); - } NumeroChroniquesTireesParInterconnexion.resize(study.maxNbYearsInParallel); const uint intercoCount = study.areas.areaLinkCount(); diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp index 6381cc6ec7..410d55fc3a 100644 --- a/src/solver/simulation/sim_calcul_economique.cpp +++ b/src/solver/simulation/sim_calcul_economique.cpp @@ -566,7 +566,6 @@ void SIM_RenseignementProblemeHebdo(const Study& study, for (uint k = 0; k < nbPays; ++k) { - auto& tsIndex = NumeroChroniquesTireesParPays[numSpace][k]; auto& area = *(study.areas.byIndex[k]); auto& scratchpad = area.scratchpad[numSpace]; auto& ror = area.hydro.series->ror; diff --git a/src/solver/simulation/sim_extern_variables_globales.h b/src/solver/simulation/sim_extern_variables_globales.h index f3561da2bb..421e8db76e 100644 --- a/src/solver/simulation/sim_extern_variables_globales.h +++ b/src/solver/simulation/sim_extern_variables_globales.h @@ -31,7 +31,6 @@ #include "sim_structure_probleme_economique.h" /* Valeurs generees de maniere aleatoire */ -extern std::vector> NumeroChroniquesTireesParPays; extern std::vector> NumeroChroniquesTireesParInterconnexion; extern std::vector> NumeroChroniquesTireesParGroup; diff --git a/src/solver/simulation/sim_structure_donnees.h b/src/solver/simulation/sim_structure_donnees.h index 4265bd754c..6b3431a735 100644 --- a/src/solver/simulation/sim_structure_donnees.h +++ b/src/solver/simulation/sim_structure_donnees.h @@ -29,10 +29,6 @@ #include -typedef struct -{ -} NUMERO_CHRONIQUES_TIREES_PAR_PAYS; - typedef struct { int TransmissionCapacities; diff --git a/src/solver/simulation/sim_variables_globales.cpp b/src/solver/simulation/sim_variables_globales.cpp index 2fcb42cdd2..e5fe936dc6 100644 --- a/src/solver/simulation/sim_variables_globales.cpp +++ b/src/solver/simulation/sim_variables_globales.cpp @@ -28,7 +28,6 @@ #include "sim_structure_donnees.h" #include "sim_structure_probleme_economique.h" -std::vector> NumeroChroniquesTireesParPays; std::vector> NumeroChroniquesTireesParInterconnexion; std::vector> transitMoyenInterconnexionsRecalculQuadratique;