There was an error fetching the commit references. Please try again later.
Resolve merge conflicts
Showing
- .gitlab-ci.yml 66 additions, 1 deletion.gitlab-ci.yml
- CMakeLists.txt 107 additions, 42 deletionsCMakeLists.txt
- apps/benchmarks/MotionSingleHeavySphere/MotionSingleHeavySphere.cpp 6 additions, 6 deletions...marks/MotionSingleHeavySphere/MotionSingleHeavySphere.cpp
- apps/benchmarks/SchaeferTurek/SchaeferTurek.cpp 2 additions, 2 deletionsapps/benchmarks/SchaeferTurek/SchaeferTurek.cpp
- apps/showcases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp 4 additions, 4 deletions...ases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp
- apps/tools/povrayFileCompressor/main.cpp 17 additions, 18 deletionsapps/tools/povrayFileCompressor/main.cpp
- cmake/TestStdAny.cpp 16 additions, 0 deletionscmake/TestStdAny.cpp
- cmake/TestStdFilesystem.cpp 16 additions, 0 deletionscmake/TestStdFilesystem.cpp
- cmake/TestStdOptional.cpp 19 additions, 0 deletionscmake/TestStdOptional.cpp
- cmake/waLBerlaHelperFunctions.cmake 10 additions, 1 deletioncmake/waLBerlaHelperFunctions.cmake
- src/blockforest/PhantomBlock.h 3 additions, 4 deletionssrc/blockforest/PhantomBlock.h
- src/blockforest/PhantomBlockForest.cpp 3 additions, 3 deletionssrc/blockforest/PhantomBlockForest.cpp
- src/blockforest/PhantomBlockForest.h 2 additions, 2 deletionssrc/blockforest/PhantomBlockForest.h
- src/blockforest/loadbalancing/DynamicParMetis.cpp 151 additions, 37 deletionssrc/blockforest/loadbalancing/DynamicParMetis.cpp
- src/blockforest/loadbalancing/DynamicParMetis.h 16 additions, 4 deletionssrc/blockforest/loadbalancing/DynamicParMetis.h
- src/blockforest/loadbalancing/PODPhantomData.h 1 addition, 1 deletionsrc/blockforest/loadbalancing/PODPhantomData.h
- src/core/Any.h 25 additions, 8 deletionssrc/core/Any.h
- src/core/Filesystem.h 47 additions, 0 deletionssrc/core/Filesystem.h
- src/core/Optional.h 48 additions, 0 deletionssrc/core/Optional.h
- src/core/config/Config.cpp 2 additions, 2 deletionssrc/core/config/Config.cpp
Please register or sign in to comment