diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp index 5ca312470a4cc512df0ec21a2ad693388398c141..6bf1a1763ce736e2ec7cd1992dd7b4767b8a05b5 100644 --- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp +++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp @@ -68,7 +68,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Tesla 03 -// std::string outPath("E:/temp/MusselOysterResults"); +// 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"); @@ -161,8 +161,10 @@ void multipleLevel(const std::string& configPath) para->setOutputPath(outPath); } para->setOutputPrefix(simulationName); - para->setFName(para->getOutputPath() + "/" + para->getOutputPrefix()); + para->setFName(para->getOutputPath() + para->getOutputPrefix()); para->setPrintFiles(true); + std::cout << "Write result files to " << para->getFName() << std::endl; + if (useLevels) para->setMaxLevel(2); @@ -363,9 +365,9 @@ void multipleLevel(const std::string& configPath) if (para->getKernelNeedsFluidNodeIndicesToRun()) gridBuilder->findFluidNodes(useStreams); - // gridBuilder->writeGridsToVtk(outPath + "/" + bivalveType + "/grid/part" + - // std::to_string(generatePart) + "_"); gridBuilder->writeGridsToVtk(outPath + "/" + bivalveType + "/" + - // std::to_string(generatePart) + "/grid/"); gridBuilder->writeArrows(outPath + "/" + bivalveType + "/" + + // gridBuilder->writeGridsToVtk(outPath + bivalveType + "/grid/part" + + // std::to_string(generatePart) + "_"); gridBuilder->writeGridsToVtk(outPath + bivalveType + "/" + + // std::to_string(generatePart) + "/grid/"); gridBuilder->writeArrows(outPath + bivalveType + "/" + // std::to_string(generatePart) + " /arrow"); SimulationFileWriter::write(gridPath + "/" + std::to_string(generatePart) + "/", gridBuilder, diff --git a/apps/gpu/LBM/MusselOyster/configMusselOyster.txt b/apps/gpu/LBM/MusselOyster/configMusselOyster.txt index 2654af3124c4c571fbb6a0bf5a9c189b90d604d6..d5470b018a41467cf6f3f66fcc1420f4cddedc24 100644 --- a/apps/gpu/LBM/MusselOyster/configMusselOyster.txt +++ b/apps/gpu/LBM/MusselOyster/configMusselOyster.txt @@ -12,14 +12,16 @@ NumberOfDevices=2 ################################################## #informations for Writing ################################################## -Path=E:/temp/MusselOysterResults +Path=/work/y0078217/Results/MusselOysterResults/ +#Path=E:/temp/MusselOysterResults/ #Path="F:/Work/Computations/out/MusselOyster/" #Prefix="MusselOyster" #WriteGrid=true ################################################## #informations for reading ################################################## -GridPath=E:/temp/GridMussel/MUSSEL +GridPath=E/work/y0078217/Grids/GridMusselOyster/ +#GridPath=E:/temp/GridMussel/MUSSEL/ #GridPath="C:" ################################################## diff --git a/apps/gpu/LBM/MusselOyster/configPhoenix1GPU.txt b/apps/gpu/LBM/MusselOyster/configPhoenix1GPU.txt index ff581337a0a1f1d5cfae349e5b57ee8ce13faa07..5ea755a751d35c4e5d7cc04b4b8b030aea6a918a 100644 --- a/apps/gpu/LBM/MusselOyster/configPhoenix1GPU.txt +++ b/apps/gpu/LBM/MusselOyster/configPhoenix1GPU.txt @@ -14,7 +14,7 @@ Path=/work/y0078217/Results/MusselOysterResults/1GPU/ ################################################## #informations for reading ################################################## -GridPath=/work/y0078217/Grids/GridMusselOyster/MUSSEL1GPU +GridPath=/work/y0078217/Grids/GridMusselOyster/MUSSEL1GPU/ #GridPath="C:" ################################################## diff --git a/apps/gpu/LBM/MusselOyster/configPhoenix2GPU.txt b/apps/gpu/LBM/MusselOyster/configPhoenix2GPU.txt index 8ec2cd734205bf8841e4d0c96d7a7ba4dd5c79cc..48fb6f29b5898bc2fe208bed5f2486df192233cc 100644 --- a/apps/gpu/LBM/MusselOyster/configPhoenix2GPU.txt +++ b/apps/gpu/LBM/MusselOyster/configPhoenix2GPU.txt @@ -14,7 +14,7 @@ Path=/work/y0078217/Results/MusselOysterResults/2GPU/ ################################################## #informations for reading ################################################## -GridPath=/work/y0078217/Grids/GridMusselOyster/MUSSEL2GPU +GridPath=/work/y0078217/Grids/GridMusselOyster/MUSSEL2GPU/ #GridPath="C:" ################################################## diff --git a/apps/gpu/LBM/MusselOyster/configPhoenix4GPU.txt b/apps/gpu/LBM/MusselOyster/configPhoenix4GPU.txt index 576d270f7e6ec9790228b944e2e9e5c0e5f47e50..db04c7e19bc0e354a88d431935e087f55e6923c3 100644 --- a/apps/gpu/LBM/MusselOyster/configPhoenix4GPU.txt +++ b/apps/gpu/LBM/MusselOyster/configPhoenix4GPU.txt @@ -14,7 +14,7 @@ Path=/work/y0078217/Results/MusselOysterResults/4GPU/ ################################################## #informations for reading ################################################## -GridPath=/work/y0078217/Grids/GridMusselOyster/MUSSEL4GPU +GridPath=/work/y0078217/Grids/GridMusselOyster/MUSSEL4GPU/ #GridPath="C:" ################################################## diff --git a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp index ed9f9c9e91c8486ab89132f532e7aa9e9ec632cd..9f60c83c97a7b23a847bcabff73311509abcf333 100644 --- a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp +++ b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp @@ -68,14 +68,14 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Tesla 03 - std::string outPath("E:/temp/SphereScalingResults"); - std::string gridPathParent = "E:/temp/GridSphereScaling/"; - std::string simulationName("SphereScaling"); +// std::string outPath("E:/temp/SphereScalingResults/"); +// std::string gridPathParent = "E:/temp/GridSphereScaling/"; +// std::string simulationName("SphereScaling"); -//// Phoenix -//std::string outPath("/work/y0078217/Results/SphereScalingResults/"); -//std::string gridPathParent = "/work/y0078217/Grids/GridSphereScaling/"; -//std::string simulationName("SphereScaling"); +// Phoenix +std::string outPath("/work/y0078217/Results/SphereScalingResults/"); +std::string gridPathParent = "/work/y0078217/Grids/GridSphereScaling/"; +std::string simulationName("SphereScaling"); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -153,8 +153,9 @@ void multipleLevel(const std::string& configPath) para->setOutputPath(outPath); } para->setOutputPrefix(simulationName); - para->setFName(para->getOutputPath() + "/" + para->getOutputPrefix()); + para->setFName(para->getOutputPath() + para->getOutputPrefix()); para->setPrintFiles(true); + std::cout << "Write result files to " << para->getFName() << std::endl; if (useLevels) para->setMaxLevel(2); @@ -185,8 +186,8 @@ void multipleLevel(const std::string& configPath) if (useGridGenerator) { - const real xGridMin = -32; - const real xGridMax = 32; + const real xGridMin = -20; //-37 + const real xGridMax = -xGridMin; const real yGridMin = xGridMin; const real yGridMax = xGridMax; const real zGridMin = xGridMin; @@ -342,9 +343,9 @@ void multipleLevel(const std::string& configPath) if (para->getKernelNeedsFluidNodeIndicesToRun()) gridBuilder->findFluidNodes(useStreams); - // gridBuilder->writeGridsToVtk(outPath + "/" + "/grid/part" + - // std::to_string(generatePart) + "_"); gridBuilder->writeGridsToVtk(outPath + "/" + "/" + - // std::to_string(generatePart) + "/grid/"); gridBuilder->writeArrows(outPath + "/" + "/" + + // gridBuilder->writeGridsToVtk(outPath + "grid/part" + + // std::to_string(generatePart) + "_"); gridBuilder->writeGridsToVtk(outPath + + // std::to_string(generatePart) + "/grid/"); gridBuilder->writeArrows(outPath + // std::to_string(generatePart) + " /arrow"); SimulationFileWriter::write(gridPath + "/" + std::to_string(generatePart) + "/", gridBuilder, diff --git a/apps/gpu/LBM/SphereScaling/config.txt b/apps/gpu/LBM/SphereScaling/config.txt index ca208ed262873920a0fc3f93a728dd1a20bd89ed..b31fb3caca02c61b15a2d3f7afe1ec86c1fe3330 100644 --- a/apps/gpu/LBM/SphereScaling/config.txt +++ b/apps/gpu/LBM/SphereScaling/config.txt @@ -12,14 +12,15 @@ ################################################## #informations for Writing ################################################## -Path=E:/temp/SphereScalingResults -#Path="F:/Work/Computations/out/SphereScaling/" +#Path="E:/temp/SphereScalingResults/" +Path=/work/y0078217/Results/SphereScalingResults/ #Prefix="SphereScaling" #WriteGrid=true ################################################## #informations for reading ################################################## -GridPath="E:/temp/GridSphereScaling/" +GridPath=/work/y0078217/Grids/GridSphereScaling/ +#GridPath=E:/temp/GridSphereScaling/ ################################################## #number of grid levels diff --git a/apps/gpu/LBM/SphereScaling/configPhoenix1GPU.txt b/apps/gpu/LBM/SphereScaling/configPhoenix1GPU.txt index d3d2af3d2998754a1169000c3cc6b6ec6d9e14ba..855419c8d4d76ee47159dd8c39a4ee0773b7c923 100644 --- a/apps/gpu/LBM/SphereScaling/configPhoenix1GPU.txt +++ b/apps/gpu/LBM/SphereScaling/configPhoenix1GPU.txt @@ -14,7 +14,7 @@ Path=/work/y0078217/Results/SphereScalingResults/1GPU/ ################################################## #informations for reading ################################################## -GridPath=/work/y0078217/Grids/GridSphereScaling/Sphere1GPU +GridPath=/work/y0078217/Grids/GridSphereScaling/SphereScaling1GPU/ #GridPath="C:" ################################################## diff --git a/apps/gpu/LBM/SphereScaling/configPhoenix2GPU.txt b/apps/gpu/LBM/SphereScaling/configPhoenix2GPU.txt index ad9a4c7c012627f57b302f1862206d93faed041e..a8800d9ac08546357f675ebe8974aeba8a18a647 100644 --- a/apps/gpu/LBM/SphereScaling/configPhoenix2GPU.txt +++ b/apps/gpu/LBM/SphereScaling/configPhoenix2GPU.txt @@ -14,7 +14,7 @@ Path=/work/y0078217/Results/SphereScalingResults/2GPU/ ################################################## #informations for reading ################################################## -GridPath=/work/y0078217/Grids/GridSphereScaling/SphereScaling2GPU +GridPath=/work/y0078217/Grids/GridSphereScaling/SphereScaling2GPU/ #GridPath="C:" ################################################## diff --git a/apps/gpu/LBM/SphereScaling/configPhoenix4GPU.txt b/apps/gpu/LBM/SphereScaling/configPhoenix4GPU.txt index 5b709606a7ecf1da4a928d63602da567d992c28e..712a7f6105c3e0a353638788362104a32bec5d8e 100644 --- a/apps/gpu/LBM/SphereScaling/configPhoenix4GPU.txt +++ b/apps/gpu/LBM/SphereScaling/configPhoenix4GPU.txt @@ -14,7 +14,7 @@ Path=/work/y0078217/Results/SphereScalingResults/4GPU/ ################################################## #informations for reading ################################################## -GridPath=/work/y0078217/Grids/GridSphereScaling/SphereScaling4GPU +GridPath=/work/y0078217/Grids/GridSphereScaling/SphereScaling4GPU/ #GridPath="C:" ##################################################