diff --git a/src/solver/application/ScenarioBuilderOwner.cpp b/src/solver/application/ScenarioBuilderOwner.cpp index 11c1f5e1a9..ef6084fed5 100644 --- a/src/solver/application/ScenarioBuilderOwner.cpp +++ b/src/solver/application/ScenarioBuilderOwner.cpp @@ -25,8 +25,6 @@ #include "antares/solver/simulation/timeseries-numbers.h" #include "antares/solver/ts-generator/generator.h" #include "antares/study/study.h" -#include "antares/solver/simulation/hydro-final-reservoir-level-functions.h" - Antares::Solver::ScenarioBuilderOwner::ScenarioBuilderOwner(Data::Study& study): study_(study) diff --git a/src/solver/hydro/CMakeLists.txt b/src/solver/hydro/CMakeLists.txt index 6cbabee29d..657c52e17a 100644 --- a/src/solver/hydro/CMakeLists.txt +++ b/src/solver/hydro/CMakeLists.txt @@ -58,6 +58,8 @@ 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 ) diff --git a/src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h b/src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h index 90536fba7e..f45f1712ca 100644 --- a/src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h +++ b/src/solver/hydro/include/antares/solver/hydro/management/HydroInputsChecker.h @@ -23,7 +23,6 @@ #include "antares/date/date.h" #include "antares/solver/hydro/management/MinGenerationScaling.h" #include "antares/solver/hydro/management/PrepareInflows.h" -#include "antares/solver/simulation/hydro-final-reservoir-level-functions.h" #include "antares/study/study.h" namespace Antares { diff --git a/src/solver/simulation/include/antares/solver/simulation/hydro-final-reservoir-level-functions.h b/src/solver/hydro/include/antares/solver/hydro/management/hydro-final-reservoir-level-functions.h similarity index 100% rename from src/solver/simulation/include/antares/solver/simulation/hydro-final-reservoir-level-functions.h rename to src/solver/hydro/include/antares/solver/hydro/management/hydro-final-reservoir-level-functions.h diff --git a/src/solver/hydro/management/HydroInputsChecker.cpp b/src/solver/hydro/management/HydroInputsChecker.cpp index f220239fbd..613e760f74 100644 --- a/src/solver/hydro/management/HydroInputsChecker.cpp +++ b/src/solver/hydro/management/HydroInputsChecker.cpp @@ -24,6 +24,7 @@ #include #include "antares/antares/fatal-error.h" +#include "antares/solver/hydro/management/hydro-final-reservoir-level-functions.h" #include "antares/solver/hydro/monthly/h2o_m_donnees_annuelles.h" #include "antares/solver/hydro/monthly/h2o_m_fonctions.h" #include "antares/solver/simulation/common-eco-adq.h" diff --git a/src/solver/simulation/hydro-final-reservoir-level-functions.cpp b/src/solver/hydro/management/hydro-final-reservoir-level-functions.cpp similarity index 97% rename from src/solver/simulation/hydro-final-reservoir-level-functions.cpp rename to src/solver/hydro/management/hydro-final-reservoir-level-functions.cpp index e6b8fa7ef7..3aa1d7e426 100644 --- a/src/solver/simulation/hydro-final-reservoir-level-functions.cpp +++ b/src/solver/hydro/management/hydro-final-reservoir-level-functions.cpp @@ -25,9 +25,10 @@ ** SPDX-License-Identifier: licenceRef-GPL3_WITH_RTE-Exceptions */ -#include "antares/solver/simulation/hydro-final-reservoir-level-functions.h" -#include "antares/study/parts/hydro/finalLevelValidator.h" +#include "antares/solver/hydro/management/hydro-final-reservoir-level-functions.h" + #include +#include "antares/study/parts/hydro/finalLevelValidator.h" namespace Antares::Solver { diff --git a/src/solver/simulation/CMakeLists.txt b/src/solver/simulation/CMakeLists.txt index 6a5355ea56..fbfeb17f6a 100644 --- a/src/solver/simulation/CMakeLists.txt +++ b/src/solver/simulation/CMakeLists.txt @@ -44,8 +44,6 @@ set(SRC_SIMULATION include/antares/solver/simulation/adequacy_patch_runtime_data.h adequacy_patch_runtime_data.cpp include/antares/solver/simulation/ITimeSeriesNumbersWriter.h - include/antares/solver/simulation/hydro-final-reservoir-level-functions.h - hydro-final-reservoir-level-functions.cpp TimeSeriesNumbersWriter.cpp include/antares/solver/simulation/BindingConstraintsTimeSeriesNumbersWriter.h include/antares/solver/simulation/ISimulationObserver.h diff --git a/src/tests/src/solver/simulation/CMakeLists.txt b/src/tests/src/solver/simulation/CMakeLists.txt index 3ba8f09755..294005454b 100644 --- a/src/tests/src/solver/simulation/CMakeLists.txt +++ b/src/tests/src/solver/simulation/CMakeLists.txt @@ -1,5 +1,6 @@ # Useful variables definitions set(src_solver_simulation "${CMAKE_SOURCE_DIR}/solver/simulation") +set(src_solver_hydro "${CMAKE_SOURCE_DIR}/solver/hydro") set(src_libs_antares_study "${CMAKE_SOURCE_DIR}/libs/antares/study") set(SRC_TS_NUMBERS @@ -99,6 +100,7 @@ target_include_directories(test-hydro_final PRIVATE "${src_solver_simulation}" "${src_libs_antares_study}" + "${src_solver_hydro}" ) target_link_libraries(test-hydro_final PRIVATE diff --git a/src/tests/src/solver/simulation/test-hydro-final-reservoir-level-functions.cpp b/src/tests/src/solver/simulation/test-hydro-final-reservoir-level-functions.cpp index 4c38bd3214..70e4b62357 100644 --- a/src/tests/src/solver/simulation/test-hydro-final-reservoir-level-functions.cpp +++ b/src/tests/src/solver/simulation/test-hydro-final-reservoir-level-functions.cpp @@ -6,10 +6,11 @@ #define WIN32_LEAN_AND_MEAN #include -#include "include/antares/solver/simulation/hydro-final-reservoir-level-functions.h" -#include "include/antares/study/parts/hydro/finalLevelValidator.h" #include +#include "include/antares/solver/hydro/management/hydro-final-reservoir-level-functions.h" +#include "include/antares/study/parts/hydro/finalLevelValidator.h" + using namespace Antares::Solver; using namespace Antares::Data;