From 40f0b62ebde2ee2b6b3b0b8bb7938e8ad55533e4 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <i-bird@private-incardon-3.mpi-cbg.de>
Date: Wed, 8 Jun 2016 17:51:09 +0200
Subject: [PATCH] Changed build system for new version
---
build_pdata.sh | 10 ++++++++++
src/Vector/vector_dist_unit_test.hpp | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/build_pdata.sh b/build_pdata.sh
index 5b2b86eb..927e9191 100644
--- a/build_pdata.sh
+++ b/build_pdata.sh
@@ -72,6 +72,7 @@ then
fi
make install
+ source $HOME/openfpm_vars
if [ x"$3" == x"no_test" ]; then
exit 0;
@@ -150,6 +151,9 @@ then
sh ./autogen.sh
./install -s -c "--with-boost=/sw/apps/boost/1.54.0/ CXX=mpic++"
make
+
+ source $HOME/openfpm_vars
+
if [ $? -ne 0 ]; then
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$2 failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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
exit 1 ;
@@ -235,6 +239,9 @@ then
./install -i "/scratch/p_ppm/" -s -c"CXX=mpic++"
make
+
+ source $HOME/openfpm_vars
+
if [ $? -ne 0 ]; then
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$2 failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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
exit 1 ;
@@ -271,6 +278,9 @@ else
source ~/.bashrc
./install -s
make
+
+ source $HOME/openfpm_vars
+
if [ $? -ne 0 ]; then
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Error:\", \"color\": \"#FF0000\", \"text\":\"$2 failed to complete the openfpm_pdata test \" }] }" https://hooks.slack.com/services/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
exit 1 ;
diff --git a/src/Vector/vector_dist_unit_test.hpp b/src/Vector/vector_dist_unit_test.hpp
index 9cbded76..b621d281 100644
--- a/src/Vector/vector_dist_unit_test.hpp
+++ b/src/Vector/vector_dist_unit_test.hpp
@@ -510,7 +510,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_periodic_test_use_2d )
auto it2 = vd.getIterator();
- count_local_n_local(vd,it2,bc,box,dom_ext,l_cnt,nl_cnt,n_out);
+ count_local_n_local<2,vector_dist<2,float, Point_test<float> >>(vd,it2,bc,box,dom_ext,l_cnt,nl_cnt,n_out);
// No particles should be out of domain + ghost
BOOST_REQUIRE_EQUAL(n_out,0ul);
--
GitLab