Merge remote-tracking branch 'origin/master' into development/Stephan

6e8b60c4 · LEGOLAS\lenz · a1726c80 · f5f54f40 · 6e8b60c4
Commit 6e8b60c4 authored 6 years ago by $LEGOLAS\lenz's avatar$ LEGOLAS\lenz
--- a/targets/apps/LBM/lbmTest/main.cpp
+++ b/targets/apps/LBM/lbmTest/main.cpp
 //#define MPI_LOGGING

+//Martin Branch

 #include <mpi.h>
 #if defined( MPI_LOGGING )