Simplify TS numbers drawings, fix bug related to refresh & local thermal generation

src/solver/simulation/solver.hxx

@@ -307,6 +307,8 @@ void ISimulation<Impl>::run()
 
     ImplementationType::setNbPerformedYearsInParallel(pNbMaxPerformedYearsInParallel);
 
+    TSGenerator::ResizeGeneratedTimeSeries(study.areas, study.parameters);
+
     if (settings.tsGeneratorsOnly)
     {
         // Only the preprocessors can be used
@@ -318,7 +320,7 @@ void ISimulation<Impl>::run()
 
         // Destroy the TS Generators if any
         // It will export the time-series into the output in the same time
-        Solver::TSGenerator::DestroyAll(study);
+        TSGenerator::DestroyAll(study);
     }
     else
     {
@@ -365,7 +367,7 @@ void ISimulation<Impl>::run()
         }
         // Destroy the TS Generators if any
         // It will export the time-series into the output in the same time
-        Solver::TSGenerator::DestroyAll(study);
+        TSGenerator::DestroyAll(study);
 
         // Post operations
         {
@@ -444,7 +446,7 @@ void ISimulation<Impl>::regenerateTimeSeries(uint year)
     // * The option "Preprocessor" is checked in the interface _and_ year == 0
     // * Both options "Preprocessor" and "Refresh" are checked in the interface
     //   _and_ the refresh must be done for the given year (always done for the first year).
-    using namespace Solver::TSGenerator;
+    using namespace TSGenerator;
     // Load
     if (pData.haveToRefreshTSLoad && (year % pData.refreshIntervalLoad == 0))
     {

src/solver/simulation/timeseries-numbers.cpp

@@ -392,36 +392,28 @@ bool checkInterModalConsistencyForArea(Area& area,
     int indexTS = ts_to_tsIndex.at(timeSeriesLoad);
     if (isTSintermodal[indexTS])
     {
-        uint nbTimeSeries
-          = isTSgenerated[indexTS] ? parameters.nbTimeSeriesLoad : area.load.series.timeSeries.width;
-        listNumberTsOverArea.push_back(nbTimeSeries);
+        listNumberTsOverArea.push_back(area.load.series.timeSeries.width);
     }
 
     // Solar : Add solar's number of TS in area ...
     indexTS = ts_to_tsIndex.at(timeSeriesSolar);
     if (isTSintermodal[indexTS])
     {
-        uint nbTimeSeries
-          = isTSgenerated[indexTS] ? parameters.nbTimeSeriesSolar : area.solar.series.timeSeries.width;
-        listNumberTsOverArea.push_back(nbTimeSeries);
+        listNumberTsOverArea.push_back(area.solar.series.timeSeries.width);
     }
 
     // Wind : Add wind's number of TS in area ...
     indexTS = ts_to_tsIndex.at(timeSeriesWind);
     if (isTSintermodal[indexTS])
     {
-        uint nbTimeSeries
-          = isTSgenerated[indexTS] ? parameters.nbTimeSeriesWind : area.wind.series.timeSeries.width;
-        listNumberTsOverArea.push_back(nbTimeSeries);
+        listNumberTsOverArea.push_back(area.wind.series.timeSeries.width);
     }
 
     // Hydro : Add hydro's number of TS in area ...
     indexTS = ts_to_tsIndex.at(timeSeriesHydro);
     if (isTSintermodal[indexTS])
     {
-        uint nbTimeSeries
-          = isTSgenerated[indexTS] ? parameters.nbTimeSeriesHydro : area.hydro.series->TScount();
-        listNumberTsOverArea.push_back(nbTimeSeries);
+        listNumberTsOverArea.push_back(area.hydro.series->TScount());
     }
 
     // Thermal : Add thermal's number of TS of each cluster in area ...
@@ -432,9 +424,7 @@ bool checkInterModalConsistencyForArea(Area& area,
         for (uint j = 0; j != clusterCount; ++j)
         {
             auto& cluster = *(area.thermal.clusters[j]);
-            uint nbTimeSeries = isTSgenerated[indexTS] ? parameters.nbTimeSeriesThermal
-                                                       : cluster.series.timeSeries.width;
-            listNumberTsOverArea.push_back(nbTimeSeries);
+            listNumberTsOverArea.push_back(cluster.series.timeSeries.width);
         }
     }
 
@@ -595,10 +585,8 @@ void drawAndStoreTSnumbersForNOTintraModal(const array<bool, timeSeriesCount>& i
 
         if (!isTSintramodal[indexTS])
         {
-            uint nbTimeSeries = isTSgenerated[indexTS] ? nbTimeseriesByMode[indexTS]
-                                                       : area.load.series.timeSeries.width;
             area.load.series.timeseriesNumbers[0][year]
-              = (uint32_t)(floor(study.runtime->random[seedTimeseriesNumbers].next() * nbTimeSeries));
+              = (uint32_t)(floor(study.runtime->random[seedTimeseriesNumbers].next() * area.load.series.timeSeries.width));
         }
 
         // -------------
@@ -608,10 +596,8 @@ void drawAndStoreTSnumbersForNOTintraModal(const array<bool, timeSeriesCount>& i
 
         if (!isTSintramodal[indexTS])
         {
-            uint nbTimeSeries = isTSgenerated[indexTS] ? nbTimeseriesByMode[indexTS]
-                                                       : area.solar.series.timeSeries.width;
             area.solar.series.timeseriesNumbers[0][year]
-              = (uint32_t)(floor(study.runtime->random[seedTimeseriesNumbers].next() * nbTimeSeries));
+              = (uint32_t)(floor(study.runtime->random[seedTimeseriesNumbers].next() * area.solar.series.timeSeries.width));
         }
 
         // -------------
@@ -621,10 +607,8 @@ void drawAndStoreTSnumbersForNOTintraModal(const array<bool, timeSeriesCount>& i
 
         if (!isTSintramodal[indexTS])
         {
-            uint nbTimeSeries = isTSgenerated[indexTS] ? nbTimeseriesByMode[indexTS]
-                                                       : area.wind.series.timeSeries.width;
             area.wind.series.timeseriesNumbers[0][year]
-              = (uint32_t)(floor(study.runtime->random[seedTimeseriesNumbers].next() * nbTimeSeries));
+              = (uint32_t)(floor(study.runtime->random[seedTimeseriesNumbers].next() * area.wind.series.timeSeries.width));
         }
 
         // -------------
@@ -634,10 +618,8 @@ void drawAndStoreTSnumbersForNOTintraModal(const array<bool, timeSeriesCount>& i
 
         if (!isTSintramodal[indexTS])
         {
-            uint nbTimeSeries
-              = isTSgenerated[indexTS] ? nbTimeseriesByMode[indexTS] : area.hydro.series->ror.timeSeries.width;
             area.hydro.series->timeseriesNumbers[0][year]
-              = (uint32_t)(floor(study.runtime->random[seedTimeseriesNumbers].next() * nbTimeSeries));
+              = (uint32_t)(floor(study.runtime->random[seedTimeseriesNumbers].next() * area.hydro.series->TScount()));
         }
 
         // -------------
@@ -655,10 +637,8 @@ void drawAndStoreTSnumbersForNOTintraModal(const array<bool, timeSeriesCount>& i
             {
                 if (!isTSintramodal[indexTS])
                 {
-                    uint nbTimeSeries = isTSgenerated[indexTS] ? nbTimeseriesByMode[indexTS]
-                                                               : cluster->series.timeSeries.width;
                     cluster->series.timeseriesNumbers[0][year] = (uint32_t)(
-                      floor(study.runtime->random[seedTimeseriesNumbers].next() * nbTimeSeries));
+                      floor(study.runtime->random[seedTimeseriesNumbers].next() * cluster->series.timeSeries.width));
                 }
             }
         }

src/solver/ts-generator/generator.h

@@ -34,12 +34,11 @@
 #include <antares/writer/i_writer.h>
 #include "xcast/xcast.h"
 
-namespace Antares
-{
-namespace Solver
-{
-namespace TSGenerator
+namespace Antares::Solver::TSGenerator
 {
+
+void ResizeGeneratedTimeSeries(Data::AreaList& areas, Data::Parameters& params);
+
 /*!
 ** \brief Regenerate the time-series
 */
@@ -63,9 +62,7 @@ void DestroyAll(Data::Study& study);
 template<enum Data::TimeSeriesType T>
 void Destroy(Data::Study& study, uint year);
 
-} // namespace TSGenerator
-} // namespace Solver
-} // namespace Antares
+} // namespace Antares::Solver::TSGenerator
 
 #include "generator.hxx"
 

src/solver/ts-generator/generator.hxx

@@ -29,12 +29,52 @@
 
 #include <antares/logs/logs.h>
 
-namespace Antares
+namespace Antares::Solver::TSGenerator
 {
-namespace Solver
-{
-namespace TSGenerator
+
+inline void ResizeGeneratedTimeSeries(Data::AreaList& areas, Data::Parameters& params)
 {
+    for (auto i = areas.begin(); i != areas.end(); ++i)
+    {
+        auto& area = *(i->second);
+
+        // Load
+        if (params.timeSeriesToGenerate & Data::timeSeriesLoad)
+        {
+            area.load.series.timeSeries.reset(params.nbTimeSeriesLoad, HOURS_PER_YEAR);
+        }
+
+        // Wind
+        if (params.timeSeriesToGenerate & Data::timeSeriesWind)
+        {
+            area.wind.series.timeSeries.reset(params.nbTimeSeriesWind, HOURS_PER_YEAR);
+        }
+
+        // Solar
+        if (params.timeSeriesToGenerate & Data::timeSeriesSolar)
+        {
+            area.solar.series.timeSeries.reset(params.nbTimeSeriesSolar, HOURS_PER_YEAR);
+        }
+
+        // Hydro
+        if (params.timeSeriesToGenerate & Data::timeSeriesHydro)
+        {
+            area.hydro.series->resizeRORandSTORAGE(params.nbTimeSeriesHydro);
+        }
+
+        // Thermal
+        auto end = area.thermal.list.mapping.end();
+        for (auto it = area.thermal.list.mapping.begin(); it != end; ++it)
+        {
+            auto& cluster = *(it->second);
+            bool globalThermalTSgeneration = params.timeSeriesToGenerate & Data::timeSeriesThermal;
+            if (cluster.doWeGenerateTS(globalThermalTSgeneration))
+                cluster.series.timeSeries.resize(params.nbTimeSeriesThermal, HOURS_PER_YEAR);
+        }
+    }
+}
+
+
 // forward declaration
 // Hydro - see hydro.cpp
 bool GenerateHydroTimeSeries(Data::Study& study, uint year, IResultWriter& writer);
@@ -157,8 +197,6 @@ inline void DestroyAll(Data::Study& study)
     Solver::TSGenerator::Destroy<Data::timeSeriesThermal>(study, (uint)-1);
 }
 
-} // namespace TSGenerator
-} // namespace Solver
-} // namespace Antares
+} // namespace Antares::Solver::TSGenerator
 
 #endif // __ANTARES_SOLVER_timeSeries_GENERATOR_HXX__

src/solver/ts-generator/hydro.cpp

@@ -46,12 +46,6 @@ namespace Solver
 {
 namespace TSGenerator
 {
-static void PreproHydroInitMatrices(Data::Study& study, uint tsCount)
-{
-    study.areas.each([&](Data::Area& area) {
-        area.hydro.series->resizeRORandSTORAGE(tsCount);
-    });
-}
 
 static void PreproRoundAllEntriesPlusDerated(Data::Study& study)
 {
@@ -155,8 +149,6 @@ bool GenerateHydroTimeSeries(Data::Study& study, uint currentYear, IResultWriter
 
     uint nbTimeseries = study.parameters.nbTimeSeriesHydro;
 
-    PreproHydroInitMatrices(study, nbTimeseries);
-
     long cumul = 0;
 
     for (uint l = 0; l != nbTimeseries; ++l)

src/solver/ts-generator/thermal.cpp

@@ -72,8 +72,6 @@ class GeneratorTempData final
 
     uint currentYear;
 
-    uint nbThermalTimeseries;
-
     bool derated;
 
 private:
@@ -89,6 +87,7 @@ class GeneratorTempData final
                                const T& duration);
 
 private:
+    uint nbThermalTimeseries_;
     const uint nbHoursPerYear = HOURS_PER_YEAR;
     const uint daysPerYear = DAYS_PER_YEAR;
 
@@ -130,7 +129,7 @@ GeneratorTempData::GeneratorTempData(Data::Study& study,
 
     archive = (0 != (parameters.timeSeriesToArchive & Data::timeSeriesThermal));
 
-    nbThermalTimeseries = parameters.nbTimeSeriesThermal;
+    nbThermalTimeseries_ = parameters.nbTimeSeriesThermal;
 
     derated = parameters.derated;
 }
@@ -251,15 +250,11 @@ void GeneratorTempData::operator()(Data::Area& area, Data::ThermalCluster& clust
 
     if (0 == cluster.unitCount or 0 == cluster.nominalCapacity)
     {
-        cluster.series.timeSeries.reset(1, nbHoursPerYear);
-
         if (archive)
             writeResultsToDisk(area, cluster);
         return;
     }
 
-    cluster.series.timeSeries.resize(nbThermalTimeseries, nbHoursPerYear);
-
     const auto& preproData = *(cluster.prepro);
 
     int AUN = (int)cluster.unitCount;
@@ -355,7 +350,7 @@ void GeneratorTempData::operator()(Data::Area& area, Data::ThermalCluster& clust
 
     double* dstSeries = nullptr;
 
-    const uint tsCount = nbThermalTimeseries + 2;
+    const uint tsCount = nbThermalTimeseries_ + 2;
     for (uint tsIndex = 0; tsIndex != tsCount; ++tsIndex)
     {
         uint hour = 0;

src/solver/ts-generator/xcast/studydata.hxx

@@ -57,11 +57,6 @@ void StudyData::loadFromStudy(Data::Study& study,
             logs.info() << "  Added the area '" << area.name << "'";
             localareas.push_back(&area);
         }
-        else
-        {
-            // resize and set the values for the matrix
-            predicate.matrix(area).reset(1, HOURS_PER_YEAR);
-        }
     }
     reloadDataFromAreaList(correlation);
 }