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

Merge commit '6b87b8a2' into develop 

# Conflicts:
#	src/cpu/VirtualFluidsCore/CMakeLists.txt
#	src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
#	src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.cpp
#	src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
#	src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
#	src/cpu/VirtualFluidsCore/LBM/LBMKernel.h
parents 9e050f97 6b87b8a2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 329 additions and 340 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment