From 274d2fb8f764717f5ac2a880424bea0ea9184180 Mon Sep 17 00:00:00 2001
From: HenrikAsmuth <henrik.asmuth@geo.uu.se>
Date: Thu, 8 Sep 2022 08:42:31 +0200
Subject: [PATCH] final adjustments for merge
---
.gitignore | 5 ++++-
gpu.cmake | 21 ++++-----------------
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/.gitignore b/.gitignore
index f87c8efbb..9895b4433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,7 @@ stl/
.DS_Store
# Settings
-.gitconfig
\ No newline at end of file
+.gitconfig
+.gitignore
+Cmake/cmake_config_files/MULE*
+Cmake/cmake_config_files/HINNY*
diff --git a/gpu.cmake b/gpu.cmake
index cc585bdb5..ee456d7fa 100644
--- a/gpu.cmake
+++ b/gpu.cmake
@@ -25,23 +25,10 @@ add_subdirectory(src/gpu/GridGenerator)
IF (BUILD_VF_GPU)
add_subdirectory(src/gpu/VirtualFluids_GPU)
- #add_subdirectory(targets/apps/LBM/lbmTest)
- #add_subdirectory(targets/apps/LBM/metisTest)
- #add_subdirectory(targets/apps/LBM/Basel)
- #add_subdirectory(targets/apps/LBM/BaselNU)
- #add_subdirectory(targets/apps/LBM/BaselMultiGPU)
-
- # add_subdirectory(apps/gpu/LBM/DrivenCavity)
- # add_subdirectory(apps/gpu/LBM/SphereGPU)
- #add_subdirectory(apps/gpu/LBM/WTG_RUB)
- #add_subdirectory(apps/gpu/LBM/gridGeneratorTest)
- #add_subdirectory(apps/gpu/LBM/TGV_3D)
- #add_subdirectory(apps/gpu/LBM/TGV_3D_MultiGPU)
- #add_subdirectory(apps/gpu/LBM/SphereScaling)
- #add_subdirectory(apps/gpu/LBM/DrivenCavityMultiGPU)
- #add_subdirectory(apps/gpu/LBM/MusselOyster)
- #add_subdirectory(apps/gpu/LBM/Poiseuille)
- #add_subdirectory(apps/gpu/LBM/ActuatorLine)
+ add_subdirectory(src/gpu/VirtualFluids_GPU)
+
+ add_subdirectory(apps/gpu/LBM/DrivenCavity)
+ add_subdirectory(apps/gpu/LBM/SphereGPU)
add_subdirectory(apps/gpu/LBM/BoundaryLayer)
ELSE()
MESSAGE( STATUS "exclude Virtual Fluids GPU." )
--
GitLab