Merge remote-tracking branch 'upstream/develop' into develop
No related branches found
No related tags found
Showing
- .clang-format 5 additions, 4 deletions.clang-format
- .gitlab-ci.yml 27 additions, 117 deletions.gitlab-ci.yml
- AUTHORS.md 3 additions, 1 deletionAUTHORS.md
- CMake/3rd.cmake 0 additions, 2 deletionsCMake/3rd.cmake
- CMake/3rd/gmock.cmake 0 additions, 17 deletionsCMake/3rd/gmock.cmake
- CMake/VirtualFluidsMacros.cmake 24 additions, 5 deletionsCMake/VirtualFluidsMacros.cmake
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- apps/cpu/ConcreteExtrusion/CMakeLists.txt 1 addition, 1 deletionapps/cpu/ConcreteExtrusion/CMakeLists.txt
- apps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp 1 addition, 1 deletionapps/cpu/ConcreteExtrusion/ConcreteExtrusion.cpp
- apps/cpu/ConvectionOfVortex/CMakeLists.txt 1 addition, 1 deletionapps/cpu/ConvectionOfVortex/CMakeLists.txt
- apps/cpu/ConvectionOfVortex/cov.cpp 1 addition, 1 deletionapps/cpu/ConvectionOfVortex/cov.cpp
- apps/cpu/CouetteFlow/CMakeLists.txt 1 addition, 1 deletionapps/cpu/CouetteFlow/CMakeLists.txt
- apps/cpu/CouetteFlow/cflow.cpp 1 addition, 1 deletionapps/cpu/CouetteFlow/cflow.cpp
- apps/cpu/DLR-F16-Porous/f16.cpp 2 additions, 2 deletionsapps/cpu/DLR-F16-Porous/f16.cpp
- apps/cpu/FallingSphere/CMakeLists.txt 1 addition, 1 deletionapps/cpu/FallingSphere/CMakeLists.txt
- apps/cpu/FallingSphere/FallingSphere.cpp 1 addition, 1 deletionapps/cpu/FallingSphere/FallingSphere.cpp
- apps/cpu/FlowAroundCylinder/CMakeLists.txt 1 addition, 1 deletionapps/cpu/FlowAroundCylinder/CMakeLists.txt
- apps/cpu/FlowAroundCylinder/cylinder.cpp 3 additions, 2 deletionsapps/cpu/FlowAroundCylinder/cylinder.cpp
- apps/cpu/HerschelBulkleyModel/CMakeLists.txt 1 addition, 1 deletionapps/cpu/HerschelBulkleyModel/CMakeLists.txt
- apps/cpu/HerschelBulkleyModel/hbflow.cpp 1 addition, 1 deletionapps/cpu/HerschelBulkleyModel/hbflow.cpp
Loading
Please register or sign in to comment