From 52e67e4a2ea22baa81c9d0107fc8d1240a34b9ed Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Thu, 11 Mar 2021 11:27:23 +0000
Subject: [PATCH] Fix single precision build.
---
.../CoProcessors/MPIIOMigrationBECoProcessor.cpp | 4 ++--
.../CoProcessors/MPIIOMigrationCoProcessor.cpp | 4 ++--
.../CoProcessors/MPIIORestartCoProcessor.cpp | 14 +++++++-------
.../PressureCoefficientCoProcessor.cpp | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
index 315608fc3..df4cdc478 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
@@ -990,7 +990,7 @@ void MPIIOMigrationBECoProcessor::readDataSet(int step)
//-------------------------------------- restore blocks ---------------------------------
int blockID;
- std::vector<double> vectorsOfValues1, vectorsOfValues2, vectorsOfValues3;
+ std::vector<LBMReal> vectorsOfValues1, vectorsOfValues2, vectorsOfValues3;
size_t vectorSize1 =
dataSetParamStr1.nx[0] * dataSetParamStr1.nx[1] * dataSetParamStr1.nx[2] * dataSetParamStr1.nx[3];
@@ -1173,7 +1173,7 @@ void MPIIOMigrationBECoProcessor::readArray(int step, Arrays arrType, std::strin
//----------------------------- restore data ---------------------------------
int blockID;
- std::vector<double> vectorsOfValues;
+ std::vector<LBMReal> vectorsOfValues;
size_t index;
size_t nextVectorSize =
dataSetParamStr.nx[0] * dataSetParamStr.nx[1] * dataSetParamStr.nx[2] * dataSetParamStr.nx[3];
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
index dc894e9a5..eee923571 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
@@ -1608,7 +1608,7 @@ void MPIIOMigrationCoProcessor::readDataSet(int step)
}
size_t index = 0, vectorSize = 0;
- std::vector<double> vectorsOfValues1, vectorsOfValues2, vectorsOfValues3;
+ std::vector<LBMReal> vectorsOfValues1, vectorsOfValues2, vectorsOfValues3;
for (std::size_t n = 0; n < blocksCount; n++) {
vectorSize = dataSetParamStr1.nx[0] * dataSetParamStr1.nx[1] * dataSetParamStr1.nx[2] * dataSetParamStr1.nx[3];
@@ -1778,7 +1778,7 @@ void MPIIOMigrationCoProcessor::readArray(int step, Arrays arrType, std::string
size_t index = 0;
size_t nextVectorSize =
dataSetParamStr.nx[0] * dataSetParamStr.nx[1] * dataSetParamStr.nx[2] * dataSetParamStr.nx[3];
- std::vector<double> vectorsOfValues;
+ std::vector<LBMReal> vectorsOfValues;
for (std::size_t n = 0; n < blocksCount; n++) {
SPtr<Block3D> block = grid->getBlock(dataSetSmallArray[n].globalID);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
index 28253ed99..7bdd2476f 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
@@ -1498,7 +1498,7 @@ void MPIIORestartCoProcessor::readDataSet(int step)
}
size_t index = 0, vectorSize = 0;
- std::vector<double> vectorsOfValues1, vectorsOfValues2, vectorsOfValues3;
+ std::vector<LBMReal> vectorsOfValues1, vectorsOfValues2, vectorsOfValues3;
for (int n = 0; n < blocksCount; n++) {
vectorSize = dataSetParamStr1.nx[0] * dataSetParamStr1.nx[1] * dataSetParamStr1.nx[2] * dataSetParamStr1.nx[3];
@@ -1665,7 +1665,7 @@ void MPIIORestartCoProcessor::readAverageDensityArray(int step)
size_t index = 0;
size_t nextVectorSize =
dataSetParamStr.nx[0] * dataSetParamStr.nx[1] * dataSetParamStr.nx[2] * dataSetParamStr.nx[3];
- std::vector<double> vectorsOfValues;
+ std::vector<LBMReal> vectorsOfValues;
for (int n = 0; n < blocksCount; n++) {
vectorsOfValues.assign(doubleValuesArray.data() + index, doubleValuesArray.data() + index + nextVectorSize);
index += nextVectorSize;
@@ -1766,7 +1766,7 @@ void MPIIORestartCoProcessor::readAverageVelocityArray(int step)
size_t index = 0;
size_t nextVectorSize =
dataSetParamStr.nx[0] * dataSetParamStr.nx[1] * dataSetParamStr.nx[2] * dataSetParamStr.nx[3];
- std::vector<double> vectorsOfValues;
+ std::vector<LBMReal> vectorsOfValues;
for (int n = 0; n < blocksCount; n++) {
vectorsOfValues.assign(doubleValuesArray.data() + index, doubleValuesArray.data() + index + nextVectorSize);
index += nextVectorSize;
@@ -1869,7 +1869,7 @@ void MPIIORestartCoProcessor::readAverageFluktuationsArray(int step)
size_t index = 0;
size_t nextVectorSize =
dataSetParamStr.nx[0] * dataSetParamStr.nx[1] * dataSetParamStr.nx[2] * dataSetParamStr.nx[3];
- std::vector<double> vectorsOfValues;
+ std::vector<LBMReal> vectorsOfValues;
for (int n = 0; n < blocksCount; n++) {
vectorsOfValues.assign(doubleValuesArray.data() + index, doubleValuesArray.data() + index + nextVectorSize);
index += nextVectorSize;
@@ -1970,7 +1970,7 @@ void MPIIORestartCoProcessor::readAverageTripleArray(int step)
size_t index = 0;
size_t nextVectorSize =
dataSetParamStr.nx[0] * dataSetParamStr.nx[1] * dataSetParamStr.nx[2] * dataSetParamStr.nx[3];
- std::vector<double> vectorsOfValues;
+ std::vector<LBMReal> vectorsOfValues;
for (int n = 0; n < blocksCount; n++) {
vectorsOfValues.assign(doubleValuesArray.data() + index, doubleValuesArray.data() + index + nextVectorSize);
index += nextVectorSize;
@@ -2071,7 +2071,7 @@ void MPIIORestartCoProcessor::readShearStressValArray(int step)
size_t index = 0;
size_t nextVectorSize =
dataSetParamStr.nx[0] * dataSetParamStr.nx[1] * dataSetParamStr.nx[2] * dataSetParamStr.nx[3];
- std::vector<double> vectorsOfValues;
+ std::vector<LBMReal> vectorsOfValues;
for (int n = 0; n < blocksCount; n++) {
vectorsOfValues.assign(doubleValuesArray.data() + index, doubleValuesArray.data() + index + nextVectorSize);
index += nextVectorSize;
@@ -2172,7 +2172,7 @@ void MPIIORestartCoProcessor::readRelaxationFactor(int step)
size_t index = 0;
size_t nextVectorSize =
dataSetParamStr.nx[0] * dataSetParamStr.nx[1] * dataSetParamStr.nx[2] * dataSetParamStr.nx[3];
- std::vector<double> vectorsOfValues;
+ std::vector<LBMReal> vectorsOfValues;
for (int n = 0; n < blocksCount; n++) {
vectorsOfValues.assign(doubleValuesArray.data() + index, doubleValuesArray.data() + index + nextVectorSize);
index += nextVectorSize;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
index b350f441b..1c7e47f52 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
@@ -42,8 +42,8 @@ void PressureCoefficientCoProcessor::collectData(double step)
//////////////////////////////////////////////////////////////////////////
void PressureCoefficientCoProcessor::calculateRho()
{
- double f[D3Q27System::ENDF + 1];
- double vx1, vx2, vx3, rho;
+ LBMReal f[D3Q27System::ENDF + 1];
+ LBMReal vx1, vx2, vx3, rho;
std::vector<double> values;
std::vector<double> rvalues;
--
GitLab