Merge branch 'lbm_mesapd_coupling_PSM' into 'master' (2d52ee3d) · Commits · Arash Partow / waLBerla

Commit 2d52ee3d authored 2 years ago by

Christoph Rettinger

Merge branch 'lbm_mesapd_coupling_PSM' into 'master'

Add the PSM to lbm_mesapd_coupling

See merge request !548

parents b290eeee c5d065bb

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.clang-format 16 additions, 12 deletions

.clang-format
src/geometry/bodies/DynamicBody.h 6 additions, 2 deletions

src/geometry/bodies/DynamicBody.h
src/lbm_mesapd_coupling/CMakeLists.txt 2 additions, 1 deletion

src/lbm_mesapd_coupling/CMakeLists.txt
src/lbm_mesapd_coupling/DataTypes.h 19 additions, 10 deletions

src/lbm_mesapd_coupling/DataTypes.h
src/lbm_mesapd_coupling/overlapping/OverlapFraction.h 117 additions, 0 deletions

src/lbm_mesapd_coupling/overlapping/OverlapFraction.h
src/lbm_mesapd_coupling/overlapping/shapes/BoxWithOverlap.h 62 additions, 0 deletions

src/lbm_mesapd_coupling/overlapping/shapes/BoxWithOverlap.h
src/lbm_mesapd_coupling/overlapping/shapes/CylindricalBoundaryWithOverlap.h 64 additions, 0 deletions

...pling/overlapping/shapes/CylindricalBoundaryWithOverlap.h
src/lbm_mesapd_coupling/overlapping/shapes/EllipsoidWithOverlap.h 63 additions, 0 deletions

...mesapd_coupling/overlapping/shapes/EllipsoidWithOverlap.h
src/lbm_mesapd_coupling/overlapping/shapes/HalfSpaceWithOverlap.h 62 additions, 0 deletions

...mesapd_coupling/overlapping/shapes/HalfSpaceWithOverlap.h
src/lbm_mesapd_coupling/overlapping/shapes/SphereWithOverlap.h 61 additions, 0 deletions

...bm_mesapd_coupling/overlapping/shapes/SphereWithOverlap.h
src/lbm_mesapd_coupling/partially_saturated_cells_method/CMakeLists.txt 6 additions, 0 deletions

..._coupling/partially_saturated_cells_method/CMakeLists.txt
src/lbm_mesapd_coupling/partially_saturated_cells_method/PSMSweep.h 686 additions, 0 deletions

...sapd_coupling/partially_saturated_cells_method/PSMSweep.h
src/lbm_mesapd_coupling/partially_saturated_cells_method/PSMUtility.h 159 additions, 0 deletions

...pd_coupling/partially_saturated_cells_method/PSMUtility.h
src/lbm_mesapd_coupling/partially_saturated_cells_method/ParticleAndVolumeFractionMapping.h 124 additions, 0 deletions

...saturated_cells_method/ParticleAndVolumeFractionMapping.h
tests/lbm_mesapd_coupling/CMakeLists.txt 25 additions, 0 deletions

tests/lbm_mesapd_coupling/CMakeLists.txt
tests/lbm_mesapd_coupling/partially_saturated_cells_method/DragForceSphere.cpp 503 additions, 0 deletions

...ling/partially_saturated_cells_method/DragForceSphere.cpp
tests/lbm_mesapd_coupling/partially_saturated_cells_method/ParticleAndVolumeFractionMapping.cpp 212 additions, 0 deletions

...turated_cells_method/ParticleAndVolumeFractionMapping.cpp
tests/lbm_mesapd_coupling/partially_saturated_cells_method/SettlingSphere.cpp 877 additions, 0 deletions

...pling/partially_saturated_cells_method/SettlingSphere.cpp
tests/lbm_mesapd_coupling/partially_saturated_cells_method/TorqueSphere.cpp 561 additions, 0 deletions

...oupling/partially_saturated_cells_method/TorqueSphere.cpp
tests/lbm_mesapd_coupling/partially_saturated_cells_method/Utility.h 85 additions, 0 deletions

...esapd_coupling/partially_saturated_cells_method/Utility.h

with 3710 additions and 25 deletions

Please register or to comment

Admin message

Merge branch 'lbm_mesapd_coupling_PSM' into 'master'