From d4dffb0cf5eee278f0d38ba27c49eaa6fa0efda9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sch=C3=B6nherr?= <schoen@irmb.tu-bs.de> Date: Fri, 28 Jun 2019 14:24:05 +0200 Subject: [PATCH] moves machinefiles to base folder --- CMakeMacros/Environment/environment.cmake | 2 +- .../Environment/MachineFiles => MachineFiles}/.gitignore | 0 .../Environment/MachineFiles => MachineFiles}/BAUMBART | 0 {CMakeMacros/Environment/MachineFiles => MachineFiles}/GAMLING | 0 {CMakeMacros/Environment/MachineFiles => MachineFiles}/LEGOLAS | 0 .../Environment/MachineFiles => MachineFiles}/Legolas-Kubuntu | 0 .../Environment/MachineFiles => MachineFiles}/STEPHAN-TP | 0 {CMakeMacros/Environment/MachineFiles => MachineFiles}/TESLA03 | 0 .../Environment/MachineFiles => MachineFiles}/computerName | 0 {CMakeMacros/Environment/MachineFiles => MachineFiles}/login01 | 0 {CMakeMacros/Environment/MachineFiles => MachineFiles}/login02 | 0 targets/apps/LBM/DrivenCavity/DrivenCavity.cpp | 3 ++- 12 files changed, 3 insertions(+), 2 deletions(-) rename {CMakeMacros/Environment/MachineFiles => MachineFiles}/.gitignore (100%) rename {CMakeMacros/Environment/MachineFiles => MachineFiles}/BAUMBART (100%) rename {CMakeMacros/Environment/MachineFiles => MachineFiles}/GAMLING (100%) rename {CMakeMacros/Environment/MachineFiles => MachineFiles}/LEGOLAS (100%) rename {CMakeMacros/Environment/MachineFiles => MachineFiles}/Legolas-Kubuntu (100%) rename {CMakeMacros/Environment/MachineFiles => MachineFiles}/STEPHAN-TP (100%) rename {CMakeMacros/Environment/MachineFiles => MachineFiles}/TESLA03 (100%) rename {CMakeMacros/Environment/MachineFiles => MachineFiles}/computerName (100%) rename {CMakeMacros/Environment/MachineFiles => MachineFiles}/login01 (100%) rename {CMakeMacros/Environment/MachineFiles => MachineFiles}/login02 (100%) diff --git a/CMakeMacros/Environment/environment.cmake b/CMakeMacros/Environment/environment.cmake index fe4109eb3..2c33e5cc2 100644 --- a/CMakeMacros/Environment/environment.cmake +++ b/CMakeMacros/Environment/environment.cmake @@ -2,4 +2,4 @@ unset(BUILD_computerName) site_name(BUILD_computerName) MESSAGE(STATUS "computer name: " ${BUILD_computerName}) -include(${CMAKE_CURRENT_LIST_DIR}/MachineFiles/${BUILD_computerName}) \ No newline at end of file +include(${CMAKE_SOURCE_DIR}/MachineFiles/${BUILD_computerName}) \ No newline at end of file diff --git a/CMakeMacros/Environment/MachineFiles/.gitignore b/MachineFiles/.gitignore similarity index 100% rename from CMakeMacros/Environment/MachineFiles/.gitignore rename to MachineFiles/.gitignore diff --git a/CMakeMacros/Environment/MachineFiles/BAUMBART b/MachineFiles/BAUMBART similarity index 100% rename from CMakeMacros/Environment/MachineFiles/BAUMBART rename to MachineFiles/BAUMBART diff --git a/CMakeMacros/Environment/MachineFiles/GAMLING b/MachineFiles/GAMLING similarity index 100% rename from CMakeMacros/Environment/MachineFiles/GAMLING rename to MachineFiles/GAMLING diff --git a/CMakeMacros/Environment/MachineFiles/LEGOLAS b/MachineFiles/LEGOLAS similarity index 100% rename from CMakeMacros/Environment/MachineFiles/LEGOLAS rename to MachineFiles/LEGOLAS diff --git a/CMakeMacros/Environment/MachineFiles/Legolas-Kubuntu b/MachineFiles/Legolas-Kubuntu similarity index 100% rename from CMakeMacros/Environment/MachineFiles/Legolas-Kubuntu rename to MachineFiles/Legolas-Kubuntu diff --git a/CMakeMacros/Environment/MachineFiles/STEPHAN-TP b/MachineFiles/STEPHAN-TP similarity index 100% rename from CMakeMacros/Environment/MachineFiles/STEPHAN-TP rename to MachineFiles/STEPHAN-TP diff --git a/CMakeMacros/Environment/MachineFiles/TESLA03 b/MachineFiles/TESLA03 similarity index 100% rename from CMakeMacros/Environment/MachineFiles/TESLA03 rename to MachineFiles/TESLA03 diff --git a/CMakeMacros/Environment/MachineFiles/computerName b/MachineFiles/computerName similarity index 100% rename from CMakeMacros/Environment/MachineFiles/computerName rename to MachineFiles/computerName diff --git a/CMakeMacros/Environment/MachineFiles/login01 b/MachineFiles/login01 similarity index 100% rename from CMakeMacros/Environment/MachineFiles/login01 rename to MachineFiles/login01 diff --git a/CMakeMacros/Environment/MachineFiles/login02 b/MachineFiles/login02 similarity index 100% rename from CMakeMacros/Environment/MachineFiles/login02 rename to MachineFiles/login02 diff --git a/targets/apps/LBM/DrivenCavity/DrivenCavity.cpp b/targets/apps/LBM/DrivenCavity/DrivenCavity.cpp index c92efed5a..e84044f11 100644 --- a/targets/apps/LBM/DrivenCavity/DrivenCavity.cpp +++ b/targets/apps/LBM/DrivenCavity/DrivenCavity.cpp @@ -94,7 +94,8 @@ const real dt = 0.5e-3; const uint nx = 64; -std::string path("F:/Work/Computations/out/DrivenCavity/"); +//std::string path("F:/Work/Computations/out/DrivenCavity/"); //LEGOLAS +std::string path("E:/DrivenCavity/results/"); //TESLA03 std::string simulationName("DrivenCavity"); -- GitLab