Commit 846176c8 authored by incardon's avatar incardon

Fixing installation on OpenSUSE

parent b5527337
......@@ -394,8 +394,14 @@ fi
install_base=$(cat install_dir)
openmp_flags="$(cat openmp_flags) $(cat openfpm_flags)"
if [ -d "$i_dir/HDF5/lib" ]; then
hdf5_lib=$i_dir/HDF5/lib
elif [ -d "$i_dir/HDF5/lib64" ]; then
hdf5_lib=$i_dir/HDF5/lib64
fi
echo "INCLUDE_PATH= $openmp_flags -I. -I$install_base/openfpm_numerics/include -I$install_base/openfpm_pdata/include/config -I$install_base/openfpm_pdata/include -I$install_base/openfpm_data/include -I$install_base/openfpm_vcluster/include -I$install_base/openfpm_io/include -I$install_base/openfpm_devices/include -I$i_dir/METIS/include -I$i_dir/PARMETIS/include -I$i_dir/BOOST/include -I$i_dir/HDF5/include -I$i_dir/LIBHILBERT/include $lin_alg_inc" > example.mk
echo "LIBS_PATH= $openmp_flags -L$install_base/openfpm_devices/lib -L$install_base/openfpm_pdata/lib -L$install_base/openfpm_vcluster/lib -L$i_dir/METIS/lib -L$i_dir/PARMETIS/lib -L$i_dir/BOOST/lib -L$i_dir/HDF5/lib -L$i_dir/LIBHILBERT/lib $lin_alg_dir" >> example.mk
echo "LIBS_PATH= $openmp_flags -L$install_base/openfpm_devices/lib -L$install_base/openfpm_pdata/lib -L$install_base/openfpm_vcluster/lib -L$i_dir/METIS/lib -L$i_dir/PARMETIS/lib -L$i_dir/BOOST/lib -L$hdf5_lib -L$i_dir/LIBHILBERT/lib $lin_alg_dir" >> example.mk
echo "LIBS=-lvcluster -lofpm_pdata -lofpmmemory -lparmetis -lmetis -lboost_iostreams -lhdf5 -llibhilbert $lin_alg_lib" >> example.mk
echo "LIBS_SE2=-lvcluster -lofpmmemory_se2 -lparmetis -lmetis -lboost_iostreams -lhdf5 -llibhilbert $lin_alg_lib" >> example.mk
cp example.mk src/example.mk
......@@ -456,7 +462,7 @@ fi
if [ -d "$i_dir/HDF5" ]; then
installation_report="$installation_report \033[92;1mHDF5\033[0m Installed: \033[1m $i_dir/HDF5 \033[0m\n"
bash_library="$bash_library:$i_dir/HDF5/lib"
bash_library="$bash_library:$hdf5_lib"
fi
if [ -d "$i_dir/LIBHILBERT" ]; then
......
This diff is collapsed.
......@@ -32,8 +32,10 @@ class grid_dist_id_iterator_dec_skin : protected grid_skin_iterator_bc<Decomposi
//! Extension of each grid: domain and ghost + domain
openfpm::vector<GBoxes<Decomposition::dims>> gdb_ext;
//! Internal grid sub-iterator
grid_key_dx_iterator_sub<Decomposition::dims> a_it;
//! Internal struct
struct gp_sub
{
//! from which grid this iterator come from
......@@ -42,6 +44,12 @@ class grid_dist_id_iterator_dec_skin : protected grid_skin_iterator_bc<Decomposi
//! Iterator
grid_key_dx_iterator_sub<Decomposition::dims> it;
/*! \brief constructor
*
* \param gc sub-domain
* \param it iterator
*
*/
gp_sub(size_t gc, grid_key_dx_iterator_sub<Decomposition::dims> && it)
:gc(gc),it(it)
{}
......@@ -142,7 +150,9 @@ class grid_dist_id_iterator_dec_skin : protected grid_skin_iterator_bc<Decomposi
/*! \brief Constructor of the distributed grid iterator
*
* \param dec Decomposition
* \param sz size of the grid
* \param g_sm grid size on each direction
* \param A box A (must be contained into B)
* \param B box B
* \param bc boundary conditions
*
*/
......@@ -168,17 +178,16 @@ class grid_dist_id_iterator_dec_skin : protected grid_skin_iterator_bc<Decomposi
selectValidGrid();
}
// Destructor
//! Destructor
~grid_dist_id_iterator_dec_skin()
{
}
/*! \brief Get the next element
*
* \return the next grid_key
* \return itself
*
*/
inline grid_dist_id_iterator_dec_skin<Decomposition> & operator++()
{
++a_it;
......@@ -215,7 +224,9 @@ class grid_dist_id_iterator_dec_skin : protected grid_skin_iterator_bc<Decomposi
/*! \brief Get the spacing of the grid
*
* \param i
* \param i dimension
*
* \return the spacing
*
*/
inline typename Decomposition::stype getSpacing(size_t i)
......@@ -254,6 +265,8 @@ class grid_dist_id_iterator_dec_skin : protected grid_skin_iterator_bc<Decomposi
*
* \param tmp iterator to copy
*
* \return itself
*
*/
grid_dist_id_iterator_dec_skin<Decomposition> & operator=(const grid_dist_id_iterator_dec_skin<Decomposition> & tmp)
{
......@@ -274,6 +287,8 @@ class grid_dist_id_iterator_dec_skin : protected grid_skin_iterator_bc<Decomposi
*
* \param tmp iterator to copy
*
* \return itself
*
*/
grid_dist_id_iterator_dec_skin<Decomposition> & operator=(grid_dist_id_iterator_dec_skin<Decomposition> && tmp)
{
......
......@@ -66,13 +66,21 @@ struct vtk_write<ele,vtk,false>
template<typename T>
struct extends
{
//! number of elements
/*! \brief Scalar case
*
* \return 1 component
*
*/
static inline size_t mul()
{
return 1;
}
//! number of indexes
/*! \brief Dimensionality
*
* \return 0
*
*/
static inline size_t dim()
{
return 0;
......@@ -83,13 +91,21 @@ struct extends
template<typename T,size_t N1>
struct extends<T[N1]>
{
//! number of elements
/*! \brief Vector case return N1 component
*
* \return N1
*
*/
static inline size_t mul()
{
return N1;
}
//! number of indexes
/*! Dimensionality 1
*
* \return 1
*
*/
static inline size_t dim()
{
return 1;
......@@ -100,13 +116,21 @@ struct extends<T[N1]>
template<typename T,size_t N1,size_t N2>
struct extends<T[N1][N2]>
{
//! number of elements
/*! \brief Matrix case return N1*N2 component
*
* \return N1*N2
*
*/
static inline size_t mul()
{
return N1 * N2;
}
//! number of indexes
/*! Dimensionality 2
*
* \return 2
*
*/
static inline size_t dim()
{
return 2;
......@@ -256,8 +280,7 @@ struct extends<T[N1][N2][N3][N4][N5][N6][N7][N8][N9][N10]>
* \param T property to write
* \param dim dimansionality
* \param St type of space
* \param VTKW VTK writer
* \param
* \param VTK VTK writer
*
*/
template<typename T>
......
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