CDPP / AMDA_Kernel

Commit 6c587d7a5e44fb3c1a6773f400de4283d2407827

Authored by Hacene SI HADJ MOHAND
2 parents f4f69b71 266c1fa7
Exists in master and in 90 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5776, rm_6015, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_Kernel

Showing 1 changed file with 23 additions and 10 deletions   Show diff stats
Inline Side-by-side
src/amdaParameterInfo/Main.cc
  Diff comments   View file @6c587d7
@@ -76,16 +76,29 @@ int main(int argc, char *argv[]) { @@ -76,16 +76,29 @@ int main(int argc, char *argv[]) {
76 char stopTimeIso[24]; 76 char stopTimeIso[24];
77 memset(startTimeIso, 0, 24*sizeof(char)); 77 memset(startTimeIso, 0, 24*sizeof(char));
78 memset(stopTimeIso, 0, 24*sizeof(char)); 78 memset(stopTimeIso, 0, 24*sizeof(char));
79 -  
80 - for (int y = 1970; y < MAX_YEAR; ++y) {  
81 - ss << std::setfill('0') << y << "-01-01T00:00:00.000";  
82 - memcpy(startTimeIso, ss.str().c_str(), 24*sizeof(char));  
83 - double startTime = AMDA::TimeUtil::readTimeInIso(startTimeIso);  
84 - ss.str("");  
85 - ss << std::setfill('0') << y << "-12-31T23:59:59.000";  
86 - memcpy(stopTimeIso, ss.str().c_str(), 24*sizeof(char));  
87 - double stopTime = AMDA::TimeUtil::readTimeInIso(stopTimeIso);  
88 - parameterManager.addInputInterval(startTime, stopTime, 0, emptyStr, emptyStr, 0); 79 + double startTime = 0.;
  80 + double stopTime = 0.;
  81 +
  82 + std::vector<std::string> gran;
  83 + gran.push_back("-01-01T00:01:00.000");
  84 + gran.push_back("-01-01T01:00:00.000");
  85 + gran.push_back("-01-02T00:00:00.000");
  86 + gran.push_back("-02-01T00:00:00.000");
  87 + gran.push_back("-12-31T00:00:00.000");
  88 +
  89 +
  90 + for (std::vector<std::string>::iterator itGran = gran.begin(); itGran != gran.end(); ++itGran) {
  91 + for (int y = 1970; y < MAX_YEAR; ++y) {
  92 + ss.str("");
  93 + ss << std::setfill('0') << y << "-01-01T00:00:00.000";
  94 + memcpy(startTimeIso, ss.str().c_str(), 24*sizeof(char));
  95 + startTime = AMDA::TimeUtil::readTimeInIso(startTimeIso);
  96 + ss.str("");
  97 + ss << std::setfill('0') << y << (*itGran);
  98 + memcpy(stopTimeIso, ss.str().c_str(), 24*sizeof(char));
  99 + stopTime = AMDA::TimeUtil::readTimeInIso(stopTimeIso);
  100 + parameterManager.addInputInterval(startTime, stopTime, 0, emptyStr, emptyStr, 0);
  101 + }
89 } 102 }
90 103
91 if (!lProperties["app.param.gapthreshold"].empty()) 104 if (!lProperties["app.param.gapthreshold"].empty())