Skip to content
Snippets Groups Projects
Commit 509df88f authored by Soeren Peters's avatar Soeren Peters
Browse files

Merge branch 'open_source' into feature/merge_clang_tidy

# Conflicts:
#	apps/cpu/LidDrivenCavity/LidDrivenCavity.cpp
#	src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
#	src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
#	src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
#	src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
#	src/cpu/VirtualFluidsCore/Data/DistributionArray3D.h
#	src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
#	src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h
#	src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.h
#	src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.h
#	src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.cpp
#	src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.h
parents 5f4ee279 b954951f
No related branches found
No related tags found
No related merge requests found
Showing
with 267 additions and 212 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment