Merge branch '401test' of ssh://github.com/RudolfWeeber/espresso into…

… 401test
RudolfWeeber · Nov 26, 2018 · 1131680 · 1131680
2 parents fc40ccb + bd3a11e
commit 1131680
Show file tree

Hide file tree

Showing 7 changed files with 316 additions and 354 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -132,7 +132,7 @@ cuda-shanchen:
   stage: build
   image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/cuda:9.0
   script:
-    - export myconfig=shanchen with_coverage=true python_version=3
+    - export myconfig=shanchen make_check=false python_version=3
     - bash maintainer/cuda_build.sh
   tags:
     - docker

diff --git a/src/core/electrokinetics_cuda.cu b/src/core/electrokinetics_cuda.cu
@@ -38,8 +38,8 @@
 #include "errorhandling.hpp"
 #include "fd-electrostatics.hpp"
 #include "lbboundaries.hpp"
-#include "lbgpu.hpp"
 #include "lbgpu.cuh"
+#include "lbgpu.hpp"
 
 #if defined(OMPI_MPI_H) || defined(_MPI_H)
 #error CU-file includes mpi.h! This should not happen!