Merge branch 'develop' into python-simulation-testing
Showing
- .gitlab-ci.yml 11 additions, 0 deletions.gitlab-ci.yml
- CMake/3rd/boost.cmake 3 additions, 1 deletionCMake/3rd/boost.cmake
- CMake/VirtualFluidsMacros.cmake 9 additions, 0 deletionsCMake/VirtualFluidsMacros.cmake
- CMakeLists.txt 10 additions, 2 deletionsCMakeLists.txt
- apps/gpu/LBM/DrivenCavity/CMakeLists.txt 2 additions, 1 deletionapps/gpu/LBM/DrivenCavity/CMakeLists.txt
- apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp 7 additions, 5 deletionsapps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
- gpu.cmake 3 additions, 3 deletionsgpu.cmake
- src/basics/CMakeLists.txt 1 addition, 1 deletionsrc/basics/CMakeLists.txt
- src/basics/Core/Input/ConfigFileReader/ConfigFileReader.cpp 4 additions, 7 deletionssrc/basics/Core/Input/ConfigFileReader/ConfigFileReader.cpp
- src/basics/Core/Input/ConfigFileReader/ConfigFileReader.h 5 additions, 4 deletionssrc/basics/Core/Input/ConfigFileReader/ConfigFileReader.h
- src/basics/Core/StringUtilities/StringUtil.h 10 additions, 0 deletionssrc/basics/Core/StringUtilities/StringUtil.h
- src/basics/Core/buildInfo.in.cpp 0 additions, 2 deletionssrc/basics/Core/buildInfo.in.cpp
- src/basics/basics/writer/WbWriterVtkXmlBinary.h 3 additions, 1 deletionsrc/basics/basics/writer/WbWriterVtkXmlBinary.h
- src/basics/geometry3d/GbObject3D.h 3 additions, 1 deletionsrc/basics/geometry3d/GbObject3D.h
- src/cpu/simulationconfig/CMakeLists.txt 1 addition, 1 deletionsrc/cpu/simulationconfig/CMakeLists.txt
- src/gpu/GridGenerator/CMakeLists.txt 9 additions, 2 deletionssrc/gpu/GridGenerator/CMakeLists.txt
- src/gpu/VirtualFluids_GPU/CMakeLists.txt 1 addition, 1 deletionsrc/gpu/VirtualFluids_GPU/CMakeLists.txt
- src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp 3 additions, 0 deletionssrc/gpu/VirtualFluids_GPU/Calculation/Cp.cpp
- src/gpu/VirtualFluids_GPU/Calculation/Cp.h 0 additions, 1 deletionsrc/gpu/VirtualFluids_GPU/Calculation/Cp.h
- src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp 2 additions, 0 deletionssrc/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp
Loading
Please register or sign in to comment