update

AntaresSimulatorTeam · Jun 10, 2024 · 3eb714a · 3eb714a
1 parent fb01266
commit 3eb714a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/libs/antares/study/include/antares/study/parts/hydro/container.h b/src/libs/antares/study/include/antares/study/parts/hydro/container.h
@@ -36,7 +36,7 @@ enum dayYearCount
 };
 
 //! Temporary data
-struct TmpDataByArea
+struct HydroManagementData
 {
     //! Monthly local effective demand
     double MLE[12];
@@ -70,7 +70,7 @@ struct TmpDataByArea
     //! yearly total inflows
     double totalYearInflows;
 
-}; // struct TmpDataByArea
+}; // struct HydroManagementData
 
 /*!
 ** \brief Hydro for a single area
@@ -204,7 +204,7 @@ class PartHydro
     //        which contains other time.
     Matrix<double, double> dailyNbHoursAtGenPmax;
     Matrix<double, double> dailyNbHoursAtPumpPmax;
-    std::unordered_map<uint, TmpDataByArea> hydro_management_data;
+    std::unordered_map<uint, HydroManagementData> hydro_management_data;
 
 }; // class PartHydro
 

diff --git a/src/solver/hydro/include/antares/solver/hydro/management/management.h b/src/solver/hydro/include/antares/solver/hydro/management/management.h
@@ -103,7 +103,8 @@ class HydroManagement final
     //! Monthly target generations
     // note: inflows may have two different types, if in swap mode or not
     // \return The total inflow for the whole year
-    double prepareMonthlyTargetGenerations(Data::Area& area, Antares::Data::TmpDataByArea& data);
+    double prepareMonthlyTargetGenerations(Data::Area& area,
+                                           Antares::Data::HydroManagementData& data);
 
     void prepareDailyOptimalGenerations(Solver::Variable::State& state,
                                         uint y,

diff --git a/src/solver/hydro/management/daily.cpp b/src/solver/hydro/management/daily.cpp
@@ -94,7 +94,7 @@ struct DebugData
     std::array<double, 12> previousMonthWaste{0};
 
     Solver::IResultWriter& pWriter;
-    const Antares::Data::TmpDataByArea& data;
+    const Antares::Data::HydroManagementData& data;
     const VENTILATION_HYDRO_RESULTS_BY_AREA& ventilationResults;
     const double* srcinflows;
     const MaxPowerType& maxP;
@@ -104,7 +104,7 @@ struct DebugData
     const double reservoirCapacity;
 
     DebugData(Solver::IResultWriter& writer,
-              const Antares::Data::TmpDataByArea& data,
+              const Antares::Data::HydroManagementData& data,
               const VENTILATION_HYDRO_RESULTS_BY_AREA& ventilationResults,
               const double* srcinflows,
               const MaxPowerType& maxP,

diff --git a/src/solver/hydro/management/monthly.cpp b/src/solver/hydro/management/monthly.cpp
@@ -83,7 +83,7 @@ static void CheckHydroAllocationProblem(Data::Area& area,
 }
 
 double HydroManagement::prepareMonthlyTargetGenerations(Data::Area& area,
-                                                        Antares::Data::TmpDataByArea& data)
+                                                        Antares::Data::HydroManagementData& data)
 {
     double total = 0;