From db4d61a2ee60af417a5f22e16ccfbfdb6cc6f919 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Wed, 19 Aug 2015 14:55:07 +0200
Subject: [PATCH] Start staggered grid
---
configure.ac | 2 +-
install | 4 ++++
script/install_BOOST.sh | 2 +-
script/install_MPI.sh | 2 +-
script/install_Metis.sh | 3 +--
src/Grid/staggered_grid.hpp | 28 ++++++++++++++++++++++++++++
6 files changed, 36 insertions(+), 5 deletions(-)
create mode 100644 src/Grid/staggered_grid.hpp
diff --git a/configure.ac b/configure.ac
index e4f92882f..437558e10 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 4354df487..4af5dfa3c 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 09144d2e0..dd8e93423 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 d00da03c6..cb6a4c1dc 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 8899f346b..2a90dfa36 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 000000000..861a8edb4
--- /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_ */
--
GitLab