Commit d28562ea authored by Pietro Incardona's avatar Pietro Incardona

Eliminate warnings from the code

parent 8a7cd9aa
......@@ -193,7 +193,7 @@ else
METIS_installed=1
configure_options=" $configure_options --with-metis=$i_dir/METIS "
elif [ $conf_err -eq 202 ]; then
echo "Boost not found try to install"
echo "Boost not found try to install in $i_dir with $compiler_opt"
if [ $BOOST_installed -eq 1 ]; then
echo "Error the installation of Boost failed"
exit 1
......
......@@ -7,10 +7,11 @@ if [ -d "$1/BOOST" ]; then
exit 0
fi
wget http://ppmcore.mpi-cbg.de/upload/boost_1_58_0.tar.bz2
wget http://ppmcore.mpi-cbg.de/upload/boost_1_60_0.tar.bz2
tar -xvf boost_1_60_0.tar.bz2
cd boost_1_60_0
./bootstrap.sh
mkdir $1/BOOST
./b2 -j 4 install --prefix=$1/BOOST
rm -rf boost_1_60_0
......@@ -75,13 +75,12 @@ function remove_old()
## Check the installed version of the dependencies
if [ -f $1/BOOST/include/boost/version.hpp ]; then
is_update=$(cat $1/BOOST/include/boost/version.hpp | grep "#define BOOST_VERSION 106000")
if [ x"$is_update"==x"" ]; then
echo "New boost version, removing the old one"
rm -rf $1/BOOST/include
rm -rf $1/BOOST/lib
fi
is_update=$(cat $1/BOOST/include/boost/version.hpp | grep "#define BOOST_VERSION 106000")
if [ x"$is_update"==x"" ]; then
echo "New boost version, removing the old one"
rm -rf $1/BOOST/include
rm -rf $1/BOOST/lib
rm -rf $1/BOOST
fi
......
......@@ -128,9 +128,6 @@ private:
// vector v_proc
openfpm::vector<size_t> v_proc;
// Receive counter
size_t recv_cnt;
// reference counter of the object in case is shared between object
long int ref_cnt;
......@@ -375,7 +372,7 @@ public:
*
*/
CartDecomposition(Vcluster & v_cl)
:nn_prcs<dim,T>(v_cl),v_cl(v_cl),ref_cnt(0),recv_cnt(0)
:nn_prcs<dim,T>(v_cl),v_cl(v_cl),ref_cnt(0)
{
// Reset the box to zero
bbox.zero();
......@@ -387,7 +384,7 @@ public:
*
*/
CartDecomposition(const CartDecomposition<dim,T,Memory,Domain> & cart)
:nn_prcs<dim,T>(cart.v_cl),v_cl(cart.v_cl),ref_cnt(0),recv_cnt(0)
:nn_prcs<dim,T>(cart.v_cl),v_cl(cart.v_cl),ref_cnt(0)
{
this->operator=(cart);
}
......@@ -398,7 +395,7 @@ public:
*
*/
CartDecomposition(CartDecomposition<dim,T,Memory,Domain> && cart)
:nn_prcs<dim,T>(cart.v_cl),v_cl(cart.v_cl),ref_cnt(0),recv_cnt(0)
:nn_prcs<dim,T>(cart.v_cl),v_cl(cart.v_cl),ref_cnt(0)
{
this->operator=(cart);
}
......
......@@ -239,6 +239,7 @@ protected:
pb.box = bi;
pb.proc = p_id;
pb.lc_proc = nn_p.ProctoID(p_id);
pb.shift_id = (size_t)-1;
//
// Updating
......
......@@ -186,19 +186,19 @@ class nn_prcs
public:
nn_prcs(Vcluster & v_cl)
:v_cl(v_cl),aBC(false),recv_cnt(0)
:v_cl(v_cl),recv_cnt(0),aBC(false)
{}
//! Constructor from another nn_prcs
nn_prcs(const nn_prcs<dim,T> & ilg)
:v_cl(ilg.v_cl),aBC(false),recv_cnt(0)
:v_cl(ilg.v_cl),recv_cnt(0),aBC(false)
{
this->operator=(ilg);
};
//! Constructor from temporal ie_loc_ghost
nn_prcs(nn_prcs<dim,T> && ilg)
:v_cl(ilg.v_cl),aBC(false)
:v_cl(ilg.v_cl),recv_cnt(0),aBC(false)
{
this->operator=(ilg);
}
......
......@@ -2,7 +2,7 @@ LINKLIBS = $(METIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOS
noinst_PROGRAMS = pdata
pdata_SOURCES = main.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp
pdata_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -Wno-unused-function
pdata_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -Wno-unused-local-typedefs
pdata_CFLAGS = $(CUDA_CFLAGS)
pdata_LDADD = $(LINKLIBS) -lmetis
nobase_include_HEADERS = Decomposition/CartDecomposition.hpp Decomposition/common.hpp Decomposition/Decomposition.hpp Decomposition/ie_ghost.hpp \
......
......@@ -494,9 +494,6 @@ BOOST_AUTO_TEST_CASE( vector_dist_periodic_test_use_2d )
Box<2,float> dom_ext = box;
dom_ext.enlarge(ghost2);
// get the decomposition
const CartDecomposition<2,float> & ct = vd.getDecomposition();
// Iterate on all particles domain + ghost
size_t l_cnt = 0;
size_t nl_cnt = 0;
......@@ -603,9 +600,6 @@ BOOST_AUTO_TEST_CASE( vector_dist_periodic_test_use_3d )
Box<3,float> dom_ext = box;
dom_ext.enlarge(ghost2);
// Get the decomposition
const CartDecomposition<3,float> & ct = vd.getDecomposition();
// Iterate on all particles domain + ghost
size_t l_cnt = 0;
size_t nl_cnt = 0;
......@@ -680,9 +674,6 @@ BOOST_AUTO_TEST_CASE( vector_dist_periodic_test_random_walk )
// Distributed vector
vector_dist<3,float, Point_test<float>, CartDecomposition<3,float> > vd(k,box,bc,ghost);
// Get the decomposition
const CartDecomposition<3,float> & ct = vd.getDecomposition();
auto it = vd.getIterator();
while (it.isNext())
......
......@@ -3,17 +3,17 @@ LINKLIBS = $(METIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOS
noinst_PROGRAMS = cart_dec metis_dec dom_box
cart_dec_SOURCES = CartDecomposition_gen_vtk.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp
cart_dec_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function
cart_dec_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function -Wno-unused-local-typedefs
cart_dec_CFLAGS = $(CUDA_CFLAGS)
cart_dec_LDADD = $(LINKLIBS) -lmetis
metis_dec_SOURCES = Metis_gen_vtk.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp
metis_dec_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function
metis_dec_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function -Wno-unused-local-typedefs
metis_dec_CFLAGS = $(CUDA_CFLAGS)
metis_dec_LDADD = $(LINKLIBS) -lmetis
dom_box_SOURCES = domain_gen_vtk.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp
dom_box_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function
dom_box_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function -Wno-unused-local-typedefs
dom_box_CFLAGS = $(CUDA_CFLAGS)
dom_box_LDADD = $(LINKLIBS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment