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

Merge branch 'develop' into feature/united_code

# Conflicts:
#	CMake/VirtualFluidsMacros.cmake
#	CMakeLists.txt
#	src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
#	src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
#	src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
#	src/gpu/VirtualFluids_GPU/CMakeLists.txt
#	src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
parents f254337a be4d3daf
No related branches found
No related tags found
1 merge request!34Add new library, which contains the calculation of the macroscopic quantities and a general cumulant computation. (Closes #13)
Showing
with 4156 additions and 414 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