diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp index f51655dee0ff3268e316ea1b2386097568d1f42e..f82111472cb8bedf88e9a8e5c556f2eca9f0a9a0 100644 --- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp +++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp @@ -1100,9 +1100,9 @@ void MPIIOMigrationBECoProcessor::readDataSet(int step) //-------------------------------------- restore blocks --------------------------------- int blockID; - std::vector<double> vectorsOfValuesF1, vectorsOfValuesF2, vectorsOfValuesF3; - std::vector<double> vectorsOfValuesH11, vectorsOfValuesH12, vectorsOfValuesH13; - //std::vector<double> vectorsOfValuesH21, vectorsOfValuesH22, vectorsOfValuesH23; + std::vector<LBMReal> vectorsOfValuesF1, vectorsOfValuesF2, vectorsOfValuesF3; + std::vector<LBMReal> vectorsOfValuesH11, vectorsOfValuesH12, vectorsOfValuesH13; + //std::vector<LBMReal> vectorsOfValuesH21, vectorsOfValuesH22, vectorsOfValuesH23; size_t vectorSize1 = dataSetParamStr1.nx[0] * dataSetParamStr1.nx[1] * dataSetParamStr1.nx[2] * dataSetParamStr1.nx[3]; size_t vectorSize2 = dataSetParamStr2.nx[0] * dataSetParamStr2.nx[1] * dataSetParamStr2.nx[2] * dataSetParamStr2.nx[3]; diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp index 153752ecb3f4e8ee19937d515a1dd0568198edd3..fae3b48463a45499ea7c8d5b78d4bcfd01d1bb81 100644 --- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp +++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp @@ -1760,9 +1760,9 @@ void MPIIOMigrationCoProcessor::readDataSet(int step) } size_t index = 0; - std::vector<double> vectorsOfValuesF1, vectorsOfValuesF2, vectorsOfValuesF3; - std::vector<double> vectorsOfValuesH11, vectorsOfValuesH12, vectorsOfValuesH13; - //std::vector<double> vectorsOfValuesH21, vectorsOfValuesH22, vectorsOfValuesH23; + std::vector<LBMReal> vectorsOfValuesF1, vectorsOfValuesF2, vectorsOfValuesF3; + std::vector<LBMReal> vectorsOfValuesH11, vectorsOfValuesH12, vectorsOfValuesH13; + //std::vector<LBMReal> vectorsOfValuesH21, vectorsOfValuesH22, vectorsOfValuesH23; size_t vectorSize1 = dataSetParamStr1.nx[0] * dataSetParamStr1.nx[1] * dataSetParamStr1.nx[2] * dataSetParamStr1.nx[3]; size_t vectorSize2 = dataSetParamStr2.nx[0] * dataSetParamStr2.nx[1] * dataSetParamStr2.nx[2] * dataSetParamStr2.nx[3]; diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp index 98a7a3bf41dc74d746fc2dbdea9749b74cf6c10d..bc87008956f9ad851c243e5b039ad295602f022f 100644 --- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp +++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp @@ -1745,9 +1745,9 @@ void MPIIORestartCoProcessor::readDataSet(int step) } size_t index = 0; - std::vector<double> vectorsOfValuesF1, vectorsOfValuesF2, vectorsOfValuesF3; - std::vector<double> vectorsOfValuesH11, vectorsOfValuesH12, vectorsOfValuesH13; - //std::vector<double> vectorsOfValuesH21, vectorsOfValuesH22, vectorsOfValuesH23; + std::vector<LBMReal> vectorsOfValuesF1, vectorsOfValuesF2, vectorsOfValuesF3; + std::vector<LBMReal> vectorsOfValuesH11, vectorsOfValuesH12, vectorsOfValuesH13; + //std::vector<LBMReal> vectorsOfValuesH21, vectorsOfValuesH22, vectorsOfValuesH23; size_t vectorSize1 = dataSetParamStr1.nx[0] * dataSetParamStr1.nx[1] * dataSetParamStr1.nx[2] * dataSetParamStr1.nx[3]; size_t vectorSize2 = dataSetParamStr2.nx[0] * dataSetParamStr2.nx[1] * dataSetParamStr2.nx[2] * dataSetParamStr2.nx[3]; size_t vectorSize3 = dataSetParamStr3.nx[0] * dataSetParamStr3.nx[1] * dataSetParamStr3.nx[2] * dataSetParamStr3.nx[3]; diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp index 9b4c17f9fd6fe9f11abc652c65c09df246c98327..2bdc7ce97be90a45b2bebb3dca53f3eb609bec3b 100644 --- a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp +++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp @@ -30,6 +30,10 @@ //! \ingroup LBM //! \author Konstantin Kutscher, Martin Geier //======================================================================================= +#include <lbm/KernelParameter.h> +#include <lbm/CumulantChimera.h> +#include <lbm/constants/D3Q27.h> + #include "CumulantK17LBMKernelUnified.h" #include "D3Q27System.h" #include "D3Q27EsoTwist3DSplittedVector.h" @@ -39,9 +43,6 @@ #include "Block3D.h" #include "BCArray3D.h" -#include <lbm/KernelParameter.h> -#include <lbm/CumulantChimera.h> -#include <lbm/constants/D3Q27.h> //#define PROOF_CORRECTNESS diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp index f3d168733db86ea03a72a9741ba819ed6874a0c1..fa0fd08c9ac1da11483dad6061c96fd3672ad3a4 100644 --- a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp +++ b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp @@ -201,13 +201,13 @@ void LBMKernel::setDensityRatio(double densityRatio) { this->densityRatio = dens ////////////////////////////////////////////////////////////////////////// double LBMKernel::getDensityRatio() const { return densityRatio; } ////////////////////////////////////////////////////////////////////////// -void LBMKernel::setMultiphaseModelParameters(double beta, double kappa) +void LBMKernel::setMultiphaseModelParameters(LBMReal beta, LBMReal kappa) { this->beta = beta; this->kappa = kappa; } ////////////////////////////////////////////////////////////////////////// -void LBMKernel::getMultiphaseModelParameters(double &beta, double &kappa) +void LBMKernel::getMultiphaseModelParameters(LBMReal &beta, LBMReal &kappa) { beta = this->beta; kappa = this->kappa; diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h index f4d96d946a9f3bab367e7bc935b54352e09063a6..5e211f87b3c5170589838bd71f8f7c22c2d4a431 100644 --- a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h +++ b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h @@ -118,8 +118,8 @@ public: double getCollisionFactorG() const; void setDensityRatio(double densityRatio); double getDensityRatio() const; - void setMultiphaseModelParameters(double beta, double kappa); - void getMultiphaseModelParameters(double &beta, double &kappa); + void setMultiphaseModelParameters(LBMReal beta, LBMReal kappa); + void getMultiphaseModelParameters(LBMReal &beta, LBMReal &kappa); void setContactAngle(double contactAngle); double getContactAngle() const; void setPhiL(double phiL);