Merge branch 'develop' into feature/cuda_u_mpi_lib
# Conflicts: # CMakeLists.txt # src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
Showing
- CMake/3rd/vtk.cmake 3 additions, 4 deletionsCMake/3rd/vtk.cmake
- CMakeLists.txt 2 additions, 3 deletionsCMakeLists.txt
- apps/gpu/GKS/Flame7cm/CMakeLists.txt 3 additions, 4 deletionsapps/gpu/GKS/Flame7cm/CMakeLists.txt
- apps/gpu/GKS/Flame7cm/Flame7cm.cpp 7 additions, 8 deletionsapps/gpu/GKS/Flame7cm/Flame7cm.cpp
- apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp 276 additions, 0 deletionsapps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
- apps/gpu/LBM/ActuatorLine/CMakeLists.txt 7 additions, 0 deletionsapps/gpu/LBM/ActuatorLine/CMakeLists.txt
- apps/gpu/LBM/ActuatorLine/configActuatorLine.txt 8 additions, 0 deletionsapps/gpu/LBM/ActuatorLine/configActuatorLine.txt
- apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp 4 additions, 0 deletionsapps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
- gpu.cmake 2 additions, 3 deletionsgpu.cmake
- src/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.cu 2 additions, 0 deletionssrc/gpu/GksGpu/Analyzer/EnstrophyAnalyzer.cu
- src/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.cu 2 additions, 0 deletionssrc/gpu/GksGpu/Analyzer/HeatFluxAnalyzer.cu
- src/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.cu 2 additions, 0 deletionssrc/gpu/GksGpu/Analyzer/TurbulenceAnalyzer.cu
- src/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.cu 1 addition, 1 deletionsrc/gpu/GksGpu/BoundaryConditions/CreepingMassFlux.cu
- src/gpu/GksGpu/BoundaryConditions/HeatFlux.cu 1 addition, 1 deletionsrc/gpu/GksGpu/BoundaryConditions/HeatFlux.cu
- src/gpu/GksGpu/BoundaryConditions/Inflow.cu 1 addition, 1 deletionsrc/gpu/GksGpu/BoundaryConditions/Inflow.cu
- src/gpu/GksGpu/BoundaryConditions/MassCompensation.cu 1 addition, 1 deletionsrc/gpu/GksGpu/BoundaryConditions/MassCompensation.cu
- src/gpu/GksGpu/CMakeLists.txt 8 additions, 1 deletionsrc/gpu/GksGpu/CMakeLists.txt
- src/gpu/GksGpu/CellProperties/CellProperties.cuh 4 additions, 0 deletionssrc/gpu/GksGpu/CellProperties/CellProperties.cuh
- src/gpu/GksGpu/CellUpdate/Reaction.cuh 6 additions, 6 deletionssrc/gpu/GksGpu/CellUpdate/Reaction.cuh
- src/gpu/GksGpu/DataBase/DataBase.cpp 4 additions, 0 deletionssrc/gpu/GksGpu/DataBase/DataBase.cpp
Loading
Please register or sign in to comment