diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp index 9452efe966a08c6a6d27398afab12dd143389c89..3de373ae2ac1b8c922b2e2f26293e5beb1457828 100644 --- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp +++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp @@ -207,12 +207,12 @@ void multipleLevel(const std::string& configPath) const real zGridMin = bbzm - 30.0; const real zGridMax = bbzp + 30.0; - TriangularMesh *bivalveSTL = - TriangularMesh::make(stlPath + bivalveType + ".stl"); + TriangularMesh *bivalveSTL = TriangularMesh::make(stlPath + bivalveType + ".stl"); TriangularMesh *bivalveRef_1_STL = nullptr; if (useLevels) bivalveRef_1_STL = TriangularMesh::make(stlPath + bivalveType + "_Level1.stl"); + if (useMultiGPU) { const uint generatePart = vf::gpu::Communicator::getInstanz()->getPID(); diff --git a/apps/gpu/LBM/MusselOyster2x/MusselOyster2x.cpp b/apps/gpu/LBM/MusselOyster2x/MusselOyster2x.cpp index 7d06f338243a954e284808ede1e3890cb6f30ba9..dadd433c935b41a52baa3a9cea170d82980380d2 100644 --- a/apps/gpu/LBM/MusselOyster2x/MusselOyster2x.cpp +++ b/apps/gpu/LBM/MusselOyster2x/MusselOyster2x.cpp @@ -69,6 +69,7 @@ std::string outPath("E:/temp/MusselOysterResults"); std::string gridPathParent = "E:/temp/GridMussel/"; +std::string stlPath("C:/Users/Master/Documents/MasterAnna/STL/"); std::string simulationName("MusselOyster"); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -199,11 +200,11 @@ void multipleLevel(const std::string& configPath) const real zGridMin = bbzm - 30.0; const real zGridMax = bbzp + 30.0; - TriangularMesh *bivalveSTL = - TriangularMesh::make("C:/Users/Master/Documents/MasterAnna/STL/" + bivalveType + ".stl"); + TriangularMesh *bivalveSTL = TriangularMesh::make(stlPath + bivalveType + ".stl"); TriangularMesh *bivalveRef_1_STL = nullptr; if (useLevels) - bivalveRef_1_STL = TriangularMesh::make("C:/Users/Master/Documents/MasterAnna/STL/" + bivalveType + "_Level1.stl"); + bivalveRef_1_STL = TriangularMesh::make(stlPath + bivalveType + "_Level1.stl"); + if (useMultiGPU) { const uint generatePart = vf::gpu::Communicator::getInstanz()->getPID(); diff --git a/apps/gpu/LBM/MusselOyster3z/MusselOyster3z.cpp b/apps/gpu/LBM/MusselOyster3z/MusselOyster3z.cpp index 6544653aeab954624e1fca63997507deb3d56ecd..577d217e6c269ab9f7d8dbcfe8d955550c4823c5 100644 --- a/apps/gpu/LBM/MusselOyster3z/MusselOyster3z.cpp +++ b/apps/gpu/LBM/MusselOyster3z/MusselOyster3z.cpp @@ -69,6 +69,7 @@ std::string outPath("E:/temp/MusselOysterResults"); std::string gridPathParent = "E:/temp/GridMussel/"; +std::string stlPath("C:/Users/Master/Documents/MasterAnna/STL/"); std::string simulationName("MusselOyster"); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -198,11 +199,11 @@ void multipleLevel(const std::string& configPath) const real zGridMin = bbzm - 30.0; const real zGridMax = bbzp + 30.0; - TriangularMesh *bivalveSTL = - TriangularMesh::make("C:/Users/Master/Documents/MasterAnna/STL/" + bivalveType + ".stl"); + TriangularMesh *bivalveSTL = TriangularMesh::make(stlPath + bivalveType + ".stl"); TriangularMesh *bivalveRef_1_STL = nullptr; if (useLevels) - bivalveRef_1_STL = TriangularMesh::make("C:/Users/Master/Documents/MasterAnna/STL/" + bivalveType + "_Level1.stl"); + bivalveRef_1_STL = TriangularMesh::make(stlPath + bivalveType + "_Level1.stl"); + if (useMultiGPU) { const uint generatePart = vf::gpu::Communicator::getInstanz()->getPID();