From 9453784a0011bbeaf2a631d8c9a4330c66d67303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Sch=C3=B6nherr?= <schoen@irmb.tu-bs.de>
Date: Thu, 3 Dec 2020 11:19:04 +0100
Subject: [PATCH] set the output/logfile/grid path in machinefile no changes in
configFiles for numerical tests necessary
---
CMake/cmake_config_files/TESLA03.config.cmake | 7 +++++--
.../ConfigFileReaderNT/ConfigFileReaderNT.cpp | 14 +++++++++-----
.../tests/NumericalTests/configK15_nu10tm2.txt | 14 +++++++-------
.../tests/NumericalTests/configK15_nu10tm3.txt | 16 ++++++++--------
.../tests/NumericalTests/configK15_nu10tm4.txt | 16 ++++++++--------
.../tests/NumericalTests/configK15_nu10tm5.txt | 14 +++++++-------
6 files changed, 44 insertions(+), 37 deletions(-)
diff --git a/CMake/cmake_config_files/TESLA03.config.cmake b/CMake/cmake_config_files/TESLA03.config.cmake
index 55ef7a242..bf08ef364 100644
--- a/CMake/cmake_config_files/TESLA03.config.cmake
+++ b/CMake/cmake_config_files/TESLA03.config.cmake
@@ -12,7 +12,10 @@ SET(FFTW_ROOT ${CMAKE_SOURCE_DIR}/3rdParty/fftw/fftw-3.3.7 CACHE PATH "JSONCPP R
#SET TO CORRECT PATH:
-SET(BOOST_ROOT "F:\\boost\\boost_1_74_0" CACHE PATH "BOOST_ROOT")
-SET(BOOST_LIBRARYDIR "F:\\boost\\boost_1_74_0\\stageMSVC64VS2019\\lib" CACHE PATH "BOOST_LIBRARYDIR")
+SET(BOOST_ROOT "F:/boost/boost_1_74_0" CACHE PATH "BOOST_ROOT")
+SET(BOOST_LIBRARYDIR "F:/boost/boost_1_74_0/stageMSVC64VS2019/lib" CACHE PATH "BOOST_LIBRARYDIR")
SET(VTK_DIR "F:/Libraries/vtk/VTK-8.2.0/build" CACHE PATH "VTK directory override" FORCE)
+
+SET(PATH_NUMERICAL_TESTS "E:/temp/numericalTests/")
+LIST(APPEND VF_COMPILER_DEFINITION "PATH_NUMERICAL_TESTS=${PATH_NUMERICAL_TESTS}")
diff --git a/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp b/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp
index ee75dcf29..37a34a3c3 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp
@@ -8,6 +8,10 @@
#include <string>
#include <fstream>
+#define VAL(str) #str
+#define TOSTRING(str) VAL(str)
+
+
std::shared_ptr<ConfigFileReader> ConfigFileReader::getNewInstance(const std::string aFilePath)
{
return std::shared_ptr<ConfigFileReader>(new ConfigFileReader(aFilePath));
@@ -32,7 +36,7 @@ void ConfigFileReader::readConfigFile()
configData->kernelsToTest = readKernelList(input);
configData->writeAnalyticalToVTK = StringUtil::toBool(input->getValue("WriteAnalyResultsToVTK"));
configData->ySliceForCalculation = StringUtil::toInt(input->getValue("ySliceForCalculation"));;
- configData->logFilePath = input->getValue("PathLogFile");
+ configData->logFilePath = TOSTRING(PATH_NUMERICAL_TESTS) + input->getValue("FolderLogFile");
configData->numberOfSimulations = calcNumberOfSimulations(input);
std::shared_ptr<BasicSimulationParameterStruct> basicSimPara = makeBasicSimulationParameter(input);
@@ -131,7 +135,7 @@ std::vector<std::shared_ptr<TaylorGreenVortexUxParameterStruct> > ConfigFileRead
aParameter->basicTimeStepLength = basisTimeStepLength.at(i);
aParameter->l0 = l0;
aParameter->rho0 = StringUtil::toDouble(input->getValue("Rho0"));
- aParameter->vtkFilePath = input->getValue("PathForVTKFileWriting");
+ aParameter->vtkFilePath = TOSTRING(PATH_NUMERICAL_TESTS) + input->getValue("FolderForVTKFileWriting");
aParameter->dataToCalcTests = StringUtil::toStringVector(input->getValue("DataToCalcTests_TGV_Ux"));
parameter.push_back(aParameter);
}
@@ -155,7 +159,7 @@ std::vector<std::shared_ptr<TaylorGreenVortexUzParameterStruct> > ConfigFileRead
aParameter->basicTimeStepLength = basisTimeStepLength.at(i);
aParameter->l0 = l0;
aParameter->rho0 = StringUtil::toDouble(input->getValue("Rho0"));
- aParameter->vtkFilePath = input->getValue("PathForVTKFileWriting");
+ aParameter->vtkFilePath = TOSTRING(PATH_NUMERICAL_TESTS) + input->getValue("FolderForVTKFileWriting");
aParameter->dataToCalcTests = StringUtil::toStringVector(input->getValue("DataToCalcTests_TGV_Uz"));
parameter.push_back(aParameter);
}
@@ -178,7 +182,7 @@ std::vector<std::shared_ptr<ShearWaveParameterStruct> > ConfigFileReader::makeSh
aParameter->basicTimeStepLength = basisTimeStepLength.at(i);
aParameter->l0 = l0;
aParameter->rho0 = StringUtil::toDouble(input->getValue("Rho0"));
- aParameter->vtkFilePath = input->getValue("PathForVTKFileWriting");
+ aParameter->vtkFilePath = TOSTRING(PATH_NUMERICAL_TESTS) + input->getValue("FolderForVTKFileWriting");
aParameter->dataToCalcTests = StringUtil::toStringVector(input->getValue("DataToCalcTests_SW"));
parameter.push_back(aParameter);
}
@@ -283,7 +287,7 @@ std::vector<std::shared_ptr<GridInformationStruct> > ConfigFileReader::makeGridI
if (StringUtil::toBool(input->getValue(valueNames.at(i)))) {
lx.push_back(nextNumber);
lz.push_back(nextNumber * 3.0 / 2.0);
- gridPath.push_back(input->getValue(gridPaths.at(i)));
+ gridPath.push_back(TOSTRING(PATH_NUMERICAL_TESTS) + input->getValue(gridPaths.at(i)));
nextNumber *= 2;
}
}
diff --git a/apps/gpu/tests/NumericalTests/configK15_nu10tm2.txt b/apps/gpu/tests/NumericalTests/configK15_nu10tm2.txt
index 8930319e6..c1592b7e0 100644
--- a/apps/gpu/tests/NumericalTests/configK15_nu10tm2.txt
+++ b/apps/gpu/tests/NumericalTests/configK15_nu10tm2.txt
@@ -106,19 +106,19 @@ ShearWave512=true
##################################################
NumberOfGridLevels=1
-GridPath32="E:\temp\numericalTests\grids\gridUni32x4x48"
-GridPath64="E:\temp\numericalTests\grids\gridUni64x4x96"
-GridPath128="E:\temp\numericalTests\grids\gridUni128x4x192"
-GridPath256="E:\temp\numericalTests\grids\gridUni256x4x384"
-GridPath512="E:\temp\numericalTests\grids\gridUni512x4x768"
+GridPath32="grids/gridUni32x4x48"
+GridPath64="grids/gridUni64x4x96"
+GridPath128="grids/gridUni128x4x192"
+GridPath256="grids/gridUni256x4x384"
+GridPath512="grids/gridUni512x4x768"
##################################################
# File Writing Information #
##################################################
WriteVTKFiles=false
-PathForVTKFileWriting="E:\temp\numericalTests\Output"
+FolderForVTKFileWriting="Output"
StartStepFileWriter=0
WriteAnalyResultsToVTK=true
-PathLogFile="E:\temp\numericalTests\logFiles"
\ No newline at end of file
+FolderLogFile="logFiles"
\ No newline at end of file
diff --git a/apps/gpu/tests/NumericalTests/configK15_nu10tm3.txt b/apps/gpu/tests/NumericalTests/configK15_nu10tm3.txt
index 783e6ebbb..eb27bc5f4 100644
--- a/apps/gpu/tests/NumericalTests/configK15_nu10tm3.txt
+++ b/apps/gpu/tests/NumericalTests/configK15_nu10tm3.txt
@@ -1,7 +1,7 @@
##################################################
# GPU Mapping #
##################################################
-Devices="0"
+Devices="1"
##################################################
# Basic Simulation Parameter #
@@ -106,19 +106,19 @@ ShearWave512=true
##################################################
NumberOfGridLevels=1
-GridPath32="E:\temp\numericalTests\grids\gridUni32x4x48"
-GridPath64="E:\temp\numericalTests\grids\gridUni64x4x96"
-GridPath128="E:\temp\numericalTests\grids\gridUni128x4x192"
-GridPath256="E:\temp\numericalTests\grids\gridUni256x4x384"
-GridPath512="E:\temp\numericalTests\grids\gridUni512x4x768"
+GridPath32="grids/gridUni32x4x48"
+GridPath64="grids/gridUni64x4x96"
+GridPath128="grids/gridUni128x4x192"
+GridPath256="grids/gridUni256x4x384"
+GridPath512="grids/gridUni512x4x768"
##################################################
# File Writing Information #
##################################################
WriteVTKFiles=false
-PathForVTKFileWriting="E:\temp\numericalTests\Output"
+FolderForVTKFileWriting="Output"
StartStepFileWriter=0
WriteAnalyResultsToVTK=true
-PathLogFile="E:\temp\numericalTests\logFiles"
\ No newline at end of file
+FolderLogFile="logFiles"
\ No newline at end of file
diff --git a/apps/gpu/tests/NumericalTests/configK15_nu10tm4.txt b/apps/gpu/tests/NumericalTests/configK15_nu10tm4.txt
index bb7ef4d4e..d0ceb823b 100644
--- a/apps/gpu/tests/NumericalTests/configK15_nu10tm4.txt
+++ b/apps/gpu/tests/NumericalTests/configK15_nu10tm4.txt
@@ -1,7 +1,7 @@
##################################################
# GPU Mapping #
##################################################
-Devices="0"
+Devices="1"
##################################################
# Basic Simulation Parameter #
@@ -106,19 +106,19 @@ ShearWave512=true
##################################################
NumberOfGridLevels=1
-GridPath32="E:\temp\numericalTests\grids\gridUni32x4x48"
-GridPath64="E:\temp\numericalTests\grids\gridUni64x4x96"
-GridPath128="E:\temp\numericalTests\grids\gridUni128x4x192"
-GridPath256="E:\temp\numericalTests\grids\gridUni256x4x384"
-GridPath512="E:\temp\numericalTests\grids\gridUni512x4x768"
+GridPath32="grids/gridUni32x4x48"
+GridPath64="grids/gridUni64x4x96"
+GridPath128="grids/gridUni128x4x192"
+GridPath256="grids/gridUni256x4x384"
+GridPath512="grids/gridUni512x4x768"
##################################################
# File Writing Information #
##################################################
WriteVTKFiles=false
-PathForVTKFileWriting="E:\temp\numericalTests\Output"
+FolderForVTKFileWriting="Output"
StartStepFileWriter=0
WriteAnalyResultsToVTK=true
-PathLogFile="E:\temp\numericalTests\logFiles"
\ No newline at end of file
+FolderLogFile="logFiles"
\ No newline at end of file
diff --git a/apps/gpu/tests/NumericalTests/configK15_nu10tm5.txt b/apps/gpu/tests/NumericalTests/configK15_nu10tm5.txt
index 2dcd9e97c..1b0b7d786 100644
--- a/apps/gpu/tests/NumericalTests/configK15_nu10tm5.txt
+++ b/apps/gpu/tests/NumericalTests/configK15_nu10tm5.txt
@@ -106,19 +106,19 @@ ShearWave512=true
##################################################
NumberOfGridLevels=1
-GridPath32="E:\temp\numericalTests\grids\gridUni32x4x48"
-GridPath64="E:\temp\numericalTests\grids\gridUni64x4x96"
-GridPath128="E:\temp\numericalTests\grids\gridUni128x4x192"
-GridPath256="E:\temp\numericalTests\grids\gridUni256x4x384"
-GridPath512="E:\temp\numericalTests\grids\gridUni512x4x768"
+GridPath32="grids/gridUni32x4x48"
+GridPath64="grids/gridUni64x4x96"
+GridPath128="grids/gridUni128x4x192"
+GridPath256="grids/gridUni256x4x384"
+GridPath512="grids/gridUni512x4x768"
##################################################
# File Writing Information #
##################################################
WriteVTKFiles=false
-PathForVTKFileWriting="E:\temp\numericalTests\Output"
+FolderForVTKFileWriting="Output"
StartStepFileWriter=0
WriteAnalyResultsToVTK=true
-PathLogFile="E:\temp\numericalTests\logFiles"
\ No newline at end of file
+FolderLogFile="logFiles"
\ No newline at end of file
--
GitLab