Skip to content
Snippets Groups Projects
Commit 5c85a59b authored by AlenaKaranchuk's avatar AlenaKaranchuk
Browse files

Merge branch 'VirtualFluidsFromHLRN' into develop 

# Conflicts:
#	source/Applications/Applications.cmake
#	source/VirtualFluidsBasic/numerics/geometry3d/CoordinateTransformation3D.h
#	source/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
#	source/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
parents 4c0c8dbb 25279c80
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 3213 additions and 375 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