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
    6e729bdc
    Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop · 6e729bdc
    kutscher authored 
    # 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
    6e729bdc
    History
    Merge branch 'develop' of https://git.rz.tu-bs.de/irmb/VirtualFluids_dev into develop
    kutscher authored 
    # 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