diff --git a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp index 5f466df5d587b8e0dfc32ee921b732c5787f8210..17708541aa75e86e20f852d548e88a94efc94209 100644 --- a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp +++ b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp @@ -29,7 +29,7 @@ #include "GridGenerator/grid/BoundaryConditions/Side.h" #include "GridGenerator/grid/GridFactory.h" -#include "geometries/Sphere/Sphere.h" +#include "geometries/Cuboid/Cuboid.h" #include "geometries/TriangularMesh/TriangularMesh.h" #include "GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h" @@ -70,14 +70,17 @@ // Tesla 03 // std::string outPath("E:/temp/DrivenCavityMultiGPUResults/"); // std::string gridPath = "D:/STLs/DrivenCavity"; -// std::string stlPath("C:/Users/Master/Documents/MasterAnna/STL/"); // std::string simulationName("DrivenCavityMultiGPU"); // Phoenix -std::string outPath("/work/y0078217/Results/DrivenCavityMultiGPUResults/"); -std::string gridPath = "/work/y0078217/Grids/GridDrivenCavityMultiGPU/"; -std::string stlPath("/home/y0078217/STL/DrivenCavityMultiGPU/DrivenCavity"); -std::string simulationName("DrivenCavityMultiGPU"); +// std::string outPath("/work/y0078217/Results/DrivenCavityMultiGPUResults/"); +// std::string gridPath = "/work/y0078217/Grids/GridDrivenCavityMultiGPU/"; +// std::string simulationName("DrivenCavityMultiGPU"); + +// Aragorn +std::string outPath("/workspaces/VirtualFluids_dev/output/DrivenCavity_Results/"); +std::string gridPath = "/workspaces/VirtualFluids_dev/output/DrivenCavity_Results/grid/"; +std::string simulationName("DrivenCavity"); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -189,9 +192,9 @@ void multipleLevel(const std::string& configPath) const real zGridMin = -0.5 * L; const real zGridMax = 0.5 * L; - TriangularMesh *level1_STL = nullptr; + Cuboid *level1 = nullptr; if (useLevels) - level1_STL = TriangularMesh::make(stlPath + "_Level1.stl"); + level1 = new Cuboid(-0.25 * L,-0.25 * L, -0.25 * L, 0.25 * L, 0.25 * L, 0.25 * L); if (para->getNumprocs() > 1) { @@ -217,7 +220,7 @@ void multipleLevel(const std::string& configPath) if (useLevels) { - gridBuilder->addGrid(level1_STL, 1); + gridBuilder->addGrid(level1, 1); } if (generatePart == 0){ @@ -274,7 +277,7 @@ void multipleLevel(const std::string& configPath) } if (useLevels) { - gridBuilder->addGrid(level1_STL, 1); + gridBuilder->addGrid(level1, 1); } if (generatePart == 0) @@ -374,7 +377,7 @@ void multipleLevel(const std::string& configPath) } if (useLevels) { - gridBuilder->addGrid(level1_STL, 1); + gridBuilder->addGrid(level1, 1); } if (generatePart == 0) @@ -528,11 +531,10 @@ void multipleLevel(const std::string& configPath) if (useLevels) { gridBuilder->setNumberOfLayers(10, 8); - gridBuilder->addGrid(level1_STL, 1); + gridBuilder->addGrid(level1, 1); } gridBuilder->buildGrids(LBM, true); // buildGrids() has to be called before setting the BCs!!!! - gridBuilder->setPeriodicBoundaryCondition(false, false, false); ////////////////////////////////////////////////////////////////////////// gridBuilder->setVelocityBoundaryCondition(SideType::MX, 0.0, 0.0, 0.0); @@ -546,7 +548,7 @@ void multipleLevel(const std::string& configPath) if (para->getKernelNeedsFluidNodeIndicesToRun()) gridBuilder->findFluidNodes(para->getUseStreams()); - // gridBuilder->writeGridsToVtk(outPath + "/grid/"); + gridBuilder->writeGridsToVtk(outPath + "/grid/"); // gridBuilder->writeArrows(outPath + "/arrow"); SimulationFileWriter::write(gridPath, gridBuilder, FILEFORMAT::BINARY); diff --git a/apps/gpu/LBM/DrivenCavityMultiGPU/configDrivenCavityMultiGPU.txt b/apps/gpu/LBM/DrivenCavityMultiGPU/configDrivenCavityMultiGPU.txt new file mode 100644 index 0000000000000000000000000000000000000000..97f5b5d8079e6b937863cca09e6076e0a753af23 --- /dev/null +++ b/apps/gpu/LBM/DrivenCavityMultiGPU/configDrivenCavityMultiGPU.txt @@ -0,0 +1,36 @@ +################################################## +#GPU Mapping +################################################## +Devices="0" +NumberOfDevices=1 + +################################################## +#informations for Writing +################################################## +Path=/workspaces/VirtualFluids_dev/output/DrivenCavity_Results/ # Aragorn +#Prefix="DrivenCavity" +#WriteGrid=true +################################################## +#informations for reading +################################################## +GridPath=/workspaces/VirtualFluids_dev/output/DrivenCavity_Results/grid/ # Aragorn +#GridPath="C:" + +################################################## +#number of grid levels +################################################## +#NOGL=1 + +################################################## +#LBM Version +################################################## + +#D3Qxx=27 +#MainKernelName=CumulantK17CompChim + +################################################## +#simulation parameter +################################################## +TimeEnd=1000 +TimeOut=100 +#TimeStartOut=0 \ No newline at end of file diff --git a/gpu.cmake b/gpu.cmake index df90a54e2be735c07336b09d1ea738adf3a58c49..ba0e0b3e831ca91bac533f28718e577fa0a05b1a 100644 --- a/gpu.cmake +++ b/gpu.cmake @@ -44,8 +44,8 @@ IF (BUILD_VF_GPU) #add_subdirectory(apps/gpu/LBM/gridGeneratorTest) #add_subdirectory(apps/gpu/LBM/TGV_3D) #add_subdirectory(apps/gpu/LBM/TGV_3D_MultiGPU) - add_subdirectory(apps/gpu/LBM/SphereScaling) - add_subdirectory(apps/gpu/LBM/MusselOyster) + #add_subdirectory(apps/gpu/LBM/SphereScaling) + #add_subdirectory(apps/gpu/LBM/MusselOyster) add_subdirectory(apps/gpu/LBM/DrivenCavityMultiGPU) ELSE() MESSAGE( STATUS "exclude Virtual Fluids GPU." )