Commit e2c50be1 authored by incardon's avatar incardon

Fixing Bug ghost_get without properties

parent ac6064c5
......@@ -170,6 +170,11 @@ function detect_compiler()
FC=gfortran
fi
dgc_ret=1
else
CXX=g++
CC=gcc
F77=gfortran
FC=gfortran
fi
}
......
......@@ -198,15 +198,15 @@ if [ ! -d "$1/MUMPS" ]; then
cp -r include $1/MUMPS
cp -r lib $1/MUMPS
MUMPS_extra_lib="$1/MUMPS/lib/libdmumps.a $1/MUMPS/lib/libmumps_common.a $1/MUMPS/lib/libpord.a"
configure_options="$configure_options --with-mumps=yes --with-mumps-lib=\"$MUMPS_extra_lib\" --with-mumps-include=$1/MUMPS/include"
MUMPS_extra_lib="--with-mumps-lib=\"$1/MUMPS/lib/libdmumps.a $1/MUMPS/lib/libmumps_common.a $1/MUMPS/lib/libpord.a\""
configure_options="$configure_options --with-mumps=yes --with-mumps-include=$1/MUMPS/include"
fi
else
echo "MUMPS already installed"
configure_options="$configure_options --with-mumps=yes --with-mumps-include=$1/MUMPS/include"
MUMPS_extra_lib="$1/MUMPS/lib/libdmumps.a $1/MUMPS/lib/libmumps_common.a $1/MUMPS/lib/libpord.a"
MUMPS_extra_lib="--with-mumps-lib=\"$1/MUMPS/lib/libdmumps.a $1/MUMPS/lib/libmumps_common.a $1/MUMPS/lib/libpord.a\""
configure_options="$configure_options --with-mumps=yes --with-mumps-lib=\"$MUMPS_extra_lib\" --with-mumps-include=$1/MUMPS/include"
fi
## SuperLU installation
......@@ -250,12 +250,20 @@ if [ ! -d "$1/SUPERLU_DIST" ]; then
mkdir $1/SUPERLU_DIST/include
cp -r lib $1/SUPERLU_DIST
cp SRC/*.h $1/SUPERLU_DIST/include
configure_options="$configure_options --with-superlu_dist=yes --with-superlu_dist-lib=$1/SUPERLU_DIST/lib/libsuperlu_dist_4.3.a --with-superlu_dist-include=$1/SUPERLU_DIST/include/"
if [ x"$CXX" == x"icpc" ]; then
configure_options="$configure_options"
else
configure_options="$configure_options --with-superlu_dist=yes --with-superlu_dist-lib=$1/SUPERLU_DIST/lib/libsuperlu_dist_4.3.a --with-superlu_dist-include=$1/SUPERLU_DIST/include/"
fi
fi
else
echo "SUPERLU already installed"
configure_options="$configure_options --with-superlu_dist=yes --with-superlu_dist-lib=$1/SUPERLU_DIST/lib/libsuperlu_dist_4.3.a --with-superlu_dist-include=$1/SUPERLU_DIST/include/"
if [ x"$CXX" == x"icpc" ]; then
configure_options="$configure_options"
else
configure_options="$configure_options --with-superlu_dist=yes --with-superlu_dist-lib=$1/SUPERLU_DIST/lib/libsuperlu_dist_4.3.a --with-superlu_dist-include=$1/SUPERLU_DIST/include/"
fi
fi
## HYPRE installation
......@@ -299,7 +307,7 @@ cd petsc-3.6.4
echo "./configure --with-cxx-dialect=C++11 --with-mpi-dir=$mpi_dir $configure_options --prefix=$1/PETSC --with-debugging=0"
./configure CXX=$CXX CC=$CC F77=$F77 FC=$FC --with-cxx-dialect=C++11 $petsc_openmp --with-mpi-dir=$mpi_dir $configure_options --prefix=$1/PETSC --with-debugging=0
./configure CXX=$CXX CC=$CC F77=$F77 FC=$FC --with-cxx-dialect=C++11 $petsc_openmp --with-mpi-dir=$mpi_dir $MUMPS_extra_lib $configure_options --prefix=$1/PETSC --with-debugging=0
make all test
make install
......
......@@ -3,7 +3,7 @@
source script/detect_gcc
source script/discover_os
detect_gcc_or_clang g++
detect_compiler
discover_os
# check if the directory $1/SUITESPARSE exist
......
......@@ -844,8 +844,14 @@ public:
if (opt & SKIP_LABELLING)
{
op_ssend_gg_recv_merge opm(g_m);
v_cl.SSendRecvP_op<op_ssend_gg_recv_merge,send_vector,decltype(v_prp),prp...>(g_send_prp,v_prp,prc_g_opart,opm,prc_recv_get,recv_sz_get);
// if there are no properties skip
// SSendRecvP send everything when we do not give properties
if (sizeof...(prp) != 0)
{
op_ssend_gg_recv_merge opm(g_m);
v_cl.SSendRecvP_op<op_ssend_gg_recv_merge,send_vector,decltype(v_prp),prp...>(g_send_prp,v_prp,prc_g_opart,opm,prc_recv_get,recv_sz_get);
}
}
else
v_cl.SSendRecvP<send_vector,decltype(v_prp),prp...>(g_send_prp,v_prp,prc_g_opart,prc_recv_get,recv_sz_get);
......
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