Merge branch 'body_mapping_rework' into 'master' (8160f416) · Commits · Arash Partow / waLBerla

Commit 8160f416 authored 7 years ago by

Christoph Rettinger

Merge branch 'body_mapping_rework' into 'master'

Reworked Body Mapping

See merge request walberla/walberla!76

parents 65301594 5e48cd50

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp 3 additions, 3 deletions

...arPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp
apps/benchmarks/MotionSingleHeavySphere/MotionSingleHeavySphere.cpp 8 additions, 8 deletions

...marks/MotionSingleHeavySphere/MotionSingleHeavySphere.cpp
src/pe_coupling/discrete_particle_methods/evaluators/AddedMassForceEvaluator.h 12 additions, 3 deletions

...ete_particle_methods/evaluators/AddedMassForceEvaluator.h
src/pe_coupling/discrete_particle_methods/evaluators/BodyVelocityTimeDerivativeEvaluator.h 12 additions, 3 deletions

..._methods/evaluators/BodyVelocityTimeDerivativeEvaluator.h
src/pe_coupling/discrete_particle_methods/evaluators/InteractionForceEvaluator.h 12 additions, 5 deletions

...e_particle_methods/evaluators/InteractionForceEvaluator.h
src/pe_coupling/discrete_particle_methods/evaluators/LiftForceEvaluator.h 10 additions, 3 deletions

...discrete_particle_methods/evaluators/LiftForceEvaluator.h
src/pe_coupling/discrete_particle_methods/evaluators/LubricationForceEvaluator.h 2 additions, 11 deletions

...e_particle_methods/evaluators/LubricationForceEvaluator.h
src/pe_coupling/discrete_particle_methods/evaluators/SolidVolumeFractionFieldEvaluator.h 16 additions, 3 deletions

...le_methods/evaluators/SolidVolumeFractionFieldEvaluator.h
src/pe_coupling/discrete_particle_methods/utility/BodyVelocityInitializer.h 9 additions, 5 deletions

...screte_particle_methods/utility/BodyVelocityInitializer.h
src/pe_coupling/mapping/BodyMapping.h 27 additions, 93 deletions

src/pe_coupling/mapping/BodyMapping.h
src/pe_coupling/momentum_exchange_method/BodyMapping.h 109 additions, 95 deletions

src/pe_coupling/momentum_exchange_method/BodyMapping.h
src/pe_coupling/momentum_exchange_method/restoration/PDFReconstruction.h 76 additions, 63 deletions

.../momentum_exchange_method/restoration/PDFReconstruction.h
src/pe_coupling/partially_saturated_cells_method/BodyAndVolumeFractionMapping.h 27 additions, 48 deletions

...lly_saturated_cells_method/BodyAndVolumeFractionMapping.h
src/pe_coupling/utility/BodySelectorFunctions.h 49 additions, 0 deletions

src/pe_coupling/utility/BodySelectorFunctions.h
src/pe_coupling/utility/LubricationCorrection.h 2 additions, 11 deletions

src/pe_coupling/utility/LubricationCorrection.h
src/pe_coupling/utility/TimeStep.h 1 addition, 1 deletion

src/pe_coupling/utility/TimeStep.h
src/pe_coupling/utility/all.h 1 addition, 0 deletions

src/pe_coupling/utility/all.h
tests/pe_coupling/CMakeLists.txt 3 additions, 0 deletions

tests/pe_coupling/CMakeLists.txt
tests/pe_coupling/momentum_exchange_method/BodyAtBlockBoarderCheck.cpp 10 additions, 43 deletions

...ling/momentum_exchange_method/BodyAtBlockBoarderCheck.cpp
tests/pe_coupling/momentum_exchange_method/BodyMappingTest.cpp 1134 additions, 0 deletions

.../pe_coupling/momentum_exchange_method/BodyMappingTest.cpp

with 1523 additions and 398 deletions

Please register or to comment

Admin message

Merge branch 'body_mapping_rework' into 'master'