From 34ce7f37968ca66f03e191232d91f455389f78a1 Mon Sep 17 00:00:00 2001 From: Anna Wellmann <a.wellmann@tu-braunschweig.de> Date: Wed, 28 Jul 2021 17:56:45 +0200 Subject: [PATCH] Clean up log messages and file paths --- apps/gpu/LBM/MusselOyster/MusselOyster.cpp | 25 +++++++++---------- .../grid/GridBuilder/MultipleGridBuilder.cpp | 4 +-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp index a34f55483..7c0afb4d7 100644 --- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp +++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp @@ -67,9 +67,9 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -std::string path("E:/temp/MusselOyster"); +std::string path("E:/temp/MusselOysterResults"); std::string gridPathParent = "E:/temp/GridMussel/"; -std::string simulationName("MusselOysterTestNewBC"); +std::string simulationName("MusselOyster"); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -142,10 +142,10 @@ void multipleLevel(const std::string& configPath) para->setFName(para->getOutputPath() + "/" + para->getOutputPrefix()); para->setPrintFiles(true); - // para->setMaxLevel(2); + para->setMaxLevel(2); - para->setMainKernel("CumulantK17CompChim"); - //para->setMainKernel("CumulantK17CompChimSparse"); + //para->setMainKernel("CumulantK17CompChim"); + para->setMainKernel("CumulantK17CompChimSparse"); *logging::out << logging::Logger::INFO_HIGH << "Kernel: " << para->getMainKernel() << "\n"; if (useMultiGPU) { @@ -184,11 +184,10 @@ void multipleLevel(const std::string& configPath) TriangularMesh *bivalveSTL = TriangularMesh::make("C:/Users/Master/Documents/MasterAnna/STL/" + bivalveType + ".stl"); - // TriangularMesh* bivalveRef_1_STL = - // TriangularMesh::make("C:/Users/Master/Documents/MasterAnna/STL/" + bivalveType + "_Level1.stl"); + TriangularMesh* bivalveRef_1_STL = + TriangularMesh::make("C:/Users/Master/Documents/MasterAnna/STL/" + bivalveType + "_Level1.stl"); if (useMultiGPU) { - // const uint generatePart = 1; const uint generatePart = vf::gpu::Communicator::getInstanz()->getPID(); real overlap = (real)8.0 * dxGrid; @@ -203,8 +202,8 @@ void multipleLevel(const std::string& configPath) xGridMax, yGridMax, zGridMax, dxGrid); } - // gridBuilder->setNumberOfLayers(6, 8); - // gridBuilder->addGrid(bivalveRef_1_STL, 1); + gridBuilder->setNumberOfLayers(6, 8); + gridBuilder->addGrid(bivalveRef_1_STL, 1); gridBuilder->addGeometry(bivalveSTL); @@ -253,8 +252,8 @@ void multipleLevel(const std::string& configPath) gridBuilder->addCoarseGrid(xGridMin, yGridMin, zGridMin, xGridMax, yGridMax, zGridMax, dxGrid); - // gridBuilder->setNumberOfLayers(6, 8); - // gridBuilder->addGrid(bivalveRef_1_STL, 1); + gridBuilder->setNumberOfLayers(6, 8); + gridBuilder->addGrid(bivalveRef_1_STL, 1); gridBuilder->addGeometry(bivalveSTL); @@ -272,7 +271,7 @@ void multipleLevel(const std::string& configPath) gridBuilder->setVelocityBoundaryCondition(SideType::GEOMETRY, 0.0, 0.0, 0.0); ////////////////////////////////////////////////////////////////////////// - //gridBuilder->writeGridsToVtk("E:/temp/MusselOyster/" + bivalveType + "/grid/"); + // gridBuilder->writeGridsToVtk("E:/temp/MusselOyster/" + bivalveType + "/grid/"); // gridBuilder->writeArrows ("E:/temp/MusselOyster/" + bivalveType + "/arrow"); SimulationFileWriter::write(gridPath, gridBuilder, FILEFORMAT::BINARY); diff --git a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp index 2243ccd65..f6e2de17d 100644 --- a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp +++ b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp @@ -602,10 +602,10 @@ void MultipleGridBuilder::findCommunicationIndices(int direction, LbmOrGks lbmOr void MultipleGridBuilder::findGeoFluidNodes() { - *logging::out << logging::Logger::INFO_HIGH << "Start findGeoFluidNodes()\n"; + *logging::out << logging::Logger::INFO_HIGH << "Start findFluidNodes()\n"; for (uint i = 0; i < grids.size(); i++) grids[i]->findFluidNodeIndices(); - *logging::out << logging::Logger::INFO_HIGH << "Done with findGeoFluidNodes()\n"; + *logging::out << logging::Logger::INFO_HIGH << "Done with findFluidNodes()\n"; } void MultipleGridBuilder::writeGridsToVtk(const std::string& path) const -- GitLab