Merge branch 'develop' into feature/united_code
# Conflicts: # CMake/VirtualFluidsMacros.cmake # CMakeLists.txt # src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp # src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp # src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp # src/gpu/VirtualFluids_GPU/CMakeLists.txt # src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
No related branches found
No related tags found
Showing
- CMakeLists.txt 19 additions, 0 deletionsCMakeLists.txt
- apps/cpu/Multiphase/Multiphase.cfg 23 additions, 12 deletionsapps/cpu/Multiphase/Multiphase.cfg
- apps/cpu/Multiphase/Multiphase.cpp 89 additions, 181 deletionsapps/cpu/Multiphase/Multiphase.cpp
- apps/cpu/Multiphase/backup/JetBreakupR.ASCII.stl 1584 additions, 0 deletionsapps/cpu/Multiphase/backup/JetBreakupR.ASCII.stl
- apps/cpu/Multiphase/backup/JetBreakupR.Binary.stl 0 additions, 0 deletionsapps/cpu/Multiphase/backup/JetBreakupR.Binary.stl
- apps/cpu/Multiphase/backup/inlet1.stl 1710 additions, 0 deletionsapps/cpu/Multiphase/backup/inlet1.stl
- apps/cpu/Multiphase/backup/tubeTransformed.stl 0 additions, 0 deletionsapps/cpu/Multiphase/backup/tubeTransformed.stl
- apps/cpu/ViskomatXL/viskomat.cfg 5 additions, 4 deletionsapps/cpu/ViskomatXL/viskomat.cfg
- apps/cpu/ViskomatXL/viskomat.cpp 31 additions, 18 deletionsapps/cpu/ViskomatXL/viskomat.cpp
- gpu.cmake 0 additions, 1 deletiongpu.cmake
- src/basics/geometry3d/GbTriFaceMesh3D.cpp 45 additions, 0 deletionssrc/basics/geometry3d/GbTriFaceMesh3D.cpp
- src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAlgorithm.cpp 4 additions, 4 deletions...Core/BoundaryConditions/MultiphaseVelocityBCAlgorithm.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp 9 additions, 1 deletionsrc/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp 121 additions, 54 deletions...alFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h 2 additions, 1 deletion...tualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h
- src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp 126 additions, 54 deletions...tualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h 2 additions, 1 deletion...irtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h
- src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp 354 additions, 53 deletions...irtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.h 3 additions, 1 deletion.../VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.h
- src/cpu/VirtualFluidsCore/CoProcessors/WriteMultiphaseQuantitiesCoProcessor.cpp 29 additions, 29 deletions...ore/CoProcessors/WriteMultiphaseQuantitiesCoProcessor.cpp
Loading
Please register or sign in to comment