Commit ee843717 authored by incardon's avatar incardon

Merge branch 'master' of ppmcore.mpi-cbg.de:incardon/openfpm_pdata

parents 16b84354 5e4f4ff4
......@@ -161,7 +161,7 @@ else
## if MPI or METIS installation required install it
if [ $conf_err -eq 200 ]; then
echo "MPI not found try to install"
echo "MPI not found try to install, $MPI_installed"
if [ $MPI_installed -eq 1 ]; then
echo "Error the installation of MPI failed"
exit 1
......@@ -169,7 +169,7 @@ else
./script/install_MPI.sh $i_dir $compiler_opt
MPI_installed=1
export PATH="$PATH:$i_dir/MPI/bin"
configure_options="$configure_options CXX=mpic++ "
elif [ $conf_err -eq 201 ]; then
echo "Metis not found try to install"
if [ $METIS_installed -eq 1 ]; then
......
......@@ -585,24 +585,24 @@ void Test3D_complex(const Box<3,float> & domain, long int k)
// In this case the boundary condition are non periodic
if (g_dist.isInside(key_g))
{
match &= (g_dist.template get<p::x>(key),1 + k)?true:false;
match &= (g_dist.template get<p::y>(key),567 + k)?true:false;
match &= (g_dist.template get<p::z>(key), 341 + k)?true:false;
match &= (g_dist.template get<p::s>(key), 5670 + k)?true:false;
match &= (g_dist.template get<p::v>(key)[0], 921 + k)?true:false;
match &= (g_dist.template get<p::v>(key)[1], 5675 + k)?true:false;
match &= (g_dist.template get<p::v>(key)[2], 117 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[0][0], 1921 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[0][1], 25675 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[0][2], 3117 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[1][0], 4921 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[1][1], 55675 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[1][2], 6117 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[2][0], 7921 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[2][1], 85675 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[2][2], 9117 + k)?true:false;
match &= (g_dist.template get<p::x>(key) == 1 + k)?true:false;
match &= (g_dist.template get<p::y>(key) == 567 + k)?true:false;
match &= (g_dist.template get<p::z>(key) == 341 + k)?true:false;
match &= (g_dist.template get<p::s>(key) == 5670 + k)?true:false;
match &= (g_dist.template get<p::v>(key)[0] == 921 + k)?true:false;
match &= (g_dist.template get<p::v>(key)[1] == 5675 + k)?true:false;
match &= (g_dist.template get<p::v>(key)[2] == 117 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[0][0] == 1921 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[0][1] == 25675 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[0][2] == 3117 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[1][0] == 4921 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[1][1] == 55675 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[1][2] == 6117 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[2][0] == 7921 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[2][1] == 85675 + k)?true:false;
match &= (g_dist.template get<p::t>(key)[2][2] == 9117 + k)?true:false;
}
++domg;
......
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