diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp index 0953c799cd9b1c7ce2edf2353417f115fc8b2899..e7db282b399117db20c532aed0ed5ca7708e638d 100644 --- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp +++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp @@ -114,33 +114,46 @@ void multipleLevel(const std::string& configPath) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - std::string bivalveType = "OYSTER"; // "MUSSEL" "OYSTER" + std::string bivalveType = "OYSTER"; // "MUSSEL" "OYSTER" - - if (useGridGenerator) { + real dx = 0.5; + real vx = (real)0.005; + real Re = 50; - real dx = 0.5; - real vx = (real) 0.005; - real Re = 50.0; + para->setVelocity(vx); + para->setViscosity((vx * dx) / Re); + para->setVelocityRatio(1.0); - para->setVelocity(vx); - para->setViscosity((vx * dx) / Re); - para->setVelocityRatio(1.0); + para->setTOut(50000); + para->setTEnd(200000); - para->setTOut(50000); - para->setTEnd(200000); + para->setCalcDragLift(false); + para->setUseWale(false); - para->setCalcDragLift(false); - para->setUseWale(false); + // para->setMainKernel("CumulantK15Comp"); + para->setMainKernel("CumulantK17CompChim"); - // para->setMainKernel("CumulantK15Comp"); - para->setMainKernel("CumulantK17CompChim"); + para->setDevices(std::vector<uint>{ (uint)0 }); + + para->setOutputPath(path); + para->setOutputPrefix(simulationName); + + para->setFName(para->getOutputPath() + "/" + para->getOutputPrefix()); + + para->setPrintFiles(true); + + para->setMaxLevel(2); + + ////////////////////////////////////////////////////////////////////////// + + + if (useGridGenerator) { + + 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 + ".stl"); - 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 + ".stl"); - // bounding box mussel: // x = -18, 58 // y = -17, 18 @@ -182,18 +195,6 @@ void multipleLevel(const std::string& configPath) SPtr<Grid> grid = gridBuilder->getGrid(gridBuilder->getNumberOfLevels() - 1); ////////////////////////////////////////////////////////////////////////// - para->setDevices(std::vector<uint>{ (uint)0 }); - - para->setOutputPath(path); - para->setOutputPrefix(simulationName); - - para->setFName(para->getOutputPath() + "/" + para->getOutputPrefix()); - - para->setPrintFiles(true); - - para->setMaxLevel(1); - - ////////////////////////////////////////////////////////////////////////// // gridBuilder->writeGridsToVtk("E:/temp/MusselOyster/grid/"); diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp index 6f468507949a62933c278b1c17801ea25536b07f..f61bd5571f60b5feb771f351a7877cb15a5842cb 100644 --- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp +++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp @@ -358,8 +358,8 @@ void Simulation::init(SPtr<Parameter> para, SPtr<GridProvider> gridProvider, std output << "used Device Memory: " << cudaManager->getMemsizeGPU() / 1000000.0 << " MB\n"; ////////////////////////////////////////////////////////////////////////// - InterfaceDebugWriter::writeInterfaceLinesDebugCF(para.get()); - InterfaceDebugWriter::writeInterfaceLinesDebugFC(para.get()); + //InterfaceDebugWriter::writeInterfaceLinesDebugCF(para.get()); + //InterfaceDebugWriter::writeInterfaceLinesDebugFC(para.get()); } void Simulation::bulk()