From 005f346862751d1c6916e908df15cd9a92448cfa Mon Sep 17 00:00:00 2001
From: Anna Wellmann <a.wellmann@tu-bs.de>
Date: Tue, 9 Nov 2021 10:03:36 +0100
Subject: [PATCH] Fix file path
---
apps/gpu/LBM/MusselOyster/MusselOyster.cpp | 12 +++++----
.../LBM/MusselOyster/configMusselOyster.txt | 6 +++--
.../LBM/MusselOyster/configPhoenix1GPU.txt | 2 +-
.../LBM/MusselOyster/configPhoenix2GPU.txt | 2 +-
.../LBM/MusselOyster/configPhoenix4GPU.txt | 2 +-
apps/gpu/LBM/SphereScaling/SphereScaling.cpp | 27 ++++++++++---------
apps/gpu/LBM/SphereScaling/config.txt | 7 ++---
.../LBM/SphereScaling/configPhoenix1GPU.txt | 2 +-
.../LBM/SphereScaling/configPhoenix2GPU.txt | 2 +-
.../LBM/SphereScaling/configPhoenix4GPU.txt | 2 +-
10 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
index 5ca312470..6bf1a1763 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 2654af312..d5470b018 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 ff581337a..5ea755a75 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 8ec2cd734..48fb6f29b 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 576d270f7..db04c7e19 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 ed9f9c9e9..9f60c83c9 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 ca208ed26..b31fb3cac 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 d3d2af3d2..855419c8d 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 ad9a4c7c0..a8800d9ac 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 5b709606a..712a7f610 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:"
##################################################
--
GitLab