Collect hydro validation errors

src/libs/antares/study/CMakeLists.txt

@@ -122,8 +122,6 @@ set(SRC_STUDY_PART_HYDRO
         include/antares/study/parts/hydro/allocation.h
         include/antares/study/parts/hydro/allocation.hxx
         parts/hydro/allocation.cpp
-        include/antares/study/parts/hydro/finalLevelValidator.h
-        parts/hydro/finalLevelValidator.cpp
         include/antares/study/parts/hydro/hydromaxtimeseriesreader.h
         parts/hydro/hydromaxtimeseriesreader.cpp
 )

src/solver/hydro/CMakeLists.txt

@@ -58,8 +58,10 @@ set(SRC_MANAGEMENT
         management/MinGenerationScaling.cpp
         include/antares/solver/hydro/management/HydroInputsChecker.h
         management/HydroInputsChecker.cpp
-        include/antares/solver/hydro/management/hydro-final-reservoir-level-functions.h
-        management/hydro-final-reservoir-level-functions.cpp
+        include/antares/solver/hydro/management/HydroErrorsCollector.h
+        management/HydroErrorsCollector.cpp
+        include/antares/solver/hydro/management/finalLevelValidator.h
+        management/finalLevelValidator.cpp
 )
 
 

src/solver/hydro/include/antares/solver/hydro/management/HydroErrorsCollector.h

@@ -0,0 +1,42 @@
+/*
+** Copyright 2007-2024, RTE (https://www.rte-france.com)
+** See AUTHORS.txt
+** SPDX-License-Identifier: MPL-2.0
+** This file is part of Antares-Simulator,
+** Adequacy and Performance assessment for interconnected energy networks.
+**
+** Antares_Simulator is free software: you can redistribute it and/or modify
+** it under the terms of the Mozilla Public Licence 2.0 as published by
+** the Mozilla Foundation, either version 2 of the License, or
+** (at your option) any later version.
+**
+** Antares_Simulator is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** Mozilla Public Licence 2.0 for more details.
+**
+** You should have received a copy of the Mozilla Public Licence 2.0
+** along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
+*/
+
+#pragma once
+#include <map>
+#include <string>
+
+namespace Antares
+{
+class HydroErrorsCollector
+{
+public:
+    HydroErrorsCollector() = default;
+    void Collect(const std::string& area_name, const std::string& message);
+    void Collect(const std::string& message);
+    void CheckForFatalErrors() const;
+
+private:
+    std::map<std::string, unsigned int> area_errors_counter_;
+    bool errors_limit_reached_ = false;
+    bool stop_ = false;
+    // std::vector<std::string> fatal_errors_;
+};
+} // namespace Antares

src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h

@@ -21,6 +21,7 @@
 #pragma once
 #include <antares/study/area/area.h>
 #include "antares/date/date.h"
+#include "antares/solver/hydro/management/HydroErrorsCollector.h"
 #include "antares/solver/hydro/management/MinGenerationScaling.h"
 #include "antares/solver/hydro/management/PrepareInflows.h"
 #include "antares/study/study.h"
@@ -33,31 +34,31 @@ class HydroInputsChecker
 public:
     explicit HydroInputsChecker(Antares::Data::Study& study);
     void Execute(uint year);
+    void CheckForFatalErrors() const;
+    void CheckFinalReservoirLevelsConfiguration(uint year);
 
 private:
     Data::AreaList& areas_;
     const Data::Parameters& parameters_;
     const Date::Calendar& calendar_;
-    Data::SimulationMode simulationMode_;
-    const uint firstYear_;
-    const uint endYear_;
     PrepareInflows prepareInflows_;
     MinGenerationScaling minGenerationScaling_;
     const Data::TimeSeries::TS& scenarioInitialHydroLevels_;
     const Data::TimeSeries::TS& scenarioFinalHydroLevels_;
+    HydroErrorsCollector errorCollector_;
 
     //! return false if checkGenerationPowerConsistency or checkMinGeneration returns false
-    bool checkMonthlyMinGeneration(uint year, const Data::Area& area) const;
+    bool checkMonthlyMinGeneration(uint year, const Data::Area& area);
     //! check Yearly minimum generation is lower than available inflows
-    bool checkYearlyMinGeneration(uint year, const Data::Area& area) const;
+    bool checkYearlyMinGeneration(uint year, const Data::Area& area);
     //! check Weekly minimum generation is lower than available inflows
-    bool checkWeeklyMinGeneration(uint year, const Data::Area& area) const;
+    bool checkWeeklyMinGeneration(uint year, const Data::Area& area);
     //! check Hourly minimum generation is lower than available inflows
-    bool checkGenerationPowerConsistency(uint year) const;
+    bool checkGenerationPowerConsistency(uint year);
     //! return false if checkGenerationPowerConsistency or checkMinGeneration returns false
-    bool checksOnGenerationPowerBounds(uint year) const;
+    bool checksOnGenerationPowerBounds(uint year);
     //! check minimum generation is lower than available inflows
-    bool checkMinGeneration(uint year) const;
+    bool checkMinGeneration(uint year);
 };
 
 } // namespace Antares

src/libs/antares/study/include/antares/study/parts/hydro/finalLevelValidator.h → src/solver/hydro/include/antares/solver/hydro/management/finalLevelValidator.h

@@ -26,23 +26,30 @@
 */
 #pragma once
 
+#include "antares/solver/hydro/management/HydroErrorsCollector.h"
 #include "antares/study/parts/hydro/container.h"
 
-namespace Antares::Data
+namespace Antares
+{
+namespace Data
 {
 class PartHydro;
+}
 
+namespace Solver
+{
 class FinalLevelValidator
 {
 public:
-    FinalLevelValidator(PartHydro& hydro,
+    FinalLevelValidator(Antares::Data::PartHydro& hydro,
                         unsigned int areaIndex,
-                        const AreaName areaName,
+                        const Antares::Data::AreaName areaName,
                         double initialLevel,
                         double finalLevel,
                         const unsigned int year,
                         const unsigned int lastSimulationDay,
-                        const unsigned int firstMonthOfSimulation);
+                        const unsigned int firstMonthOfSimulation,
+                        HydroErrorsCollector& errorCollector);
     bool check();
     bool finalLevelFineForUse();
 
@@ -62,12 +69,16 @@ class FinalLevelValidator
     unsigned int firstMonthOfSimulation_ = 0;
 
     // Data from area
-    PartHydro& hydro_;
+    Antares::Data::PartHydro& hydro_;
     unsigned int areaIndex_;
-    const AreaName areaName_;
+    const Antares::Data::AreaName areaName_;
     double initialLevel_;
     double finalLevel_;
 
     bool finalLevelFineForUse_ = false;
+
+    // area input errors
+    HydroErrorsCollector& errorCollector_;
 };
-} // namespace Antares::Data
+} // namespace Solver
+} // namespace Antares

src/solver/hydro/management/HydroErrorsCollector.cpp

@@ -0,0 +1,36 @@
+#include "antares/solver/hydro/management/HydroErrorsCollector.h"
+
+#include <yuni/core/logs.h>
+
+#include "antares/antares/fatal-error.h"
+
+namespace Antares
+{
+void HydroErrorsCollector::Collect(const std::string& area_name, const std::string& message)
+{
+    logs.error() << "In Area " << area_name << " " << message;
+    area_errors_counter_[area_name]++;
+    errors_limit_reached_ = area_errors_counter_[area_name] > 10;
+    stop_ = true;
+
+    if (errors_limit_reached_)
+    {
+        throw FatalError("Hydro validation has failed !");
+    }
+}
+
+void HydroErrorsCollector::Collect(const std::string& message)
+{
+    logs.error() << message;
+    stop_ = true;
+}
+
+void HydroErrorsCollector::CheckForFatalErrors() const
+{
+    if (stop_ || errors_limit_reached_)
+    {
+        throw FatalError("Hydro validation has failed !");
+    }
+}
+
+} // namespace Antares