From 330502c4e0b1ea4ced90d5c4d6c874204eccccc9 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Tue, 3 Nov 2015 02:41:05 +0100 Subject: [PATCH] Fixing compilation and test for pdata --- openfpm_data | 2 +- openfpm_devices | 2 +- openfpm_io | 2 +- openfpm_vcluster | 2 +- src/Decomposition/CartDecomposition.hpp | 10 +--------- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/openfpm_data b/openfpm_data index fa6e1d93..5dd59a1f 160000 --- a/openfpm_data +++ b/openfpm_data @@ -1 +1 @@ -Subproject commit fa6e1d93eee2226ca3547c5980601a71e0b14ae3 +Subproject commit 5dd59a1f3922c2a0bb470441f6d91edd10559e45 diff --git a/openfpm_devices b/openfpm_devices index 18cad2e7..e15dcba6 160000 --- a/openfpm_devices +++ b/openfpm_devices @@ -1 +1 @@ -Subproject commit 18cad2e78602aa5f55f04926c327a7864d67b756 +Subproject commit e15dcba6fd73f2229b4800c8b413bc256eee10bf diff --git a/openfpm_io b/openfpm_io index b7238aac..0c53d1a9 160000 --- a/openfpm_io +++ b/openfpm_io @@ -1 +1 @@ -Subproject commit b7238aac71a82a304a7d455a8a62fc1149168fb5 +Subproject commit 0c53d1a9b2fa96341b764ed92936207d1e62ff9b diff --git a/openfpm_vcluster b/openfpm_vcluster index 3b372658..d7f92684 160000 --- a/openfpm_vcluster +++ b/openfpm_vcluster @@ -1 +1 @@ -Subproject commit 3b3726580087e16b548a63094d8ae544d0636106 +Subproject commit d7f92684da97c1e52d31b8b4b0097840d9eab5a8 diff --git a/src/Decomposition/CartDecomposition.hpp b/src/Decomposition/CartDecomposition.hpp index 216c15e7..5303b3bb 100644 --- a/src/Decomposition/CartDecomposition.hpp +++ b/src/Decomposition/CartDecomposition.hpp @@ -28,18 +28,10 @@ #include "ie_loc_ghost.hpp" #include "ie_ghost.hpp" #include "nn_processor.hpp" +#include "util/se_util.hpp" #define CARTDEC_ERROR 2000lu -// Macro that decide what to do in case of error -#ifdef STOP_ON_ERROR -#define ACTION_ON_ERROR() exit(1); -#elif defined(THROW_ON_ERROR) -#define ACTION_ON_ERROR() throw CARTDEC_ERROR; -#else -#define ACTION_ON_ERROR() -#endif - /** * \brief This class decompose a space into subspaces * -- GitLab