From db823eac34b6b5f67bf62fd5514e083f34cdf50e Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-bs.de>
Date: Tue, 28 Jun 2022 11:41:40 +0000
Subject: [PATCH] Rename init functions in Parameter
---
src/gpu/VirtualFluids_GPU/LBM/LB.h | 2 +-
src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp | 12 ++++++------
src/gpu/VirtualFluids_GPU/Parameter/Parameter.h | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/LBM/LB.h b/src/gpu/VirtualFluids_GPU/LBM/LB.h
index 90736528b..0471fbc0f 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/LB.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/LB.h
@@ -80,7 +80,7 @@ struct InitCondition
std::vector<real> minCoordX, minCoordY, minCoordZ, maxCoordX, maxCoordY, maxCoordZ;
std::string fname;
std::string oPath {"output/"};
- std::string gridPath = {"grid/"};
+ std::string gridPath {"grid/"};
std::string oPrefix {"MyFile"};
std::string geometryFileC, geometryFileM, geometryFileF;
std::string kFull, geoFull, geoVec, coordX, coordY, coordZ, neighborX, neighborY, neighborZ, neighborWSB, scaleCFC, scaleCFF, scaleFCC, scaleFCF, scaleOffsetCF, scaleOffsetFC;
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
index 14b4e8e96..b0497108c 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
@@ -50,8 +50,8 @@ Parameter::Parameter(int numberOfProcesses, int myId)
this->ic.myid = myId;
initGridPaths();
- initGridDist();
- initMultiKernel();
+ initGridBasePoints();
+ initDefaultLBMkernelAllLevels();
this->setFName(this->getOutputPath() + this->getOutputPrefix());
// initLBMSimulationParameter();
@@ -65,8 +65,8 @@ Parameter::Parameter(const vf::basics::ConfigurationFile &configData, int number
readConfigData(configData);
initGridPaths();
- initGridDist();
- initMultiKernel();
+ initGridBasePoints();
+ initDefaultLBMkernelAllLevels();
this->setFName(this->getOutputPath() + this->getOutputPrefix());
// initLBMSimulationParameter();
@@ -457,7 +457,7 @@ void Parameter::initGridPaths(){
}
}
-void Parameter::initGridDist()
+void Parameter::initGridBasePoints()
{
if (this->getGridX().empty())
this->setGridX(std::vector<int>(this->getMaxLevel() + 1, 32));
@@ -474,7 +474,7 @@ void Parameter::initGridDist()
this->setDistZ(std::vector<int>(this->getMaxLevel() + 1, 32));
}
-void Parameter::initMultiKernel(){
+void Parameter::initDefaultLBMkernelAllLevels(){
if (this->getMultiKernelOn() && this->getMultiKernelLevel().empty()) {
std::vector<int> tmp;
for (int i = 0; i < this->getMaxLevel() + 1; i++) {
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
index 754e178c0..17cf9809b 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.h
@@ -865,8 +865,8 @@ public:
private:
void readConfigData(const vf::basics::ConfigurationFile &configData);
void initGridPaths();
- void initGridDist();
- void initMultiKernel();
+ void initGridBasePoints();
+ void initDefaultLBMkernelAllLevels();
private:
bool compOn{ false };
--
GitLab