Skip to content
Snippets Groups Projects
Commit f1220bab authored by Kutscher's avatar Kutscher
Browse files

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

# Conflicts:
#	cpu.cmake
#	src/basics/constants/NumericConstants.h
#	src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.cpp
#	src/cpu/NonNewtonianFluids/SimulationObservers/WriteThixotropyQuantitiesSimulationObserver.cpp
#	src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCStrategy.cpp
#	src/cpu/VirtualFluidsCore/CMakeLists.txt
parents 59cd165c 7a04f613
No related branches found
No related tags found
1 merge request!225Refactoring of CPU code
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 75 additions and 2260 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