Skip to content
Snippets Groups Projects
Select Git revision
  • develop default
  • main protected
  • a.wellmann-develop-patch-391f
  • 0.1.2
  • 0.1.1
  • 0.1.0
6 results
Blame Permalink
  • Kutscher's avatar
    f1220bab
    Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop · f1220bab
    Kutscher authored 
    # 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
    f1220bab
    History
    Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop
    Kutscher authored 
    # 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