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

Merge branch 'develop' into feature/united_code 

# Conflicts:
#	src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
#	src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
parents b407bd8a 9d390afe
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)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3270 additions and 184 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