.clang-format

@@ -61,48 +61,54 @@ IncludeCategories:
     Priority:        3
   - Regex:           '^"core/'
     Priority:        4
-  - Regex:           '^"cuda/'
-    Priority:        5
   - 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:           '^"gui/'
+  - Regex:           '^"gpu/'
     Priority:        12
   - Regex:           '^"lbm/'
     Priority:        13
-  - Regex:           '^"mesh/'
+  - Regex:           '^"lbm_mesapd_coupling/'
     Priority:        14
-  - Regex:           '^"pde/'
+  - Regex:           '^"mesh/'
     Priority:        15
-  - Regex:           '^"pe/'
+  - Regex:           '^"mesa_pd/'
     Priority:        16
-  - Regex:           '^"pe_coupling/'
+  - Regex:           '^"pde/'
     Priority:        17
-  - Regex:           '^"postprocessing/'
+  - Regex:           '^"pe/'
     Priority:        18
-  - Regex:           '^"python_coupling/'
+  - Regex:           '^"pe_coupling/'
     Priority:        19
-  - Regex:           '^"simd/'
+  - Regex:           '^"postprocessing/'
     Priority:        20
-  - Regex:           '^"stencil/'
+  - Regex:           '^"python_coupling/'
     Priority:        21
-  - Regex:           '^"timeloop/'
+  - Regex:           '^"simd/'
     Priority:        22
-  - Regex:           '^"vtk/'
+  - Regex:           '^"sqlite/'
     Priority:        23
-  - Regex:           '^<boost/'
+  - Regex:           '^"stencil/'
     Priority:        24
-  - Regex:           '^<'
+  - Regex:           '^"timeloop/'
     Priority:        25
+  - Regex:           '^"vtk/'
+    Priority:        26
+  - Regex:           '^<boost/'
+    Priority:        27
+  - Regex:           '^<'
+    Priority:        28
 IndentCaseLabels: false
 IndentPPDirectives: AfterHash
 IndentWidth: 3

.clang-tidy

@@ -4,55 +4,67 @@ Checks:          '
 -*,
 
 boost-*,
+-boost-use-ranges,
 
 bugprone-*,
 -bugprone-branch-clone,
 -bugprone-exception-escape,
+-bugprone-easily-swappable-parameters,
+-bugprone-crtp-constructor-accessibility,
+-bugprone-implicit-widening-of-multiplication-result,
+-bugprone-macro-parentheses,
+-bugprone-narrowing-conversions,
+-bugprone-switch-missing-default-case,
+-bugprone-assignment-in-if-condition,
+-bugprone-reserved-identifier,
 
 misc-*,
--misc-misplaced-const,
 -misc-no-recursion,
 -misc-non-private-member-variables-in-classes,
+-misc-include-cleaner,
+-misc-header-include-cycle,
+-misc-use-internal-linkage,
+-misc-use-anonymous-namespace,
+-misc-const-correctness,
+-misc-misplaced-const
 
 modernize-*,
 -modernize-use-auto,
--modernize-loop-convert,
 -modernize-pass-by-value,
 -modernize-raw-string-literal,
--modernize-use-using,
--modernize-avoid-bind,
--modernize-return-braced-init-list,
 -modernize-use-transparent-functors,
--modernize-redundant-void-arg,
 -modernize-use-trailing-return-type,
--modernize-avoid-c-arrays,
+-modernize-use-nodiscard,
+-modernize-macro-to-enum,
+-modernize-concat-nested-namespaces,
 
 mpi-*,
+-mpi-type-mismatch,
 
 openmp-*,
 -openmp-exception-escape,
 -openmp-use-default-none,
 
 performance-*,
+-performance-enum-size,
+-performance-noexcept-swap,
+-performance-unnecessary-value-param,
+-performance-avoid-endl,
+-performance-no-int-to-ptr,
 
 portability-*,
 
-readability-const-return-type,
 readability-container-size-empty,
 readability-delete-null-pointer,
 readability-deleted-default,
-readability-isolate-declaration,
-readability-misleading-indentation,
 readability-misplaced-array-index,
 readability-non-const-parameter,
-readability-redundant-access-specifiers,
 readability-redundant-control-flow,
 readability-redundant-declaration,
 readability-redundant-function-ptr-dereference,
 readability-redundant-preprocessor,
 readability-redundant-smartptr-get,
 readability-redundant-string-cstr,
-readability-simplify-boolean-expr,
 readability-simplify-subscript-expr,
 readability-static-accessed-through-instance,
 readability-static-definition-in-anonymous-namespace,
@@ -62,7 +74,6 @@ readability-use-anyofallof
 
 '
 WarningsAsErrors: '*'
-HeaderFilterRegex: ''
-AnalyzeTemporaryDtors: false
+HeaderFilterRegex: '.*'
 ...
 

.editorconfig

 # See https://editorconfig.org/
-root = true # top-most .editorconfig-file
+# top-most .editorconfig-file
+root = true
 
 [*]
 tab_width = 3
@@ -12,4 +13,4 @@ insert_final_newline = false
 [*.py]
 tab_width = 4
 indent_size = 4
-insert_final_newline = true
+insert_final_newline = true
\ No newline at end of file

.gitignore

@@ -8,6 +8,10 @@ qrc_*
 # macOS
 **/.DS_Store
 
+# CLion indexing
+*.uuid
+.fleet
+
 
 # Generated files
 *.out
@@ -29,9 +33,12 @@ qrc_*
 # Visual Studio Code
 /.vscode
 
+# Zed
+/.cache*
+
 # CLion
 *.idea
-
+*.clion*
 
 # QtCreator
 CMakeLists.txt.user.*
@@ -48,6 +55,8 @@ CMakeLists.txt.user.*
 logfile*.txt
 *TestLog_p*.txt
 
+# Python venv
+.venv
 
 # Compiled python
 *.pyc
@@ -60,6 +69,7 @@ logfile*.txt
 
 
 # CMake
+CMakeUserPresets.json
 /CMakeLists.txt.user
 
 # CMake build files
@@ -72,5 +82,11 @@ cmake_install.cmake
 CMakeDefs.h
 /moduleStatistics.json
 /walberla-config.cmake
-/cmake-build-debug/
-/cmake-build-release/
+cmake-build-*
+
+
+# Virtual environments
+.venv/
+env/
+venv/
+ENV/

.gitmodules

-[submodule "extern/pybind11"]
-	path = extern/pybind11
-	url = https://github.com/pybind/pybind11.git

AUTHORS.txt

@@ -13,7 +13,10 @@ Dominik Bartuschat
 Ehsan Fattahi
 Felix Winterhalter
 Florian Schornbaum
+Frederik Hennig
+Grigorii Drozdov
 Helen Schottenhamml
+Igor Ostanin
 Jan Götz
 Jan Hönig
 João Victor Tozatti Risso
@@ -28,6 +31,7 @@ Matthias Markl
 Michael Kuron
 Nils Kohl
 Paulo Carvalho
+Philipp Suffa
 Regina Ammer
 Sagar Dolas
 Sebastian Eibl

CHANGELOG.md

 # Changelog
 
-## [Unreleased]
+## [6.1] - 2022-07-25
+### Added
+- Free-surface LBM extension:
+  - Add implementation
+  - Add several showcases
+  - Add several tests
+- LBM - MESA_PD coupling:
+  - Add partially saturated cells method (PSM)
+  - Add fluidized bed showcase
+  - Add virtual mass stabilization technique for light particles
+  - Add support for more shapes, e.g., convex polyhedron
+- MESA_PD:
+   - Add extensive application for dense particle packing generation
+- AMD - HIP support
+  - Support of the ROCm Toolchain and thus AMD HIP as second GPU language
+  - All CUDA related files, namespaces, folders etc are renamed to gpu.
+  - Include "GPUWrapper.h" to use general GPU functions cudaMalloc -> gpuMalloc
+  - WALBERLA_BUILD_WITH_HIP and WALBERLA_BUILD_WITH_GPU_SUPPORT as new CMake variables introduced
+
+### Changed
+- Update and extend phase-field LBM showcases
+- Allow access to PDF centering information (for being used in generated LBM kernels)
+- Adapt code generation backend to be compatible with pystencils 1.0 and lbmpy 1.0
+- Required minimum dependencies:
+  - C++17-compliant compiler
+  - CMake 3.14
+  - pybind 2.6.2
+  - lbmpy 1.0
+  - pystencils 1.0
 
+### Deprecated
+- GUI
+
+## [5.1] - 2020-04-09
+### Added
+- Add new tutorials and showcases
+- Extend MESA-PD functionalities, including several molecular dynamics models
+- Fluid-particle coupling with MESA-PD: functionalities, tests, benchmark scenarios
+
+### Changed
+- Update to C++17
+- Update CUDA compiler support
+- Extend Clang-Tidy coverage
+- Add closer integration of code generation using pystencils and lbmpy
 - Python Coupling now build upon pybind11. Boost.Python is no longer supported
   - lbm module dropped from python coupling due to deprecation for a long time
   - geometry, postprocessing and timeloop dropped from python coupling due to its low usage
   - PEP8-ification of Python API. This means all keyword arguments are now in snake_case and not in CamelCase as before.
 
+### Fixed
+- Guo force model for non-SRT, may change simulation results
+
 ## [4.1] - 2019-04-19
 ### Added
 - Galerkin coarsening for Multigrid
@@ -59,4 +104,3 @@
 
 ### Deprecated
 - all dynamic level-wise balance functions (use the more general ones, without "level-wise")
-

CMakePresets.json

+{
+    "version": 6,
+    "cmakeMinimumRequired": {
+      "major": 3,
+      "minor": 23,
+      "patch": 0
+    },
+    "configurePresets": [
+      {
+        "name": "clang-tidy",
+        "generator": "Unix Makefiles",
+        "binaryDir": "${sourceDir}/build/clang-tidy",
+        "cacheVariables": {
+          "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+          "WALBERLA_BUFFER_DEBUG": true,
+          "WALBERLA_BUILD_TESTS": true,
+          "WALBERLA_BUILD_BENCHMARKS": true,
+          "WALBERLA_BUILD_TUTORIALS": true,
+          "WALBERLA_BUILD_TOOLS": true,
+          "WALBERLA_BUILD_WITH_MPI": true,
+          "WALBERLA_BUILD_WITH_OPENMP": true,
+          "CMAKE_BUILD_TYPE": "Debug",
+          "WALBERLA_BUILD_WITH_METIS": true,
+          "WALBERLA_BUILD_WITH_PARMETIS": true,
+          "WALBERLA_BUILD_WITH_OPENMESH": true,
+          "WALBERLA_DOUBLE_ACCURACY": true,
+          "WALBERLA_LOGLEVEL": "DETAIL"
+        }
+      }
+    ]
+  }
+  
\ No newline at end of file

apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt

-waLBerla_add_executable( NAME WorkloadEvaluation FILES WorkloadEvaluation.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk )
+waLBerla_add_executable( NAME WorkloadEvaluation FILES WorkloadEvaluation.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk )
 
-waLBerla_add_executable( NAME AMRSedimentSettling FILES AMRSedimentSettling.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk )
+waLBerla_add_executable( NAME AMRSedimentSettling FILES AMRSedimentSettling.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk )
 
-waLBerla_add_executable( NAME AMRSettlingSphere FILES AMRSettlingSphere.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk )
+waLBerla_add_executable( NAME AMRSettlingSphere FILES AMRSettlingSphere.cpp DEPENDS walberla::blockforest walberla::boundary walberla::core walberla::field walberla::lbm walberla::pe walberla::pe_coupling walberla::postprocessing walberla::stencil walberla::timeloop walberla::vtk )

apps/benchmarks/CNT/CMakeLists.txt

+waLBerla_link_files_to_builddir( *.dat )
+
+waLBerla_add_executable( NAME 01_cnt_film
+   FILES 01_cnt_film.cpp
+        Config.cpp
+        FilmSpecimen.cpp
+        InitializeCNTs.cpp
+        SQLProperties.cpp
+        Statistics.cpp
+      DEPENDS walberla::blockforest walberla::core walberla::mesa_pd walberla::sqlite walberla::vtk )