core: Fixed erronous feature guards in P3M, fixed missing feature dec… (

#3403) …larations in tests Fixes #3401
espressomd · Jan 7, 2020 · 9b69e75 · 9b69e75
2 parents c4c8f2a + 06945f9
commit 9b69e75
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/core/electrostatics_magnetostatics/p3m_send_mesh.cpp b/src/core/electrostatics_magnetostatics/p3m_send_mesh.cpp
@@ -20,7 +20,8 @@
  */
 #include "p3m_send_mesh.hpp"
 
-#ifdef P3M
+#if defined(P3M) || defined(DP3M)
+
 #include "fft.hpp"
 
 #include <utils/mpi/cart_comm.hpp>

diff --git a/src/core/electrostatics_magnetostatics/p3m_send_mesh.hpp b/src/core/electrostatics_magnetostatics/p3m_send_mesh.hpp
@@ -23,7 +23,7 @@
 
 #include "p3m-common.hpp"
 
-#ifdef P3M
+#if defined(P3M) || defined(DP3M)
 
 #include <utils/Span.hpp>
 
@@ -78,6 +78,5 @@ class p3m_send_mesh {
     spread_grid(Utils::make_span(&mesh, 1), comm, dim);
   }
 };
-
 #endif
 #endif // ESPRESSO_P3M_SEND_MESH_HPP
diff --git a/testsuite/python/dawaanr-and-bh-gpu.py b/testsuite/python/dawaanr-and-bh-gpu.py
@@ -30,7 +30,7 @@ def stopAll(system):
 
 
 @utx.skipIfMissingGPU()
-@utx.skipIfMissingFeatures(["DIPOLAR_BARNES_HUT"])
+@utx.skipIfMissingFeatures(["DIPOLAR_BARNES_HUT", "LENNARD_JONES"])
 class BHGPUTest(ut.TestCase):
     system = espressomd.System(box_l=[1, 1, 1])
     system.seed = system.cell_system.get_state()['n_nodes'] * [1234]

diff --git a/testsuite/python/dawaanr-and-dds-gpu.py b/testsuite/python/dawaanr-and-dds-gpu.py
@@ -26,7 +26,7 @@
 
 
 @utx.skipIfMissingGPU()
-@utx.skipIfMissingFeatures(["DIPOLES", "ROTATION"])
+@utx.skipIfMissingFeatures(["DIPOLES", "ROTATION", "LENNARD_JONES"])
 class DDSGPUTest(ut.TestCase):
     # Handle for espresso system
     es = espressomd.System(box_l=[1.0, 1.0, 1.0])

diff --git a/testsuite/python/dds-and-bh-gpu.py b/testsuite/python/dds-and-bh-gpu.py
@@ -31,7 +31,7 @@ def stopAll(system):
 
 
 @utx.skipIfMissingGPU()
-@utx.skipIfMissingFeatures(["DIPOLAR_BARNES_HUT"])
+@utx.skipIfMissingFeatures(["DIPOLAR_BARNES_HUT", "LENNARD_JONES"])
 class BH_DDS_gpu_multCPU_test(ut.TestCase):
     system = espressomd.System(box_l=[1, 1, 1])
     # just some seeding based on 14