Commit 6becb27f authored by incardon's avatar incardon

Latst modules

parent 6d139fa5
......@@ -428,7 +428,7 @@ else
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
fi
echo "INCLUDE_PATH_NVCC=$(cat openmp_flags) -Xcudafe \"--display_error_number --diag_suppress=2885 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111\" --expt-extended-lambda -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 "INCLUDE_PATH_NVCC=$(cat openmp_flags) -Xcudafe \"--display_error_number --diag_suppress=2885 --diag_suppress=2886 --diag_suppress=2887 --diag_suppress=2888 --diag_suppress=186 --diag_suppress=111\" --expt-extended-lambda -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
cp example.mk src/example.mk
cp example.mk example/example.mk
......
openfpm_data @ a6e3d60e
Subproject commit fa595720734c956d9995ca19211e4ba9a1bcd419
Subproject commit a6e3d60e18e3457d3f0ec30135ca965a2cfc9231
......@@ -12,6 +12,7 @@ fi
## Remove old download
rm -rf parmetis-4.0.3
rm parmetis-4.0.3.tar.gz
wget http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz
tar -xf parmetis-4.0.3.tar.gz
......
......@@ -217,14 +217,16 @@ class domain_nn_calculator_cart
anom_lin.clear();
for (size_t i = 0 ; i < anom.size() ; i++)
{
grid_key_dx<dim> tmp = anom.get(i).subsub + shift;
anom_lin.add();
anom_lin.last().subsub = gs.LinId(anom.get(i).subsub + shift);
anom_lin.last().subsub = gs.LinId(tmp);
long int self_cell = -1;
for (size_t j = 0 ; j < anom.get(i).NN_subsub.size() ; j++)
{
anom_lin.get(i).NN_subsub.add((long int)gs.LinId(anom.get(i).NN_subsub.get(j) + shift) - anom_lin.get(i).subsub);
grid_key_dx<dim> tmp = anom.get(i).NN_subsub.get(j) + shift;
anom_lin.get(i).NN_subsub.add((long int)gs.LinId(tmp) - anom_lin.get(i).subsub);
// This indicate that for example in the neighborhood of one cell it-self is included in the list
// For example the cell 100 is in the neighborhood of the cell 100
......@@ -278,12 +280,18 @@ public:
dom_cells_lin.clear();
for (size_t i = 0 ; i < dom_cells.size() ; i++)
dom_cells_lin.add(gs.LinId(dom_cells.get(i) + shift));
{
grid_key_dx<dim> tmp = dom_cells.get(i) + shift;
dom_cells_lin.add(gs.LinId(tmp));
}
dom_lin.clear();
for (size_t i = 0 ; i < dom.size() ; i++)
dom_lin.add(gs.LinId(dom.get(i) + shift));
{
grid_key_dx<dim> tmp = dom.get(i) + shift;
dom_lin.add(gs.LinId(tmp));
}
linearize_subsub(anom,anom_lin,shift,gs);
}
......
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