From 88553b72e7987759b632d17e0112422ce3839a44 Mon Sep 17 00:00:00 2001 From: Anna Wellmann <a.wellmann@tu-bs.de> Date: Tue, 3 May 2022 06:57:42 +0000 Subject: [PATCH] Add configuration for Aragorn to MusselOyster --- apps/gpu/LBM/MusselOyster/MusselOyster.cpp | 15 ++++++++++----- apps/gpu/LBM/MusselOyster/configMusselOyster.txt | 14 ++++++++------ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp index f5c40013b..b67e2e7c9 100644 --- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp +++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp @@ -1,4 +1,3 @@ - #define _USE_MATH_DEFINES #include <math.h> #include <string> @@ -73,12 +72,18 @@ // std::string stlPath("C:/Users/Master/Documents/MasterAnna/STL/"); // std::string simulationName("MusselOyster"); -// Phoenix -std::string outPath("/work/y0078217/Results/MusselOysterResults/"); -std::string gridPathParent = "/work/y0078217/Grids/GridMusselOyster/"; -std::string stlPath("/home/y0078217/STL/MusselOyster/"); +// Aragorn +std::string outPath("/workspaces/VirtualFluids_dev/output/MusselOysterResults/"); +std::string gridPathParent = "/workspaces/VirtualFluids_dev/output/MusselOysterResults/grid/"; +std::string stlPath("/workspaces/VirtualFluids_dev/STL/MusselOyster/"); std::string simulationName("MusselOyster"); +// Phoenix +// std::string outPath("/work/y0078217/Results/MusselOysterResults/"); +// std::string gridPathParent = "/work/y0078217/Grids/GridMusselOyster/"; +// std::string stlPath("/home/y0078217/STL/MusselOyster/"); +// std::string simulationName("MusselOyster"); + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/apps/gpu/LBM/MusselOyster/configMusselOyster.txt b/apps/gpu/LBM/MusselOyster/configMusselOyster.txt index 3c6ac8b5f..0978e65f0 100644 --- a/apps/gpu/LBM/MusselOyster/configMusselOyster.txt +++ b/apps/gpu/LBM/MusselOyster/configMusselOyster.txt @@ -8,6 +8,9 @@ # Phoenix openmpi # mpirun -np 4 nvprof -f -o MusselOyster.%q{OMPI_COMM_WORLD_RANK}.nvprof "./VirtualFluids_dev/build/bin/MusselOyster" "./VirtualFluids_dev/apps/gpu/LBM/SphereScaling/configPhoenix4GPU.txt" +# Aragorn + ./bin/MusselOyster "../apps/gpu/LBM/MusselOyster/configMusselOyster.txt" + ################################################## #GPU Mapping ################################################## @@ -17,16 +20,15 @@ NumberOfDevices=2 ################################################## #informations for Writing ################################################## -Path=/work/y0078217/Results/MusselOysterResults/ -#Path=E:/temp/MusselOysterResults/ -#Path="F:/Work/Computations/out/MusselOyster/" +#Path=/work/y0078217/Results/MusselOysterResults/ +Path=/workspaces/VirtualFluids_dev/output/MusselOysterResults/ #Prefix="MusselOyster" #WriteGrid=true ################################################## #informations for reading ################################################## -GridPath=E/work/y0078217/Grids/GridMusselOyster/ -#GridPath=E:/temp/GridMussel/MUSSEL/ +#GridPath=E:/work/y0078217/Grids/GridMusselOyster/ +GridPath=/workspaces/VirtualFluids_dev/output/MusselOysterResults/grid/ #GridPath="C:" ################################################## @@ -44,5 +46,5 @@ GridPath=E/work/y0078217/Grids/GridMusselOyster/ #simulation parameter ################################################## TimeEnd=10000 -TimeOut=1000 +TimeOut=10000 #TimeStartOut=0 \ No newline at end of file -- GitLab