Use D3Q27.h from lbm in GridGenerator

src/gpu/GridGenerator/grid/GridInterface.cpp

@@ -40,6 +40,9 @@
 #include "grid/Field.h"
 #include "grid/NodeValues.h"
 
+#include "lbm/constants/D3Q27.h"
+
+using namespace vf::lbm;
 using namespace vf::gpu;
 
 GridInterface::GridInterface()
@@ -373,7 +376,7 @@ uint GridInterface::findOffsetCF(const uint& indexOnCoarseGrid, GridImp* coarseG
     Cell cell(x, y, z, coarseGrid->getDelta());
 
     if( coarseGrid->cellContainsOnly( cell, FLUID, FLUID_CFC ) ){
-        this->cf.offset[ interfaceIndex ] = REST;
+        this->cf.offset[ interfaceIndex ] = dir::REST;
         return indexOnCoarseGrid;
     }
 
@@ -408,7 +411,7 @@ uint GridInterface::findOffsetFC(const uint& indexOnFineGrid, GridImp* fineGrid,
     Cell cell(x, y, z, fineGrid->getDelta());
 
     if( fineGrid->cellContainsOnly( cell, FLUID, FLUID_FCF ) ){
-        this->fc.offset[ interfaceIndex ] = REST;
+        this->fc.offset[ interfaceIndex ] = dir::REST;
         return indexOnFineGrid;
     }
 

src/gpu/GridGenerator/grid/distributions/D3Q27.h

@@ -33,43 +33,6 @@
 #ifndef D3Q27_H_
 #define D3Q27_H_
 
-static constexpr int STARTDIR = 0;
-static constexpr int ENDDIR = 26;
-
-static constexpr int E = 0;
-static constexpr int W = 1;
-static constexpr int N = 2;
-static constexpr int S = 3;
-static constexpr int T = 4;
-static constexpr int B = 5;
-								  
-static constexpr int NE = 6;
-static constexpr int SW = 7;
-static constexpr int SE = 8;
-static constexpr int NW = 9;
-static constexpr int TE = 10;
-static constexpr int BW = 11;
-static constexpr int BE = 12;
-static constexpr int TW = 13;
-static constexpr int TN = 14;
-static constexpr int BS = 15;
-static constexpr int BN = 16;
-static constexpr int TS = 17;
-
-static constexpr int  TNE  = 18;
-static constexpr int  TNW  = 19;
-static constexpr int  TSE  = 20;
-static constexpr int  TSW  = 21;
-static constexpr int  BNE  = 22;
-static constexpr int  BNW  = 23;
-static constexpr int  BSE  = 24;
-static constexpr int  BSW  = 25;
-								  
-static constexpr int REST = 26;
-
-
-
-
 #define DIR_27_E_X  1
 #define DIR_27_E_Y  0
 #define DIR_27_E_Z  0

src/gpu/GridGenerator/grid/distributions/Distribution.cpp

@@ -35,8 +35,9 @@
 #include <stdio.h>
 
 #include "grid/distributions/D3Q27.h"
-
+#include "lbm/constants/D3Q27.h"
 #include "grid/Grid.h"
+using namespace vf::lbm::dir;
 
 Distribution DistributionHelper::getDistribution27() 
 {

src/gpu/GridGenerator/grid/distributions/DistributionTest.cpp

@@ -3,6 +3,8 @@
 # include "Distribution.h"
 
 #include "grid/distributions/D3Q27.h"
+#include "lbm/constants/D3Q27.h"
+using namespace vf::lbm::dir;
 
 TEST(DistributionTest, DistributionReturnsCorrectDirections)
 {