Commit df9136a4 authored by absingh's avatar absingh

DCPSE Numerics Update

parent 300af18f
-I
\ No newline at end of file
\ No newline at end of file
/Users/absingh/git/OpenFPM/Dependencies/
\ No newline at end of file
0
\ No newline at end of file
-I
\ No newline at end of file
\ No newline at end of file
openfpm_numerics @ 7e6db88d
Subproject commit 2a8361592734205b286e792282784816ff989114
Subproject commit 7e6db88d222f861221ecf7ebd7a7ad66cb73ee46
......@@ -56,19 +56,31 @@ function detect_compiler()
# First we try to understand if g++ command line is linked to clang
if haveProg g++; then
is_apple_llvm=no
prefix_search=""
g++ --version | grep "Apple LLVM" >/dev/null 2>&1
if [ $? == 0 ]; then
is_apple_llvm=yes
prefix_search="LLVM"
fi
g++ --version | grep "Apple clang" >/dev/null 2>&1
if [ $? == 0 ]; then
is_apple_llvm=yes
prefix_search="clang"
fi
if [ x"$is_apple_llvm" == x"yes" ]; then
echo "Apple LLVM based g++"
# we try the detect the version
major=$(g++ --version | grep LLVM | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\1/g')
major=$(g++ --version | grep $prefix_search | sed 's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\1/g')
# we check if the detection is garbage
echo "$major" | egrep -q '^[0-9]+$'
if [ $? == 0 ]; then
dgc_major=$(g++ --version | grep LLVM | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\1/g')
dgc_middle=$(g++ --version | grep LLVM | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\2/g')
dgc_minor=$(g++ --version | grep LLVM | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\3/g')
dgc_major=$(g++ --version | grep $prefix_search | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\1/g')
dgc_middle=$(g++ --version | grep $prefix_search | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\2/g')
dgc_minor=$(g++ --version | grep $prefix_search | sed 's/.* \([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*(clang.*/\3/g')
if [ $dgc_major -gt 6 ]; then
echo -e "clang++ $dgc_major.$dgc_middle.$dgc_minor \033[92;1m SUCCESS \033[0m"
......@@ -235,5 +247,3 @@ function detect_compiler()
echo "No compiler found"
fi
}
//
// Created by tommaso on 29/03/19.
//
#ifndef OPENFPM_PDATA_DCPSE_HPP
#define OPENFPM_PDATA_DCPSE_HPP
#ifdef HAVE_EIGEN
#include "Vector/vector_dist.hpp"
#include "MonomialBasis.hpp"
#include "../../openfpm_numerics/src/DMatrix/EMatrix.hpp"
......@@ -270,7 +268,6 @@ void Dcpse<dim, T, list...>::initializeStaticSize(vector_dist<dim, T, aggregate<
++it;
}
}
#endif // HAVE_EIGEN
#endif
#endif //OPENFPM_PDATA_DCPSE_HPP
......@@ -1991,9 +1991,9 @@ void test_vector_dist_particle_NN_MP_iteration()
{
auto key = it.get();
vd.template getPosWrite(key)[0] = ud(eg);
vd.template getPosWrite(key)[1] = ud(eg);
vd.template getPosWrite(key)[2] = ud(eg);
vd.getPosWrite(key)[0] = ud(eg);
vd.getPosWrite(key)[1] = ud(eg);
vd.getPosWrite(key)[2] = ud(eg);
// Fill some properties randomly
......
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