From c0ba8797d5bb544d552263a08b119e260edf1b38 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 10 Jun 2021 15:18:21 +0000
Subject: [PATCH] Use LBMReal in CPU lib
---
.../CoProcessors/MPIIOMigrationBECoProcessor.cpp | 6 +++---
.../CoProcessors/MPIIOMigrationCoProcessor.cpp | 6 +++---
.../CoProcessors/MPIIORestartCoProcessor.cpp | 6 +++---
.../VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp | 7 ++++---
src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp | 4 ++--
src/cpu/VirtualFluidsCore/LBM/LBMKernel.h | 4 ++--
6 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
index f51655dee..f82111472 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 153752ecb..fae3b4846 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 98a7a3bf4..bc8700895 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 9b4c17f9f..2bdc7ce97 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 f3d168733..fa0fd08c9 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 f4d96d946..5e211f87b 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);
--
GitLab