diff --git a/configure.ac b/configure.ac index e319637a18bf8f009e4c305e506ffbf780df242e..c3494c9447b696707e6b4bab80ac98d9ea3c8b0a 100755 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ m4_ifdef([AX_SUITESPARSE],,[m4_include([m4/ax_suitesparse.m4])]) m4_ifdef([AX_EIGEN],,[m4_include([m4/ax_eigen.m4])]) m4_ifdef([AX_LIB_HDF5],,[m4_include([m4/ax_lib_hdf5.m4])]) m4_ifdef([AX_LIB_PETSC],,[m4/ax_petsc_lib.m4]) - +m4_ifdef([AX_LIB_HILBERT],,[m4/ax_lib_hilbert.m4]) case $host_os in *darwin*|*macosx*) @@ -133,10 +133,15 @@ AX_LIB_PETSC() ## Check for quadmath -AC_CHECK_LIB(quadmath, sinq, [AC_DEFINE(HAVE_LIBQUADMATH,[],[Have quad math lib]) - LIBQUADMATH=" -lquadmath " +AC_LANG_PUSH([C++]) + +AC_CHECK_HEADER(quadmath.h, , []) +AC_CHECK_LIB(quadmath, sinq, [ AC_CHECK_HEADER( quadmath.h ,[AC_DEFINE(HAVE_LIBQUADMATH,[],[Have quad math lib]) + LIBQUADMATH=" -lquadmath "],[]) ], []) +AC_LANG_POP([C++]) + ###### RT runtime lib AC_CHECK_LIB(rt, clock_gettime, [AC_DEFINE([HAVE_CLOCK_GETTIME],[],[Have clock time]) @@ -211,8 +216,6 @@ if test x"$se_class3" = x"yes"; then AC_DEFINE([SE_CLASS3],[],[Security enhancement class 3]) fi -###### Check for action on error - action_on_e=continue AC_ARG_WITH([action-on-error], AS_HELP_STRING([--with-action-on-error=stop,throw,continue], @@ -282,17 +285,22 @@ AX_EIGEN([],[]) ###### Checking for compiler flags -fext-numeric-literals -my_save_cflags="$CFLAGS" -CFLAGS=-fext-numeric-literals +AC_LANG_PUSH([C++]) + +my_save_cflags="$CXXFLAGS" +CXXFLAGS=-fext-numeric-literals AC_MSG_CHECKING([whether CXX supports -fext-numeric-literals]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes])] [AM_CXXFLAGS=-fext-numeric-literals], [AC_MSG_RESULT([no])] ) -CFLAGS="$my_save_cflags" +AC_LANG_POP([C++]) +CXXFLAGS="$my_save_cflags" AC_SUBST([AM_CXXFLAGS]) + + ####### Checking for GPU support AX_CUDA diff --git a/src/FiniteDifference/FDScheme.hpp b/src/FiniteDifference/FDScheme.hpp index 7686e2276629199ecc82b425eb3d82464b3fae0c..66930c3ea8ec2cc0e39b4e5690796950d8f02874 100644 --- a/src/FiniteDifference/FDScheme.hpp +++ b/src/FiniteDifference/FDScheme.hpp @@ -466,7 +466,7 @@ public: auto it = g_map.getSubDomainIterator(start_k,stop_k); if (it.isNext() == true) - increment++; + increment = true; } // add padding to start and stop diff --git a/src/Operators/Vector/vector_dist_operators_apply_kernel_unit_tests.hpp b/src/Operators/Vector/vector_dist_operators_apply_kernel_unit_tests.hpp index efd7ab9c687eef6eb6df438abd8d2074225c0f6a..51079cac5bf264341bf628b9ececa5913d680796 100644 --- a/src/Operators/Vector/vector_dist_operators_apply_kernel_unit_tests.hpp +++ b/src/Operators/Vector/vector_dist_operators_apply_kernel_unit_tests.hpp @@ -351,9 +351,6 @@ BOOST_AUTO_TEST_CASE( vector_dist_operators_apply_kernel_test ) // ghost Ghost<3,float> ghost(0.05); - // vector type - typedef vector_dist<3,float,aggregate<float,float,float,VectorS<3,float>,VectorS<3,float>,VectorS<3,float>,float>> vtype; - vector_dist<3,float,aggregate<float,float,float,VectorS<3,float>,VectorS<3,float>,VectorS<3,float>,float>> vd(512,box,bc,ghost); auto vA = getV<A>(vd); diff --git a/src/Operators/Vector/vector_dist_operators_unit_tests.hpp b/src/Operators/Vector/vector_dist_operators_unit_tests.hpp index 0f3edd2c6a7ecada4b8e3e471adf54c8fd8f275e..0f95eb9e9872f4992581ff69c69397f423866f2f 100644 --- a/src/Operators/Vector/vector_dist_operators_unit_tests.hpp +++ b/src/Operators/Vector/vector_dist_operators_unit_tests.hpp @@ -1028,9 +1028,6 @@ BOOST_AUTO_TEST_CASE( vector_dist_operators_assign_test ) // ghost Ghost<3,float> ghost(0.05); - // vector type - typedef vector_dist<3,float,aggregate<float,float,float,float,float,float,float,float>> vtype; - vector_dist<3,float,aggregate<float,float,float,float,float,float,float,float>> vd(100,box,bc,ghost); auto v1 = getV<0>(vd); diff --git a/src/Solvers/petsc_solver.hpp b/src/Solvers/petsc_solver.hpp index 2a82cb2c868b520aaa877644bb8e15c062965fc0..d7ec9a30db39d9728c1d55402271cf01315e1b9d 100644 --- a/src/Solvers/petsc_solver.hpp +++ b/src/Solvers/petsc_solver.hpp @@ -105,20 +105,9 @@ class petsc_solver<double> // Temporal variable used for calculation of static members size_t tmp; - // Solver used -// char s_type[32]; - - // Tollerance set by the solver - PetscScalar tol; - // The full set of solvers openfpm::vector<std::string> solvs; - // The full set of preconditionses for simple parallel solvers - - // PCType pre-conditioner type - PCType pc; - bool try_solve = false; // It contain the solver benchmark results