-
- Downloads
Merge branch 'develop' of https://git.rz.tu-bs.de/k.kutscher/VirtualFluids_dev into develop
Conflicts: apps/cpu/ViskomatXL/viskomat.cpp src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
No related branches found
No related tags found
Showing
- apps/cpu/Applications.cmake 1 addition, 0 deletionsapps/cpu/Applications.cmake
- apps/cpu/HerschelBulkleySphere/hbsphere.cpp 5 additions, 1 deletionapps/cpu/HerschelBulkleySphere/hbsphere.cpp
- apps/cpu/LaminarTubeFlow/ltf.cfg 6 additions, 6 deletionsapps/cpu/LaminarTubeFlow/ltf.cfg
- apps/cpu/LaminarTubeFlow/ltf.cpp 24 additions, 18 deletionsapps/cpu/LaminarTubeFlow/ltf.cpp
- apps/cpu/Multiphase/Multiphase.cpp 61 additions, 47 deletionsapps/cpu/Multiphase/Multiphase.cpp
- apps/cpu/Multiphase/MultiphaseGeier.cfg 68 additions, 0 deletionsapps/cpu/Multiphase/MultiphaseGeier.cfg
- apps/cpu/MultiphaseDropletTest/DropletTest.cfg 19 additions, 16 deletionsapps/cpu/MultiphaseDropletTest/DropletTest.cfg
- apps/cpu/MultiphaseDropletTest/droplet.cpp 154 additions, 46 deletionsapps/cpu/MultiphaseDropletTest/droplet.cpp
- apps/cpu/PoiseuilleFlow/pf1.cpp 1 addition, 1 deletionapps/cpu/PoiseuilleFlow/pf1.cpp
- apps/cpu/ViskomatXL/viskomat.cfg 13 additions, 8 deletionsapps/cpu/ViskomatXL/viskomat.cfg
- apps/cpu/ViskomatXL/viskomat.cpp 28 additions, 24 deletionsapps/cpu/ViskomatXL/viskomat.cpp
- apps/cpu/rheometer/rheometer.cpp 5 additions, 1 deletionapps/cpu/rheometer/rheometer.cpp
- src/cpu/VirtualFluids.h 4 additions, 0 deletionssrc/cpu/VirtualFluids.h
- src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h 0 additions, 31 deletions...VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
- src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp 5 additions, 4 deletions...ore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp 54 additions, 27 deletions...ualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.h 3 additions, 3 deletions...rtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.h
- src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp 1 addition, 1 deletionsrc/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp 10 additions, 4 deletionssrc/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
- src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp 84 additions, 57 deletions...alFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
Loading
Please register or sign in to comment