From 4d3ed957ce2bd5c66b051ccedae580505f45f46d Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Wed, 5 Aug 2015 16:56:34 +0200
Subject: [PATCH] Fixing testing
---
src/Grid/grid_dist_id.hpp | 3 ---
src/Vector/vector_dist_unit_test.hpp | 7 +++++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/Grid/grid_dist_id.hpp b/src/Grid/grid_dist_id.hpp
index a9aa4805..7c9c4fe8 100644
--- a/src/Grid/grid_dist_id.hpp
+++ b/src/Grid/grid_dist_id.hpp
@@ -64,9 +64,6 @@ class grid_dist_id
//! It map a global ghost id (g_id) to the external ghost box information
std::unordered_map<size_t,size_t> g_id_to_external_ghost_box;
- //!
- openfpm::vector<conflict_res>
-
/*! \brief Get the grid size
*
* Given a domain, the resolution of the grid on it and another spaceBox contained in the domain
diff --git a/src/Vector/vector_dist_unit_test.hpp b/src/Vector/vector_dist_unit_test.hpp
index d73d720e..a829a298 100644
--- a/src/Vector/vector_dist_unit_test.hpp
+++ b/src/Vector/vector_dist_unit_test.hpp
@@ -21,6 +21,10 @@ BOOST_AUTO_TEST_CASE( vector_dist_ghost )
typedef Point_test<float> p;
typedef Point<2,float> s;
+ // TODO generalize
+ if (v_cl.getProcessingUnits() != 4)
+ return;
+
Box<2,float> box({0.0,0.0},{1.0,1.0});
size_t g_div[]= {16,16};
@@ -158,6 +162,9 @@ BOOST_AUTO_TEST_CASE( vector_dist_iterator_test_use )
Vcluster & v_cl = *global_v_cluster;
+ if (v_cl.getProcessingUnits() != 4)
+ return;
+
// set the seed
// create the random generator engine
std::srand(v_cl.getProcessUnitID());
--
GitLab