Name convention

AntaresSimulatorTeam · Oct 3, 2023 · 0981477 · 0981477
1 parent dbb2407
commit 0981477
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/solver/aleatoire/alea_tirage_au_sort_chroniques.cpp b/src/solver/aleatoire/alea_tirage_au_sort_chroniques.cpp
@@ -71,7 +71,7 @@ void ApplyRandomTSnumbers(const Study& study,
         {
             const Data::DataSeriesHydro& data = *area.hydro.series;
             assert(year < data.timeseriesNumbersHydroMaxPower.height);
-            ptchro.HydrauliqueMaxPower = (data.getNbTimeSeriesSup() != 1)
+            ptchro.HydroMaxPower = (data.getNbTimeSeriesSup() != 1)
                                            ? (data.timeseriesNumbersHydroMaxPower[0][year])
                                            : 0; // zero-based
         }

diff --git a/src/solver/hydro/management/daily.cpp b/src/solver/hydro/management/daily.cpp
@@ -256,7 +256,7 @@ inline void HydroManagement::prepareDailyOptimalGenerations(Solver::Variable::St
 
     auto const& maxDailyGenEnergy = area.hydro.maxDailyGenEnergy;
 
-    uint tsIndexMaxPower = (NumeroChroniquesTireesParPays[numSpace][z]).HydrauliqueMaxPower;
+    uint tsIndexMaxPower = (NumeroChroniquesTireesParPays[numSpace][z]).HydroMaxPower;
 
     auto const& maxP = meanMaxDailyGenPower[tsIndexMaxPower];
     auto const& maxE = maxDailyGenEnergy[0];

diff --git a/src/solver/hydro/management/management.cpp b/src/solver/hydro/management/management.cpp
@@ -315,7 +315,7 @@ bool HydroManagement::checkGenerationPowerConsistency(uint numSpace) const
       {
           uint z = area.index;
           auto tsIndex = (uint)NumeroChroniquesTireesParPays[numSpace][z].Hydraulique;
-          auto tsIndexMaxPower = NumeroChroniquesTireesParPays[numSpace][z].HydrauliqueMaxPower;
+          auto tsIndexMaxPower = NumeroChroniquesTireesParPays[numSpace][z].HydroMaxPower;
 
           auto const& srcmingen = area.hydro.series->mingen;
           auto const& srcmaxgen = area.hydro.series->maxHourlyGenPower;

diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp
@@ -565,7 +565,7 @@ void SIM_RenseignementProblemeHebdo(const Study& study,
         for (uint k = 0; k < nbPays; ++k)
         {
             auto& tsIndex = NumeroChroniquesTireesParPays[numSpace][k];
-            uint tsIndexMaxPower = tsIndex.HydrauliqueMaxPower;
+            uint tsIndexMaxPower = tsIndex.HydroMaxPower;
             auto& area = *(study.areas.byIndex[k]);
             auto& scratchpad = area.scratchpad[numSpace];
             auto& ror = area.hydro.series->ror;
@@ -653,7 +653,7 @@ void SIM_RenseignementProblemeHebdo(const Study& study,
                 uint tsIndex = (NumeroChroniquesTireesParPays[numSpace][k]).Hydraulique;
                 auto& inflowsmatrix = area.hydro.series->storage;
                 auto const& srcinflows = inflowsmatrix[tsIndex < inflowsmatrix.width ? tsIndex : 0];
-                uint tsIndexMaxPower = (NumeroChroniquesTireesParPays[numSpace][k]).HydrauliqueMaxPower;
+                uint tsIndexMaxPower = (NumeroChroniquesTireesParPays[numSpace][k]).HydroMaxPower;
                 auto& scratchpad = area.scratchpad[numSpace];
                 auto& dailyMeanMaxGenPower = scratchpad.meanMaxDailyGenPower[tsIndexMaxPower];
                 auto& dailyMeanMaxPumpPower = scratchpad.meanMaxDailyPumpPower[tsIndexMaxPower];

diff --git a/src/solver/simulation/sim_structure_donnees.h b/src/solver/simulation/sim_structure_donnees.h
@@ -34,7 +34,7 @@ typedef struct
     std::vector<int> ThermiqueParPalier;
     std::vector<int> RenouvelableParPalier;
     int Hydraulique;
-    unsigned int HydrauliqueMaxPower;
+    unsigned int HydroMaxPower;
     int Eolien;
     int Consommation;
     int Solar;

diff --git a/src/solver/variable/economy/max-mrg.cpp b/src/solver/variable/economy/max-mrg.cpp
@@ -133,7 +133,7 @@ inline void PrepareMaxMRGFor(const State& state, double* opmrg, uint numSpace)
     uint loop = 100; // arbitrary - maximum number of iterations
 
     // Pmax
-    uint tsIndex = (NumeroChroniquesTireesParPays[numSpace][index]).HydrauliqueMaxPower;
+    uint tsIndex = (NumeroChroniquesTireesParPays[numSpace][index]).HydroMaxPower;
     auto& maxHourlyGenPowerMatrix = area.hydro.series->maxHourlyGenPower;
     const auto& P = maxHourlyGenPowerMatrix[tsIndex < maxHourlyGenPowerMatrix.width ? tsIndex : 0];