[DEV] Use getCoefficient instead of scratchpad for wind

AntaresSimulatorTeam · Oct 3, 2023 · 206781b · 206781b
1 parent 3448fad
commit 206781b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/libs/antares/study/parts/wind/series.cpp b/src/libs/antares/study/parts/wind/series.cpp
@@ -77,6 +77,11 @@ double* DataSeriesWind::getCoefficient(unsigned int year) const
     return timeSeries[getIndex(year)];
 }
 
+double DataSeriesWind::getCoefficient(const unsigned int year, const unsigned int hour) const
+{
+    return timeSeries[getIndex(year)][hour];
+}
+
 unsigned int DataSeriesWind::getIndex(unsigned int year) const
 {
     return (timeSeries.width != 1) ? timeseriesNumbers[0][year] : 0;

diff --git a/src/libs/antares/study/parts/wind/series.h b/src/libs/antares/study/parts/wind/series.h
@@ -47,6 +47,7 @@ class DataSeriesWind
     void markAsModified() const;
 
     double* getCoefficient(unsigned int year) const;
+    double getCoefficient(const unsigned int year, const unsigned int hour) const;
     unsigned int getIndex(unsigned int year) const;
 
 public:

diff --git a/src/solver/hydro/management/management.cpp b/src/solver/hydro/management/management.cpp
@@ -395,7 +395,7 @@ void HydroManagement::prepareNetDemand(uint numSpace, uint year)
             if (parameters_.renewableGeneration.isAggregated())
             {
                 netdemand = +scratchpad.ts.load[area.load.series->getIndex(year)][hour]
-                            - scratchpad.ts.wind[area.wind.series->getIndex(year)][hour] - scratchpad.miscGenSum[hour]
+                            - area.wind.series->getCoefficient(year, hour) - scratchpad.miscGenSum[hour]
                             - scratchpad.ts.solar[area.solar.series->getIndex(year)][hour] - ror[hour]
                             - ((ModeT != Data::stdmAdequacy) ? scratchpad.mustrunSum[hour]
                                                              : scratchpad.originalMustrunSum[hour]);

diff --git a/src/solver/simulation/sim_calcul_economique.cpp b/src/solver/simulation/sim_calcul_economique.cpp
@@ -569,7 +569,6 @@ void SIM_RenseignementProblemeHebdo(const Study& study,
             auto& area = *(study.areas.byIndex[k]);
             auto& scratchpad = area.scratchpad[numSpace];
             auto& ror = area.hydro.series->ror;
-            auto windSeriesIndex = area.wind.series->getIndex(problem.year);
             auto loadSeriesIndex = area.load.series->getIndex(problem.year);
             auto hydroSeriesIndex = area.hydro.series->getIndex(problem.year);
             auto solarSeriesIndex = area.solar.series->getIndex(problem.year);
@@ -580,7 +579,7 @@ void SIM_RenseignementProblemeHebdo(const Study& study,
             double& mustRunGen = problem.AllMustRunGeneration[hourInWeek].AllMustRunGenerationOfArea[k];
             if (parameters.renewableGeneration.isAggregated())
             {
-                mustRunGen = scratchpad.ts.wind[windSeriesIndex][hourInYear]
+                mustRunGen = area.wind.series->getCoefficient(problem.year, hourInYear)
                              + scratchpad.ts.solar[solarSeriesIndex][hourInYear]
                              + scratchpad.miscGenSum[hourInYear] + ror[tsFatalIndex][hourInYear]
                              + scratchpad.mustrunSum[hourInYear];