From d06535f361bc806c20dc1e624919e702bc9a9bbe Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-bs.de>
Date: Tue, 19 Jul 2022 06:11:32 +0000
Subject: [PATCH] Add license to BoundaryConditionFactory
---
src/cuda/CudaGrid.cpp | 5 ++-
.../BoundaryConditionFactory.h | 35 +++++++++++++++++--
.../BoundaryConditionFactoryTest.cpp | 7 ++--
3 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/src/cuda/CudaGrid.cpp b/src/cuda/CudaGrid.cpp
index 5c514fcad..48ac86942 100644
--- a/src/cuda/CudaGrid.cpp
+++ b/src/cuda/CudaGrid.cpp
@@ -5,10 +5,9 @@
namespace vf::cuda
{
-CudaGrid::CudaGrid(unsigned int numberOfThreads, unsigned int numberOfEntities)
+CudaGrid::CudaGrid(unsigned int numberOfThreads, unsigned int numberOfEntities): grid {getCudaGrid( numberOfThreads, numberOfEntities)},
+ threads{dim3(numberOfThreads, 1, 1)}
{
- grid = getCudaGrid( numberOfThreads, numberOfEntities);
- threads = dim3(numberOfThreads, 1, 1);
}
void CudaGrid::print() const
diff --git a/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactory.h b/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactory.h
index 27ef29845..725155832 100644
--- a/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactory.h
+++ b/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactory.h
@@ -1,3 +1,35 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// This file is part of VirtualFluids. VirtualFluids is free software: you can
+// redistribute it and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BoundaryConditionFactory.h
+//! \ingroup BoundaryCondition
+//! \author Anna Wellmann
+//=======================================================================================#ifndef BC_FACTORY
#ifndef BC_FACTORY
#define BC_FACTORY
@@ -123,10 +155,9 @@ private:
NoSlipBC noSlipBoundaryCondition = NoSlipBC::NoSlipImplicitBounceBack;
SlipBC slipBoundaryCondition = SlipBC::NotSpecified;
PressureBC pressureBoundaryCondition = PressureBC::NotSpecified;
- std::variant<VelocityBC, NoSlipBC, SlipBC> geometryBoundaryCondition = NoSlipBC::NoSlipImplicitBounceBack;
+ std::variant<VelocityBC, NoSlipBC, SlipBC> geometryBoundaryCondition = NoSlipBC::NoSlipImplicitBounceBack;
StressBC stressBoundaryCondition = StressBC::NotSpecified;
-
// OutflowBoundaryConditon outflowBC // TODO: https://git.rz.tu-bs.de/m.schoenherr/VirtualFluids_dev/-/issues/16
};
diff --git a/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactoryTest.cpp b/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactoryTest.cpp
index f8d74641b..40a402635 100644
--- a/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactoryTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/BoundaryConditions/BoundaryConditionFactoryTest.cpp
@@ -5,7 +5,6 @@
#include "GPU/GPU_Interface.h"
#include "gpu/GridGenerator/grid/BoundaryConditions/BoundaryCondition.h"
-
using bcFunction = void (*)(LBMSimulationParameter *, QforBoundaryConditions *);
using bcFunctionParamter = void (*)(Parameter *, QforBoundaryConditions *, const int level);
@@ -56,7 +55,6 @@ TEST(BoundaryConditionFactoryTest, defaultStressBC)
EXPECT_THROW(bc(nullptr, nullptr, 0), std::bad_function_call);
}
-
bcFunction getVelocityBcTarget(BoundaryConditionFactory &bcFactory)
{
auto bc = bcFactory.getVelocityBoundaryConditionPost();
@@ -136,7 +134,7 @@ TEST(BoundaryConditionFactoryTest, slipBC)
bcFactory.setSlipBoundaryCondition(BoundaryConditionFactory::SlipBC::SlipIncompressible);
EXPECT_THAT(*(getSlipBcTarget(bcFactory)), testing::Eq(QSlipDev27))
<< "The returned boundary condition is not the expected function QSlipDev27.";
-
+
bcFactory.setSlipBoundaryCondition(BoundaryConditionFactory::SlipBC::SlipCompressible);
EXPECT_THAT(*(getSlipBcTarget(bcFactory)), testing::Eq(QSlipDevComp27))
<< "The returned boundary condition is not the expected function QSlipDevComp27.";
@@ -161,7 +159,7 @@ TEST(BoundaryConditionFactoryTest, pressureBC)
bcFactory.setPressureBoundaryCondition(BoundaryConditionFactory::PressureBC::PressureEquilibrium);
EXPECT_THAT(*(getPressureBcTarget(bcFactory)), testing::Eq(QPressDev27))
<< "The returned boundary condition is not the expected function QPressDev27.";
-
+
bcFactory.setPressureBoundaryCondition(BoundaryConditionFactory::PressureBC::PressureEquilibrium2);
EXPECT_THAT(*(getPressureBcTarget(bcFactory)), testing::Eq(QPressDevEQZ27))
<< "The returned boundary condition is not the expected function QPressDevEQZ27.";
@@ -177,7 +175,6 @@ TEST(BoundaryConditionFactoryTest, pressureBC)
bcFactory.setPressureBoundaryCondition(BoundaryConditionFactory::PressureBC::OutflowNonReflective);
EXPECT_THAT(*(getPressureBcTarget(bcFactory)), testing::Eq(QPressNoRhoDev27))
<< "The returned boundary condition is not the expected function QPressNoRhoDev27.";
-
}
bcFunction getGeometryBcTarget(BoundaryConditionFactory &bcFactory)
--
GitLab