Fix renamed kernel.

apps/cpu/AcousticPulse/ap.cpp

@@ -162,8 +162,8 @@ void run()
       double bulckViscosity = 10.0*nuLB;
       SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel());
       //dynamicPointerCast<CompressibleCumulant4thOrderViscosityLBMKernel>(kernel)->setBulkViscosity(bulckViscosity);
-      //SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulantLBMKernel());
-      //dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->setBulkOmegaToOmega(true);
+      //SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new K15CompressibleNavierStokes());
+      //dynamicPointerCast<K15CompressibleNavierStokes>(kernel)->setBulkOmegaToOmega(true);
       //
       SPtr<BCProcessor> bcProcessor(new BCProcessor());
 

apps/cpu/BoxBenchmark/bb.cpp

@@ -160,7 +160,7 @@ void run(string configname)
          }
 
          SPtr<LBMKernel> kernel;
-         //kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel());
+         //kernel = SPtr<LBMKernel>(new InK15CompressibleNavierStokes());
          kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel());
          SPtr<BCProcessor> bcProc(new BCProcessor());
          kernel->setBCProcessor(bcProc);

apps/cpu/Hagen_Poiseuille_flow/pflow.cpp

@@ -429,7 +429,7 @@ void pflowdp(string configname)
       //MPIIORestart1CoProcessor rcp(grid, rSch2, pathname, comm);
 
       SPtr<LBMKernel> kernel;
-      kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel());
+      kernel = SPtr<LBMKernel>(new InK15CompressibleNavierStokes());
 
       SPtr<BCProcessor> bcProc(new BCProcessor());
       //SPtr<BCProcessor> bcProc = SPtr<BCProcessor>(new ThinWallBCProcessor());
@@ -591,8 +591,8 @@ void pflowdp(string configname)
          }
 
          //SPtr<LBMKernel> kernel;
-         //kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel(blocknx[0], blocknx[1], blocknx[2], IncompressibleCumulantLBMKernel::NORMAL));
-         //kernel = SPtr<LBMKernel>(new CompressibleCumulantLBMKernel(blocknx[0], blocknx[1], blocknx[2], CompressibleCumulantLBMKernel::NORMAL));
+         //kernel = SPtr<LBMKernel>(new InK15CompressibleNavierStokes(blocknx[0], blocknx[1], blocknx[2], InK15CompressibleNavierStokes::NORMAL));
+         //kernel = SPtr<LBMKernel>(new K15CompressibleNavierStokes(blocknx[0], blocknx[1], blocknx[2], K15CompressibleNavierStokes::NORMAL));
          //}
          //kernel->setWithForcing(true);
          //kernel->setForcingX1(2e-6);

apps/cpu/Hagen_Poiseuille_flow2/pflow2.cpp

@@ -232,7 +232,7 @@ void pflowdp(string configname)
 
          int kernelType = 2;
          SPtr<LBMKernel> kernel;
-         kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel());
+         kernel = SPtr<LBMKernel>(new InK15CompressibleNavierStokes());
          //}
 
          SPtr<BCProcessor> bcProc(new BCProcessor());

apps/cpu/InterfaceTest/itest.cpp

@@ -134,8 +134,8 @@ void run()
       }
 
 
-      SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulantLBMKernel());
-      dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->setRelaxationParameter(CompressibleCumulantLBMKernel::NORMAL);
+      SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new K15CompressibleNavierStokes());
+      dynamicPointerCast<K15CompressibleNavierStokes>(kernel)->setRelaxationParameter(K15CompressibleNavierStokes::NORMAL);
       //
       SPtr<BCProcessor> bcProcessor(new BCProcessor());
 

apps/cpu/PoiseuilleFlow/pf2.cpp

@@ -132,7 +132,7 @@
 //
 //   //LBM kernel definition
 //   SPtr<LBMKernel> kernel;
-//   kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel(blocknx[0], blocknx[1], blocknx[2], IncompressibleCumulantLBMKernel::NORMAL));
+//   kernel = SPtr<LBMKernel>(new InK15CompressibleNavierStokes(blocknx[0], blocknx[1], blocknx[2], InK15CompressibleNavierStokes::NORMAL));
 //   SPtr<BCProcessor> bcProc(new BCProcessor());
 //   kernel->setBCProcessor(bcProc);
 //

apps/cpu/PoiseuilleFlow/pf3.cpp

@@ -117,7 +117,7 @@
 //
 //   //LBM kernel definition
 //   SPtr<LBMKernel> kernel;
-//   kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel(blocknx[0], blocknx[1], blocknx[2], IncompressibleCumulantLBMKernel::NORMAL));
+//   kernel = SPtr<LBMKernel>(new InK15CompressibleNavierStokes(blocknx[0], blocknx[1], blocknx[2], InK15CompressibleNavierStokes::NORMAL));
 //   SPtr<BCProcessor> bcProc(new BCProcessor());
 //   kernel->setBCProcessor(bcProc);
 //

apps/cpu/PoiseuilleFlow/pf4.cpp

@@ -137,7 +137,7 @@
 //
 //   //LBM kernel definition
 //   SPtr<LBMKernel> kernel;
-//   kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel(blocknx[0], blocknx[1], blocknx[2], IncompressibleCumulantLBMKernel::NORMAL));
+//   kernel = SPtr<LBMKernel>(new InK15CompressibleNavierStokes(blocknx[0], blocknx[1], blocknx[2], InK15CompressibleNavierStokes::NORMAL));
 //   SPtr<BCProcessor> bcProc(new BCProcessor());
 //   kernel->setBCProcessor(bcProc);
 //

apps/cpu/TPMSRow/TPMSRow.cpp

@@ -146,8 +146,8 @@ void run(string configname)
         // grid, kernel and BCProcessor
         SPtr<Grid3D> grid(new Grid3D(comm));
         SPtr<LBMKernel> kernel;
-        //kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel());
-         kernel = SPtr<LBMKernel>(new CompressibleCumulantLBMKernel());
+        //kernel = SPtr<LBMKernel>(new InK15CompressibleNavierStokes());
+         kernel = SPtr<LBMKernel>(new K15CompressibleNavierStokes());
         //kernel = SPtr<LBMKernel>(new IncompressibleCumulantWithSpongeLayerLBMKernel());       
         //kernel->setWithSpongeLayer(true);
         //kernel->setSpongeLayer(spongeLayer);

apps/cpu/levels/levels.cpp

@@ -244,7 +244,7 @@ void run(string configname)
             UBLOG(logINFO, "Available memory per process = "<<availMem<<" bytes");
          }
 
-         SPtr<LBMKernel> kernel(new IncompressibleCumulantLBMKernel(blocknx1, blocknx2, blocknx3, IncompressibleCumulantLBMKernel::NORMAL));
+         SPtr<LBMKernel> kernel(new InK15CompressibleNavierStokes(blocknx1, blocknx2, blocknx3, InK15CompressibleNavierStokes::NORMAL));
 
          SPtr<BCProcessor> bcProcessor(new BCProcessor());
 

apps/cpu/mpi_benchmark/mpib.cpp

@@ -195,7 +195,7 @@ void run(string configname)
          }
 
          SPtr<LBMKernel> kernel;
-         kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel(blockNx[0], blockNx[1], blockNx[2], IncompressibleCumulantLBMKernel::NORMAL));
+         kernel = SPtr<LBMKernel>(new InK15CompressibleNavierStokes(blockNx[0], blockNx[1], blockNx[2], InK15CompressibleNavierStokes::NORMAL));
 
          SPtr<BCProcessor> bcProc(new BCProcessor());
          kernel->setBCProcessor(bcProc);

src/cpu/core/LBM/K15CompressibleNavierStokes.h

@@ -48,6 +48,6 @@ protected:
    bool bulkOmegaToOmega;
    real OxxPyyPzz; 
 };
-#endif // CompressibleCumulantLBMKernel_h__
+#endif // K15CompressibleNavierStokes_h__
 
 

src/cpu/core/SimulationObservers/LineTimeSeriesSimulationObserver.cpp

@@ -4,7 +4,7 @@
 
 #include "Block3D.h"
 #include <parallel/Communicator.h>
-#include "CompressibleCumulantLBMKernel.h"
+#include "K15CompressibleNavierStokes.h"
 #include "CoordinateTransformation3D.h"
 #include "DataSet3D.h"
 #include "GbLine3D.h"