Skip to content
Snippets Groups Projects
Commit 6e729bdc authored by kutscher's avatar kutscher
Browse files

Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop 

# Conflicts:
#	apps/cpu/ViskomatXL/viskomat.cpp
#	src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
#	src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
#	src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h
#	src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
#	src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h
#	src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
#	src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
parents 3a483627 cc7e647f
No related branches found
No related tags found
2 merge requests!171Newest Update,!83Fix MPICommunicator
Hide whitespace changes
Inline Side-by-side
Showing
with 856 additions and 290 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