fixe conflicts after merge of branch 'LIGGGHTS_coupling' into develop
Showing
- apps/cpu/FallingSphere/FallingSphere.cpp 1 addition, 1 deletionapps/cpu/FallingSphere/FallingSphere.cpp
- apps/cpu/LiggghtsApp/LiggghtsApp.cpp 1 addition, 1 deletionapps/cpu/LiggghtsApp/LiggghtsApp.cpp
- apps/cpu/Nozzle/nozzle.cpp 1 addition, 1 deletionapps/cpu/Nozzle/nozzle.cpp
- src/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.cpp 4 additions, 2 deletionssrc/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.cpp
- src/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.h 3 additions, 3 deletionssrc/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.h
- src/cpu/VirtualFluidsCore/CMakeLists.txt 1 addition, 3 deletionssrc/cpu/VirtualFluidsCore/CMakeLists.txt
- src/cpu/VirtualFluidsCore/Utilities/MemoryUtil.h 0 additions, 1 deletionsrc/cpu/VirtualFluidsCore/Utilities/MemoryUtil.h
Loading
Please register or sign in to comment