Merge pull request #2477 from pkreissl/fix_dp3m_ifdefs

Fix dp3m ifdefs; dawaanr-and-bh-gpu testcase requirements
espressomd · Jan 29, 2019 · 71d657d · 71d657d
2 parents 27d560d + da46ca6
commit 71d657d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/core/electrostatics_magnetostatics/fft.cpp b/src/core/electrostatics_magnetostatics/fft.cpp
@@ -27,7 +27,7 @@
 
 #include "fft.hpp"
 
-#ifdef P3M
+#if defined(P3M) || defined(DP3M)
 #include "communication.hpp"
 #include "debug.hpp"
 #include "fft-common.hpp"

diff --git a/src/core/electrostatics_magnetostatics/fft.hpp b/src/core/electrostatics_magnetostatics/fft.hpp
@@ -43,7 +43,7 @@
  */
 
 #include "config.hpp"
-#ifdef P3M
+#if defined(P3M) || defined(DP3M)
 
 #include "fft-common.hpp"
 

diff --git a/testsuite/python/dawaanr-and-bh-gpu.py b/testsuite/python/dawaanr-and-bh-gpu.py
@@ -34,7 +34,8 @@ def stopAll(system):
     system.part[:].omega_body = np.zeros(3)
 
 
-@ut.skipIf(not espressomd.has_features(["DIPOLAR_BARNES_HUT"]),
+@ut.skipIf(not espressomd.has_features(["DIPOLAR_BARNES_HUT",
+                                        "PARTIAL_PERIODIC"]),
            "Features not available, skipping test!")
 @ut.skipIf(espressomd.has_features(["CUDA"]) and
            str(espressomd.cuda_init.CudaInitHandle().device_list[0]) ==