delete VfReader and rename PositionReader to ReaderMeasurePoints

src/gpu/core/Init/PositionReader.cpp

-#include "PositionReader.h"
-
-#include "Parameter/Parameter.h"
-
-#include <basics/utilities/UbFileInputASCII.h>
-
-using namespace vf::lbm::dir;
-
-//////////////////////////////////////////////////////////////////////////
-void PositionReader::readMeasurePoints( Parameter* para ) 
-{
-    UbFileInputASCII in(para->getmeasurePoints());
-    int numberOfAllNodes = in.readInteger();
-    in.readLine();
-    int tempLevel;
-    MeasurePoints tempMP;
-    //printf("done, init the values...\n");
-    for (int u = 0; u < numberOfAllNodes; u++)
-    {
-        tempMP.name = in.readString();         
-        //printf("done, read the name...\n");
-        tempMP.k = in.readInteger();
-        //printf("done, read k...\n");
-        tempLevel = in.readInteger();
-        //printf("done, read level...\n");
-        in.readLine();
-        //printf("done, read the values...\n");
-        para->getParH(tempLevel)->MP.push_back(tempMP);
-        //printf("done, put it into a vector...\n");
-    }
-}

src/gpu/core/Init/VfReader.cpp → src/gpu/core/Init/ReaderMeasurePoints.cpp

-#include "Init/VfReader.h"
+#include "ReaderMeasurePoints.h"
 
 #include "Parameter/Parameter.h"
-#include "Init/PositionReader.h"
 #include "GPU/CudaMemoryManager.h"
 
-////////////////////////////////////////////////////////////////////////////////
-void readMeasurePoints(Parameter* para, CudaMemoryManager* cudaMemoryManager)
+#include <basics/utilities/UbFileInputASCII.h>
+
+using namespace vf::lbm::dir;
+
+//////////////////////////////////////////////////////////////////////////
+void ReaderMeasurePoints::readMeasurePoints( Parameter* para ) 
 {
-    //read measure points from file
-    PositionReader::readMeasurePoints(para);
-    //printf("done, reading the file...\n");
-    //level loop
-    for (int lev = 0; lev <= para->getMaxLevel(); lev++)
+    UbFileInputASCII in(para->getmeasurePoints());
+    int numberOfAllNodes = in.readInteger();
+    in.readLine();
+    int tempLevel;
+    MeasurePoints tempMP;
+    //printf("done, init the values...\n");
+    for (int u = 0; u < numberOfAllNodes; u++)
     {
-        //set Memory Size and malloc of the indices and macroscopic values per level
-        para->getParH(lev)->numberOfValuesMP = (unsigned int)para->getParH(lev)->MP.size()*(unsigned int)para->getclockCycleForMP()/((unsigned int)para->getTimestepForMP());
+        tempMP.name = in.readString();         
+        //printf("done, read the name...\n");
+        tempMP.k = in.readInteger();
+        //printf("done, read k...\n");
+        tempLevel = in.readInteger();
+        //printf("done, read level...\n");
+        in.readLine();
+        //printf("done, read the values...\n");
+        para->getParH(tempLevel)->MP.push_back(tempMP);
+        //printf("done, put it into a vector...\n");
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ReaderMeasurePoints::readMeasurePoints(Parameter* para, CudaMemoryManager* cudaMemoryManager)
+{
+    // read measure points from file
+    ReaderMeasurePoints::readMeasurePoints(para);
+    // printf("done, reading the file...\n");
+    // level loop
+    for (int lev = 0; lev <= para->getMaxLevel(); lev++) {
+        // set Memory Size and malloc of the indices and macroscopic values per level
+        para->getParH(lev)->numberOfValuesMP = (unsigned int)para->getParH(lev)->MP.size() *
+                                               (unsigned int)para->getclockCycleForMP() /
+                                               ((unsigned int)para->getTimestepForMP());
         para->getParD(lev)->numberOfValuesMP = para->getParH(lev)->numberOfValuesMP;
 
         para->getParH(lev)->numberOfPointskMP = (int)para->getParH(lev)->MP.size();
         para->getParD(lev)->numberOfPointskMP = para->getParH(lev)->numberOfPointskMP;
 
-        para->getParH(lev)->memSizeIntkMP = sizeof(unsigned int)*(int)para->getParH(lev)->MP.size();
+        para->getParH(lev)->memSizeIntkMP = sizeof(unsigned int) * (int)para->getParH(lev)->MP.size();
         para->getParD(lev)->memSizeIntkMP = para->getParH(lev)->memSizeIntkMP;
 
-        para->getParH(lev)->memSizerealkMP = sizeof(real)*para->getParH(lev)->numberOfValuesMP;
-        para->getParD(lev)->memSizerealkMP = para->getParH(lev)->memSizerealkMP;        
-        
-        printf("Level: %d, numberOfValuesMP: %d, memSizeIntkMP: %d, memSizerealkMP: %d\n",lev,para->getParH(lev)->numberOfValuesMP,para->getParH(lev)->memSizeIntkMP, para->getParD(lev)->memSizerealkMP);
+        para->getParH(lev)->memSizerealkMP = sizeof(real) * para->getParH(lev)->numberOfValuesMP;
+        para->getParD(lev)->memSizerealkMP = para->getParH(lev)->memSizerealkMP;
+
+        printf("Level: %d, numberOfValuesMP: %d, memSizeIntkMP: %d, memSizerealkMP: %d\n", lev,
+               para->getParH(lev)->numberOfValuesMP, para->getParH(lev)->memSizeIntkMP, para->getParD(lev)->memSizerealkMP);
 
         cudaMemoryManager->cudaAllocMeasurePointsIndex(lev);
 
-        //loop over all measure points per level 
-        for(int index = 0; index < (int)para->getParH(lev)->MP.size(); index++)
-        {
-            //set indices
+        // loop over all measure points per level
+        for (int index = 0; index < (int)para->getParH(lev)->MP.size(); index++) {
+            // set indices
             para->getParH(lev)->kMP[index] = para->getParH(lev)->MP[index].k;
         }
-        //loop over all measure points per level times MPClockCycle
-        for(int index = 0; index < (int)para->getParH(lev)->numberOfValuesMP; index++)
-        {
-            //init values
-            para->getParH(lev)->VxMP[index]  = (real)0.0;
-            para->getParH(lev)->VyMP[index]  = (real)0.0;
-            para->getParH(lev)->VzMP[index]  = (real)0.0;
+        // loop over all measure points per level times MPClockCycle
+        for (int index = 0; index < (int)para->getParH(lev)->numberOfValuesMP; index++) {
+            // init values
+            para->getParH(lev)->VxMP[index] = (real)0.0;
+            para->getParH(lev)->VyMP[index] = (real)0.0;
+            para->getParH(lev)->VzMP[index] = (real)0.0;
             para->getParH(lev)->RhoMP[index] = (real)0.0;
         }
 
-        //copy indices-arrays
+        // copy indices-arrays
         cudaMemoryManager->cudaCopyMeasurePointsIndex(lev);
     }
 }
 ////////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-
-

src/gpu/core/Init/PositionReader.h → src/gpu/core/Init/ReaderMeasurePoints.h

@@ -2,11 +2,15 @@
 #define POSITION_READER_H
 
 class Parameter;
+class CudaMemoryManager;
 
-class PositionReader
+class ReaderMeasurePoints
 {
+private:
+    static void readMeasurePoints(Parameter* para);
+
 public:
-   static void readMeasurePoints(Parameter* para);
+    static void readMeasurePoints(Parameter* para, CudaMemoryManager* cudaMemoryManager);
 };
 
 #endif
\ No newline at end of file

src/gpu/core/Init/VfReader.h

-#ifndef VF_READER_H
-#define VF_READER_H
-
-
-class CudaMemoryManager;
-class Parameter;
-
-
-void readMeasurePoints(Parameter* para, CudaMemoryManager* cudaMemoryManager);
-
-#endif

src/gpu/core/LBM/Simulation.cpp

@@ -26,7 +26,7 @@
 #include "StringUtilities/StringUtil.h"
 //////////////////////////////////////////////////////////////////////////
 #include "Init/InitLattice.h"
-#include "Init/VfReader.h"
+#include "Init/ReaderMeasurePoints.h"
 //////////////////////////////////////////////////////////////////////////
 #include "FindQ/FindQ.h"
 #include "FindQ/DefineBCs.h"
@@ -245,7 +245,7 @@ void Simulation::init(GridProvider &gridProvider, BoundaryConditionFactory *bcFa
     //////////////////////////////////////////////////////////////////////////
     if (para->getUseMeasurePoints()) {
         VF_LOG_INFO("read measure points");
-        readMeasurePoints(para.get(), cudaMemoryManager.get());
+        ReaderMeasurePoints::readMeasurePoints(para.get(), cudaMemoryManager.get());
     }
 
     //////////////////////////////////////////////////////////////////////////