diff --git a/configure.ac b/configure.ac index e4f92882fe12da42920435199221585b357f81ae..437558e10bab9a92e7fd82c7790d3a306b65a65d 100755 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ m4_ifdef([AX_OPENMP],,[m4_include([m4/ax_openmp.m4])]) m4_ifdef([AX_CUDA],,[m4_include([m4/ax_cuda.m4])]) m4_ifdef([IMMDX_LIB_METIS],,[m4_include([m4/immdx_lib_metis.m4])]) -CXXFLAGS+=" --std=c++11 -march=native -mtune=native " +CXXFLAGS+=" --std=c++11 " NVCCFLAGS=" " INCLUDES_PATH=" " diff --git a/install b/install index 4354df487217d4d5875c5eaaf1da1d0cc3aec233..4af5dfa3c6b1b2272f99d1f68b0dd683afe97ffb 100755 --- a/install +++ b/install @@ -42,6 +42,10 @@ METIS_installed=0 BOOST_installed=0 conf_err=1 +## Check for mpirun + + + if [ $install_req -eq 0 ]; then ./configure $configure_options else diff --git a/script/install_BOOST.sh b/script/install_BOOST.sh index 09144d2e0088af4a8dd5bc72f060a76195a185a0..dd8e9342362399152360fc7ef7c7fd75d6672b8b 100755 --- a/script/install_BOOST.sh +++ b/script/install_BOOST.sh @@ -7,10 +7,10 @@ if [ -d "${HOME}/BOOST" ]; then exit 0 fi -mkdir ${HOME}/BOOST wget http://ppmcore.mpi-cbg.de/upload/boost_1_58_0.tar.bz2 tar -xvf boost_1_58_0.tar.bz2 cd boost_1_58_0 ./bootstrap.sh +mkdir ${HOME}/BOOST ./b2 -j 4 install --prefix=$HOME/BOOST diff --git a/script/install_MPI.sh b/script/install_MPI.sh index d00da03c6e825ac9079864b577f13acc9bf97641..cb6a4c1dc9df95b4e784c5a7ca1b234363385f57 100755 --- a/script/install_MPI.sh +++ b/script/install_MPI.sh @@ -7,10 +7,10 @@ if [ -d "${HOME}/MPI" ]; then exit 0 fi -mkdir ${HOME}/MPI wget http://www.open-mpi.de/software/ompi/v1.8/downloads/openmpi-1.8.7.tar.bz2 tar -xvf openmpi-1.8.7.tar.bz2 cd openmpi-1.8.7 sh ./configure --prefix=${HOME}/MPI --enable-opal-multi-threads --enable-mpi-f90 make -j 4 +mkdir ${HOME}/MPI make install diff --git a/script/install_Metis.sh b/script/install_Metis.sh index 8899f346b8f414bb057aaecd2bf66c1ec5f70920..2a90dfa362f6d3c114039d89e399782142a36b11 100755 --- a/script/install_Metis.sh +++ b/script/install_Metis.sh @@ -7,12 +7,11 @@ if [ -d "${HOME}/METIS" ]; then exit 0 fi - -mkdir ${HOME}/METIS wget http://ppmcore.mpi-cbg.de/upload/metis-5.1.0.tar.gz tar -xf metis-5.1.0.tar.gz cd metis-5.1.0 make config shared=1 prefix=${HOME}/METIS make -j 4 +mkdir ${HOME}/METIS make install diff --git a/src/Grid/staggered_grid.hpp b/src/Grid/staggered_grid.hpp new file mode 100644 index 0000000000000000000000000000000000000000..861a8edb419bfb79bd47b1949994a26cbdf2084b --- /dev/null +++ b/src/Grid/staggered_grid.hpp @@ -0,0 +1,28 @@ +/* + * staggered_grid.hpp + * + * Created on: Aug 19, 2015 + * Author: i-bird + */ + +#ifndef SRC_GRID_STAGGERED_GRID_HPP_ +#define SRC_GRID_STAGGERED_GRID_HPP_ + +typedef boost::mpl::vector stag_elements; + +/*! \brief Implementation of the staggered grid + * + * \param dim Dimensionality od the staggered grid + * \param ele elements object on each dimensional objects, must be a stag_elements + * + * + * + */ +template <unsigned int dim, typename ele> +class staggered_grid +{ + +}; + + +#endif /* SRC_GRID_STAGGERED_GRID_HPP_ */