From 63e26b66ebcd98bda6c63efcaf04d8f66edcdc96 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Mon, 14 Aug 2017 12:12:37 +0200
Subject: [PATCH] Test working with SE_CLASS1
---
src/Vector/vector_dist.hpp | 8 ++++----
src/Vector/vector_dist_cell_list_tests.hpp | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Vector/vector_dist.hpp b/src/Vector/vector_dist.hpp
index 84cc89cda..69ef226ed 100644
--- a/src/Vector/vector_dist.hpp
+++ b/src/Vector/vector_dist.hpp
@@ -842,7 +842,7 @@ public:
template<typename CellL = CellList<dim, St, Mem_fast, shift<dim, St> > > CellL getCellListSym(St r_cut)
{
#ifdef SE_CLASS1
- if ((opt & BIND_DEC_TO_GHOST))
+ if (!(opt & BIND_DEC_TO_GHOST))
{
if (getDecomposition().getGhost().getLow(dim-1) == 0.0)
{
@@ -1112,7 +1112,7 @@ public:
VerletList<dim,St,FAST,shift<dim,St> > getVerletCrs(St r_cut)
{
#ifdef SE_CLASS1
- if ((opt & BIND_DEC_TO_GHOST))
+ if (!(opt & BIND_DEC_TO_GHOST))
{
std::cerr << __FILE__ << ":" << __LINE__ << " Error the vector has been constructed without BIND_DEC_TO_GHOST, getVerletCrs require the vector to be constructed with BIND_DEC_TO_GHOST option " << std::endl;
ACTION_ON_ERROR(VECTOR_DIST_ERROR_OBJECT);
@@ -1988,7 +1988,7 @@ public:
template<typename cli> ParticleItCRS_Cells<dim,cli> getParticleIteratorCRS_Cell(cli & NN)
{
#ifdef SE_CLASS1
- if ((opt & BIND_DEC_TO_GHOST))
+ if (!(opt & BIND_DEC_TO_GHOST))
{
std::cerr << __FILE__ << ":" << __LINE__ << " Error the vector has been constructed without BIND_DEC_TO_GHOST, getParticleIteratorCRS_Cell require the vector to be constructed with BIND_DEC_TO_GHOST option " << std::endl;
ACTION_ON_ERROR(VECTOR_DIST_ERROR_OBJECT);
@@ -2035,7 +2035,7 @@ public:
template<typename vrl> openfpm::vector_key_iterator_seq<typename vrl::local_index_t> getParticleIteratorCRS(vrl & NN)
{
#ifdef SE_CLASS1
- if ((opt & BIND_DEC_TO_GHOST))
+ if (!(opt & BIND_DEC_TO_GHOST))
{
std::cerr << __FILE__ << ":" << __LINE__ << " Error the vector has been constructed without BIND_DEC_TO_GHOST, getParticleIteratorCRS_Cell require the vector to be constructed with BIND_DEC_TO_GHOST option " << std::endl;
ACTION_ON_ERROR(VECTOR_DIST_ERROR_OBJECT);
diff --git a/src/Vector/vector_dist_cell_list_tests.hpp b/src/Vector/vector_dist_cell_list_tests.hpp
index 655dae6b1..7603d87d9 100644
--- a/src/Vector/vector_dist_cell_list_tests.hpp
+++ b/src/Vector/vector_dist_cell_list_tests.hpp
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_reorder_2d_test )
// Boundary conditions
size_t bc[2]={NON_PERIODIC,NON_PERIODIC};
- vector_dist<2,float, Point_test<float>, CartDecomposition<2,float> > vd(k,box,bc,Ghost<2,float>(0.0));
+ vector_dist<2,float, Point_test<float>, CartDecomposition<2,float> > vd(k,box,bc,Ghost<2,float>(0.01));
auto it = vd.getIterator();
@@ -791,7 +791,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_symmetric_verlet_list )
big_step = (big_step == 0)?1:big_step;
print_test("Testing 3D periodic vector symmetric cell-list k=",k);
- BOOST_TEST_CHECKPOINT( "Testing 3D periodic vector symmetric cell-list k=" << k );
+ BOOST_TEST_CHECKPOINT( "Testing 3D periodic vector symmetric verlet-list k=" << k );
Box<3,float> box({-L,-L,-L},{L,L,L});
--
GitLab