Merge branch 'feature/pre-check-hydraulic-inputs' of https://github.c…

…om/AntaresSimulatorTeam/Antares_Simulator into feature/pre-check-hydraulic-inputs
AntaresSimulatorTeam · Jun 23, 2024 · 367c5f9 · 367c5f9
2 parents 147bba8 + 904806c
commit 367c5f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/solver/application/ScenarioBuilderOwner.cpp b/src/solver/application/ScenarioBuilderOwner.cpp
@@ -53,7 +53,7 @@ void Antares::Solver::ScenarioBuilderOwner::callScenarioBuilder()  {
     if (study_.parameters.useCustomScenario)
     {
         ApplyCustomScenario(study_);
-        CheckFinalReservoirLevelsConfiguration(study);
+        CheckFinalReservoirLevelsConfiguration(study_);
     }
 }
 
diff --git a/src/solver/hydro/management/management.cpp b/src/solver/hydro/management/management.cpp
@@ -202,7 +202,7 @@ void HydroManagement::prepareEffectiveDemand(
   HydroSpecificMap& hydro_specific_map)
 {
     areas_.each(
-      [this](Data::Area& area)
+      [this, &year, &hydro_specific_map](Data::Area& area)
       {
           auto& data = area.hydro.managementData[year];
           auto& hydro_specific = hydro_specific_map[&area];
@@ -216,7 +216,7 @@ void HydroManagement::prepareEffectiveDemand(
               double effectiveDemand = 0;
               // area.hydro.allocation is indexed by area index
               area.hydro.allocation.eachNonNull(
-                [this, &effectiveDemand, &day](unsigned areaIndex, double value)
+                [this, &effectiveDemand, &day, &hydro_specific_map](unsigned areaIndex, double value)
                 {
                     const auto* area = areas_.byIndex[areaIndex];
                     effectiveDemand += hydro_specific_map[area].daily[day].DLN * value;