Commit 7dd0e4db authored by incardon's avatar incardon

Fixing several installation problems on OSX

parent 0dc5f75f
......@@ -10,11 +10,16 @@
*
*/
#include "config/config.h"
#include "Vector/vector_dist.hpp"
#include "Decomposition/CartDecomposition.hpp"
#include "PSE/Kernels.hpp"
#include "data_type/aggregate.hpp"
#include <cmath>
// This example only work if there is HAVE_LIBQUADMATH
#ifdef HAVE_LIBQUADMATH
#include <boost/multiprecision/float128.hpp>
typedef boost::multiprecision::float128 float128;
......@@ -310,3 +315,11 @@ int main(int argc, char* argv[])
//
openfpm_finalize();
}
#else
int main(int argc, char* argv[])
{
}
#endif
......@@ -425,7 +425,7 @@ int main(int argc, char* argv[])
double val;
// usefull to sort the particle by position
bool operator<(const pos_val & p)
bool operator<(const pos_val & p) const
{
return pos < p.pos;
}
......
......@@ -8,7 +8,7 @@ OBJ_EIGEN = main_eigen.o
OBJ_PETSC = main_petsc.o
%.o: %.cpp
$(CC) -fext-numeric-literals -O3 -c --std=c++11 -o $@ $< $(INCLUDE_PATH)
$(CC) -O3 -c --std=c++11 -o $@ $< $(INCLUDE_PATH)
all: stokes_2d_eigen stokes_2d_petsc
......
......@@ -8,15 +8,15 @@ OBJ_EIGEN = main_eigen.o
OBJ_PETSC = main_petsc.o
%.o: %.cpp
$(CC) -fopenmp -fext-numeric-literals -O3 -c --std=c++11 -o $@ $< $(INCLUDE_PATH)
$(CC) -O3 -c --std=c++11 -o $@ $< $(INCLUDE_PATH)
all: stokes_3d_eigen stokes_3d_petsc
stokes_3d_eigen: $(OBJ_EIGEN)
$(CC) -fopenmp -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
stokes_3d_petsc: $(OBJ_PETSC)
$(CC) -fopenmp -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
run: all
source $$HOME/openfpm_vars; mpirun -np 3 ./stokes_3d_eigen; mpirun -np 3 ./stokes_3d_petsc
......
......@@ -80,7 +80,7 @@ AC_DEFUN([AX_LIB_HILBERT], [
with_libhilbert=$PETSC
AC_MSG_RESULT(yes)
else
with_petsc=/usr
with_libhilbert=/usr
if test ! -f "$with_libhilbert/include/hilbertKey.h" ; then
with_libhilbert=/usr/local
if test ! -f "$with_libhilbert/include/hilbertKey.h" ; then
......
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