Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 7, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/core/electrostatics_magnetostatics/p3m_send_mesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions src/core/electrostatics_magnetostatics/p3m_send_mesh.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "p3m-common.hpp"

#ifdef P3M
#if defined(P3M) || defined(DP3M)

#include <utils/Span.hpp>

Expand Down Expand Up @@ -78,6 +78,5 @@ class p3m_send_mesh {
spread_grid(Utils::make_span(&mesh, 1), comm, dim);
}
};

#endif
#endif // ESPRESSO_P3M_SEND_MESH_HPP
2 changes: 1 addition & 1 deletion testsuite/python/dawaanr-and-bh-gpu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion testsuite/python/dawaanr-and-dds-gpu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion testsuite/python/dds-and-bh-gpu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down