From c6755e79aa45a31906e6c247ed8163398ed502e1 Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-braunschweig.de>
Date: Tue, 25 Apr 2023 16:48:12 +0200
Subject: [PATCH] Fix build errors after merge
---
.../Factories/BoundaryConditionFactory.h | 1 +
.../KernelManager/GridScalingKernelManagerTest.cpp | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactory.h b/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactory.h
index bf8ae70c1..31ecc91f0 100644
--- a/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactory.h
+++ b/src/gpu/VirtualFluids_GPU/Factories/BoundaryConditionFactory.h
@@ -166,6 +166,7 @@ public:
[[nodiscard]] virtual boundaryCondition getSlipBoundaryConditionPost(bool isGeometryBC = false) const;
[[nodiscard]] virtual boundaryCondition getPressureBoundaryConditionPre() const;
[[nodiscard]] virtual boundaryCondition getGeometryBoundaryConditionPost() const;
+ [[nodiscard]] virtual boundaryConditionWithParameter getStressBoundaryConditionPost() const;
[[nodiscard]] precursorBoundaryConditionFunc getPrecursorBoundaryConditionPost() const;
private:
diff --git a/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManagerTest.cpp b/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManagerTest.cpp
index 217ebd6f5..f497b8e3e 100644
--- a/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManagerTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManagerTest.cpp
@@ -27,17 +27,17 @@ TEST_F(GridScalingKernelManagerTest_Initialization, singleLevel)
{
// only one level --> no scaling factory needed --> no error
para->initLBMSimulationParameter();
- para->getParD(0)->intFC.kFC = 100;
+ para->getParD(0)->fineToCoarse.numberOfCells = 100;
EXPECT_NO_THROW(GridScalingKernelManager(para, nullptr));
// only one level --> no scaling function needed --> no error
para->initLBMSimulationParameter();
- para->getParD(0)->intFC.kFC = 100;
+ para->getParD(0)->fineToCoarse.numberOfCells = 100;
EXPECT_NO_THROW(GridScalingKernelManager(para, &scalingFactory));
// only one level, but the user provided a scaling function anyway --> no error
para->initLBMSimulationParameter();
- scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleK17);
+ scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
EXPECT_NO_THROW(GridScalingKernelManager(para, &scalingFactory));
}
@@ -51,7 +51,7 @@ TEST_F(GridScalingKernelManagerTest_Initialization, multipleLevelNoScalingFuncti
// multiple levels and interpolation nodes specified, but the user forgot to set the scalingFunction --> error
para->setMaxLevel(2);
para->initLBMSimulationParameter();
- para->getParD(0)->intFC.kFC = 100;
+ para->getParD(0)->fineToCoarse.numberOfCells = 100;
EXPECT_THROW(GridScalingKernelManager(para, &scalingFactory), std::runtime_error);
}
--
GitLab