fixed a problem for ScaColumn

SKA-ScienceDataProcessor · Aug 7, 2015 · aff3607 · aff3607
1 parent 2757064
commit aff3607
Show file tree

Hide file tree

Showing 32 changed files with 27 additions and 29 deletions.
diff --git a/AdiosStMan.cc b/AdiosStMan.cc
diff --git a/AdiosStMan.h b/AdiosStMan.h
@@ -49,8 +49,8 @@ namespace casacore {
     {
         public:
 
-//            AdiosStMan(string aMethod="POSIX", string aPara="", uint64_t writeBufsize=1000, uint64_t readBufsize=2000);
-            AdiosStMan(string aMethod="MPI_AGGREGATE", string aPara="num_aggregators=24, num_ost=24", uint64_t writeBufsize=1000, uint64_t readBufsize=2000);
+            AdiosStMan(string aMethod="POSIX", string aPara="", uint64_t writeBufsize=1000, uint64_t readBufsize=2000);
+//            AdiosStMan(string aMethod="MPI_AGGREGATE", string aPara="num_aggregators=24, num_ost=24", uint64_t writeBufsize=1000, uint64_t readBufsize=2000);
             ~AdiosStMan();
 
             virtual DataManager* clone() const;

diff --git a/AdiosStManColumn.cc b/AdiosStManColumn.cc
diff --git a/AdiosStManColumn.h b/AdiosStManColumn.h
diff --git a/AdiosStManDirColumn.cc b/AdiosStManDirColumn.cc
diff --git a/AdiosStManDirColumn.h b/AdiosStManDirColumn.h
diff --git a/AdiosStManGlobal.h b/AdiosStManGlobal.h
diff --git a/AdiosStManIndColumn.cc b/AdiosStManIndColumn.cc
diff --git a/AdiosStManIndColumn.h b/AdiosStManIndColumn.h
diff --git a/AdiosStManScaColumn.cc b/AdiosStManScaColumn.cc
@@ -71,51 +71,51 @@ namespace casacore {
             }
         }
         if (itsAdiosWriteIDs){
-            delete itsAdiosWriteIDs;
+            delete [] itsAdiosWriteIDs;
         }
     }
 
     // *** access a row for a scalar column ***
     // put
     void AdiosStManScaColumn::putBoolV (uInt rownr, const Bool* dataPtr){
-        if(columnCache == 0) {columnCache = new Bool[itsStManPtr->getNrRows()];}
-        ((Bool*)columnCache)[rownr] = *dataPtr;
+        itsStManPtr->adiosWriteOpen();
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
     }
     void AdiosStManScaColumn::putuCharV (uInt rownr, const uChar* dataPtr){
-        if(columnCache == 0) {columnCache = new uChar[itsStManPtr->getNrRows()];}
-        ((uChar*)columnCache)[rownr] = *dataPtr;
+        itsStManPtr->adiosWriteOpen();
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
     }
     void AdiosStManScaColumn::putShortV (uInt rownr, const Short* dataPtr){
-        if(columnCache == 0) {columnCache = new Short[itsStManPtr->getNrRows()];}
-        ((Short*)columnCache)[rownr] = *dataPtr;
+        itsStManPtr->adiosWriteOpen();
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
     }
     void AdiosStManScaColumn::putuShortV (uInt rownr, const uShort* dataPtr){
-        if(columnCache == 0) {columnCache = new uShort[itsStManPtr->getNrRows()];}
-        ((uShort*)columnCache)[rownr] = *dataPtr;
+        itsStManPtr->adiosWriteOpen();
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
     }
     void AdiosStManScaColumn::putIntV (uInt rownr, const Int* dataPtr){
-        if(columnCache == 0) {columnCache = new Int[itsStManPtr->getNrRows()];}
-        ((Int*)columnCache)[rownr] = *dataPtr;
+        itsStManPtr->adiosWriteOpen();
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
     }
     void AdiosStManScaColumn::putuIntV (uInt rownr, const uInt* dataPtr){
-        if(columnCache == 0) {columnCache = new uInt[itsStManPtr->getNrRows()];}
-        ((uInt*)columnCache)[rownr] = *dataPtr;
+        itsStManPtr->adiosWriteOpen();
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
     }
     void AdiosStManScaColumn::putfloatV (uInt rownr, const float* dataPtr){
-        if(columnCache == 0) {columnCache = new float[itsStManPtr->getNrRows()];}
-        ((float*)columnCache)[rownr] = *dataPtr;
+        itsStManPtr->adiosWriteOpen();
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
     }
     void AdiosStManScaColumn::putdoubleV (uInt rownr, const double* dataPtr){
-        if(columnCache == 0) {columnCache = new double[itsStManPtr->getNrRows()];}
-        ((double*)columnCache)[rownr] = *dataPtr;
+        itsStManPtr->adiosWriteOpen();
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
     }
     void AdiosStManScaColumn::putComplexV (uInt rownr, const Complex* dataPtr){
-        if(columnCache == 0) {columnCache = new Complex[itsStManPtr->getNrRows()];}
-        ((Complex*)columnCache)[rownr] = *dataPtr;
+        itsStManPtr->adiosWriteOpen();
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
     }
     void AdiosStManScaColumn::putDComplexV (uInt rownr, const DComplex* dataPtr){
-        if(columnCache == 0) {columnCache = new DComplex[itsStManPtr->getNrRows()];}
-        ((DComplex*)columnCache)[rownr] = *dataPtr;
+        itsStManPtr->adiosWriteOpen();
+        adios_write_byid(itsStManPtr->getAdiosFile(), itsAdiosWriteIDs[rownr] , dataPtr);
     }
     void AdiosStManScaColumn::putStringV (uInt rownr, const String* dataPtr){
         cout << "AdiosStManColumn Error: Sorry, AdiosStMan does not support string type at the moment!" << endl;
@@ -182,12 +182,13 @@ namespace casacore {
     void AdiosStManScaColumn::initAdiosWrite(uInt aNrRows){
         itsStManPtr->logdbg("AdiosStManScaColumn::initAdiosWrite","start");
         if(!itsAdiosWriteIDs){
-            itsAdiosWriteIDs = new int64_t;
+            itsAdiosWriteIDs = new int64_t[aNrRows];
         }
         for(uInt j=0; j<aNrRows; j++){
-            stringstream NrRows;
+            stringstream NrRows, RowID;
             NrRows << aNrRows;
-            *itsAdiosWriteIDs = adios_define_var(itsStManPtr->getAdiosGroup(), itsColumnName.c_str(), "", itsAdiosDataType, NrRows.str().c_str(), NrRows.str().c_str(), "0" );
+            RowID << j;
+            itsAdiosWriteIDs[j] = adios_define_var(itsStManPtr->getAdiosGroup(), itsColumnName.c_str(), "", itsAdiosDataType, "1", NrRows.str().c_str(), RowID.str().c_str() );
         }
     }
 
@@ -209,9 +210,6 @@ namespace casacore {
     }
 
     void AdiosStManScaColumn::flush(){
-        itsStManPtr->logdbg("AdiosStManScaColumn::flush","");
-        itsStManPtr->adiosWriteOpen();
-        adios_write_byid(itsStManPtr->getAdiosFile(), *itsAdiosWriteIDs , (void*)columnCache);
     }
 }
 
diff --git a/AdiosStManScaColumn.h b/AdiosStManScaColumn.h
diff --git a/README.txt b/README.txt
diff --git a/benchmark/makefile b/benchmark/makefile
diff --git a/benchmark/ms_read_column.cc b/benchmark/ms_read_column.cc
diff --git a/benchmark/parallel_array_write.cc b/benchmark/parallel_array_write.cc
diff --git a/benchmark/parallel_array_write.py b/benchmark/parallel_array_write.py
diff --git a/benchmark/serial_array_write.cc b/benchmark/serial_array_write.cc
diff --git a/benchmark/serial_array_write.py b/benchmark/serial_array_write.py
diff --git a/benchmark/tictak.h b/benchmark/tictak.h
diff --git a/docs/AdiosStMan.pdf b/docs/AdiosStMan.pdf
diff --git a/docs/gpl-3.0.txt b/docs/gpl-3.0.txt
diff --git a/makefile b/makefile
diff --git a/tests/makefile b/tests/makefile
diff --git a/tests/readArr.cc b/tests/readArr.cc
diff --git a/tests/readArrColumn.cc b/tests/readArrColumn.cc
diff --git a/tests/readArrColumnSlice.cc b/tests/readArrColumnSlice.cc
diff --git a/tests/readScalar.cc b/tests/readScalar.cc
diff --git a/tests/writeArbArr.cc b/tests/writeArbArr.cc
diff --git a/tests/writeDirArr.cc b/tests/writeDirArr.cc
diff --git a/tests/writeFixArr.cc b/tests/writeFixArr.cc
diff --git a/tests/writeMPI.cc b/tests/writeMPI.cc
diff --git a/tests/writeScalar.cc b/tests/writeScalar.cc