Merge branch 'kemmler/particle_coupling_GPU' into 'master'

Merge kemmler/particle_coupling_GPU (particle coupling using code generation for PSM) into master

See merge request walberla/walberla!696

.clang-format

@@ -62,16 +62,18 @@ IncludeCategories:
   - Regex:           '^"core/'
     Priority:        4
   - Regex:           '^"domain_decomposition/'
-    Priority:        6
+    Priority:        5
   - Regex:           '^"executiontree/'
-    Priority:        7
+    Priority:        6
   - Regex:           '^"fft/'
-    Priority:        8
+    Priority:        7
   - Regex:           '^"field/'
-    Priority:        9
+    Priority:        8
   - Regex:           '^"gather/'
-    Priority:        10
+    Priority:        9
   - Regex:           '^"geometry/'
+    Priority:        10
+  - Regex:           '^"gpu/'
     Priority:        11
   - Regex:           '^"gpu/'
     Priority:        12
@@ -97,16 +99,18 @@ IncludeCategories:
     Priority:        21
   - Regex:           '^"simd/'
     Priority:        22
-  - Regex:           '^"stencil/'
+  - Regex:           '^"sqlite/'
     Priority:        23
-  - Regex:           '^"timeloop/'
+  - Regex:           '^"stencil/'
     Priority:        24
-  - Regex:           '^"vtk/'
+  - Regex:           '^"timeloop/'
     Priority:        25
-  - Regex:           '^<boost/'
+  - Regex:           '^"vtk/'
     Priority:        26
-  - Regex:           '^<'
+  - Regex:           '^<boost/'
     Priority:        27
+  - Regex:           '^<'
+    Priority:        28
 IndentCaseLabels: false
 IndentPPDirectives: AfterHash
 IndentWidth: 3

.gitlab-ci.yml

@@ -57,6 +57,7 @@ stages:
         -DWALBERLA_BUILD_WITH_CODEGEN=$WALBERLA_BUILD_WITH_CODEGEN
         -DWALBERLA_STL_BOUNDS_CHECKS=$WALBERLA_STL_BOUNDS_CHECKS
         -DWALBERLA_LOGLEVEL=$WALBERLA_LOGLEVEL
+        -DCMAKE_CUDA_ARCHITECTURES=60
       - cmake . -LA
       - make -j $NUM_BUILD_CORES -l $NUM_CORES
       - ctest -LE $CTEST_EXCLUDE_LABELS -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES -T Test

apps/benchmarks/CMakeLists.txt

@@ -5,9 +5,11 @@ add_subdirectory( DEM )
 add_subdirectory( MeshDistance )
 add_subdirectory( CouetteFlow )
 add_subdirectory( FreeSurfaceAdvection )
+add_subdirectory( FluidizedBed )
 add_subdirectory( FluidParticleCoupling )
 add_subdirectory( FluidParticleCouplingWithLoadBalancing )
 add_subdirectory( ForcesOnSphereNearPlaneInShearFlow )
+add_subdirectory(Percolation)
 add_subdirectory( GranularGas )
 add_subdirectory( IntegratorAccuracy )
 add_subdirectory( LennardJones )

apps/benchmarks/FluidParticleCoupling/CMakeLists.txt

@@ -67,7 +67,5 @@ waLBerla_add_executable ( NAME ObliqueWetCollision FILES ObliqueWetCollision.cpp
 
 endif()
 
-
-
 waLBerla_add_executable ( NAME ObliqueDryCollision FILES ObliqueDryCollision.cpp
-      DEPENDS blockforest core mesa_pd postprocessing )
+      DEPENDS blockforest core mesa_pd postprocessing )

apps/benchmarks/FluidizedBed/CMakeLists.txt

@@ -0,0 +1,6 @@
+waLBerla_link_files_to_builddir("*.prm")
+
+if (WALBERLA_BUILD_WITH_GPU_SUPPORT AND WALBERLA_BUILD_WITH_CODEGEN AND (CMAKE_CUDA_ARCHITECTURES GREATER_EQUAL 60 OR WALBERLA_BUILD_WITH_HIP))
+    waLBerla_add_executable(NAME FluidizedBed_PSM_GPU FILES FluidizedBedGPU.cpp
+            DEPENDS blockforest boundary core gpu domain_decomposition field lbm lbm_mesapd_coupling mesa_pd timeloop vtk PSMCodegenPython_srt_sc1)
+endif ()