From 06945f989cc93654960b45e83d35bdb6c9f8c59f Mon Sep 17 00:00:00 2001 From: Florian Weik Date: Tue, 7 Jan 2020 15:30:44 +0100 Subject: [PATCH] core: Fixed erronous feature guards in P3M, fixed missing feature declarations in tests --- src/core/electrostatics_magnetostatics/p3m_send_mesh.cpp | 3 ++- src/core/electrostatics_magnetostatics/p3m_send_mesh.hpp | 3 +-- testsuite/python/dawaanr-and-bh-gpu.py | 2 +- testsuite/python/dawaanr-and-dds-gpu.py | 2 +- testsuite/python/dds-and-bh-gpu.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/electrostatics_magnetostatics/p3m_send_mesh.cpp b/src/core/electrostatics_magnetostatics/p3m_send_mesh.cpp index 181bf4f010c..f2c415e0c27 100644 --- 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 diff --git a/src/core/electrostatics_magnetostatics/p3m_send_mesh.hpp b/src/core/electrostatics_magnetostatics/p3m_send_mesh.hpp index f9cfdf84637..6197d90cd8c 100644 --- 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 @@ -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 index 974f16b4654..e9f3f8e2303 100644 --- 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 index a49acb870b4..fdc30e519ac 100644 --- 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 index c5ebdf3da4e..85478bc504f 100644 --- 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