From 55d8a93c466e3a07299de430664ac9c224f448c4 Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-bs.de>
Date: Thu, 13 Apr 2023 09:04:54 +0000
Subject: [PATCH] Fix compile problems after merge
---
.../DrivenCavityMultiGPU.cpp | 68 +++++++++----------
.../grid/GridBuilder/MultipleGridBuilder.cpp | 2 +-
2 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
index 90631710b..7cf64f029 100755
--- a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
+++ b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
@@ -190,12 +190,12 @@ void multipleLevel(std::filesystem::path& configPath)
gridBuilder->buildGrids(true); // buildGrids() has to be called before setting the BCs!!!!
if (generatePart == 0) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 1);
}
if (generatePart == 1) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 0);
}
@@ -249,27 +249,27 @@ void multipleLevel(std::filesystem::path& configPath)
gridBuilder->buildGrids(true); // buildGrids() has to be called before setting the BCs!!!!
if (generatePart == 0) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 1);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 2);
}
if (generatePart == 1) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 0);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 3);
}
if (generatePart == 2) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 3);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 0);
}
if (generatePart == 3) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 2);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 1);
}
@@ -362,67 +362,67 @@ void multipleLevel(std::filesystem::path& configPath)
gridBuilder->setPeriodicBoundaryCondition(false, false, false);
if (generatePart == 0) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 1);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 2);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 4);
}
if (generatePart == 1) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 0);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 3);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 5);
}
if (generatePart == 2) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 3);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 0);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 6);
}
if (generatePart == 3) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 2);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 1);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 7);
}
if (generatePart == 4) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 5);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 6);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 0);
}
if (generatePart == 5) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 4);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 7);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 1);
}
if (generatePart == 6) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 7);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 4);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 2);
}
if (generatePart == 7) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 6);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 5);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 3);
}
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
index 89fb303d7..bf226f235 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
+++ b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
@@ -551,7 +551,7 @@ void MultipleGridBuilder::buildGrids(bool enableThinWalls )
// compute the sub grid distances
// this works for STL and Sphere objects, but not yet for other primitives!
- grids[level]->findQs(solidObject);
+ grids[level]->findQs(solidObject.get());
}
*logging::out << logging::Logger::INFO_INTERMEDIATE << "Done with Q Computation\n";
--
GitLab