From d75f5702d36592c10f8c130282bbabbcb0544e10 Mon Sep 17 00:00:00 2001
From: Kutscher <kutscher@irmb.tu-bs.de>
Date: Thu, 23 Mar 2023 09:47:14 +0100
Subject: [PATCH] fix bcSet variable definition
---
apps/cpu/ConvectionOfVortex/cov.cpp | 4 ++--
apps/cpu/sphere/sphere.cpp | 4 ++--
.../MPIIORestartSimulationObserver.cpp | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/apps/cpu/ConvectionOfVortex/cov.cpp b/apps/cpu/ConvectionOfVortex/cov.cpp
index c662d8953..baa136d6a 100644
--- a/apps/cpu/ConvectionOfVortex/cov.cpp
+++ b/apps/cpu/ConvectionOfVortex/cov.cpp
@@ -211,9 +211,9 @@ void run()
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulantLBMKernel());
//dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->setBulkOmegaToOmega(true);
//
- SPtr<BCSet> BCSet(new BCSet());
+ SPtr<BCSet> bcSet(new BCSet());
- kernel->setBCSet(BCSet);
+ kernel->setBCSet(bcSet);
SetKernelBlockVisitor kernelVisitor(kernel, nuLB, availMem, needMem);
grid->accept(kernelVisitor);
diff --git a/apps/cpu/sphere/sphere.cpp b/apps/cpu/sphere/sphere.cpp
index f8249f70a..8a5ef89b8 100644
--- a/apps/cpu/sphere/sphere.cpp
+++ b/apps/cpu/sphere/sphere.cpp
@@ -219,10 +219,10 @@ void run(string configname)
SPtr<LBMKernel> kernel(new IncompressibleCumulantLBMKernel());
//SPtr<LBMKernel> kernel(new CompressibleCumulantLBMKernel());
- SPtr<BCSet> BCSet(new BCSet());
+ SPtr<BCSet> bcSet(new BCSet());
- kernel->setBCSet(BCSet);
+ kernel->setBCSet(bcSet);
SetKernelBlockVisitor kernelVisitor(kernel, nuLB, availMem, needMem);
grid->accept(kernelVisitor);
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp
index b2e9e5505..fdc3f4d43 100644
--- a/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp
@@ -1562,14 +1562,14 @@ void MPIIORestartSimulationObserver::readBoundaryConds(int step)
CbArray3D<int, IndexerX3X2X1> bcim(bcindexmatrixV, boundCondParamStr.nx1, boundCondParamStr.nx2, boundCondParamStr.nx3);
SPtr<Block3D> block = grid->getBlock(bcAddArray[n].x1, bcAddArray[n].x2, bcAddArray[n].x3, bcAddArray[n].level);
- SPtr<BCSet> bcSet = bcSet->clone(block->getKernel());
+ SPtr<BCSet> bcSetNew = bcSet->clone(block->getKernel());
SPtr<BCArray3D> bcArr(new BCArray3D());
bcArr->bcindexmatrix = bcim;
bcArr->bcvector = bcVector;
bcArr->indexContainer = indexContainerV;
- bcSet->setBCArray(bcArr);
+ bcSetNew->setBCArray(bcArr);
- block->getKernel()->setBCSet(bcSet);
+ block->getKernel()->setBCSet(bcSetNew);
}
delete nullBouCond;
@@ -1586,4 +1586,4 @@ void MPIIORestartSimulationObserver::readBoundaryConds(int step)
//////////////////////////////////////////////////////////////////////////
void MPIIORestartSimulationObserver::setLBMKernel(SPtr<LBMKernel> kernel) { this->lbmKernel = kernel; }
//////////////////////////////////////////////////////////////////////////
-void MPIIORestartSimulationObserver::setBCSet(SPtr<BCSet> BCSet) { this->bcSet = BCSet; }
+void MPIIORestartSimulationObserver::setBCSet(SPtr<BCSet> bcSet) { this->bcSet = bcSet; }
--
GitLab