Merge pull request #22 from nicola-giuliani/fix_9.0

compiling with deal 9

Author: nicola-giuliani

include/bem_fma.h

@@ -15,12 +15,13 @@
 #include "../include/multipole_expansion.h"
 #include "../include/ass_leg_function.h"
 #include "../include/computational_domain.h"
-#include <deal.II/lac/trilinos_block_vector.h>
+#include <deal.II/lac/trilinos_vector.h>
 #include <deal.II/lac/trilinos_sparse_matrix.h>
 #include <deal.II/lac/trilinos_block_sparse_matrix.h>
 #include <deal.II/lac/trilinos_precondition.h>
 #include <deal.II/base/work_stream.h>
 #include <deal.II/base/types.h>
+#include <deal.II/base/std_cxx11/bind.h>
 #include <cmath>
 #include <iostream>
 #include <fstream>

include/bem_problem.h

@@ -26,7 +26,7 @@
 #include<deal.II/lac/precondition.h>
 #include<deal.II/lac/sparse_direct.h>
 #include <deal.II/lac/block_sparsity_pattern.h>
-#include <deal.II/lac/trilinos_block_vector.h>
+#include <deal.II/lac/trilinos_vector.h>
 #include <deal.II/lac/trilinos_sparse_matrix.h>
 #include <deal.II/lac/trilinos_block_sparse_matrix.h>
 #include <deal.II/lac/trilinos_precondition.h>

include/computational_domain.h

@@ -12,6 +12,7 @@
 #include <deal.II/base/parsed_function.h>
 #include <deal.II/base/utilities.h>
 #include <deal.II/base/conditional_ostream.h>
+#include <deal.II/base/std_cxx11/tuple.h>
 
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/sparse_matrix.h>

include/min_bem_operator.h

@@ -1,6 +1,6 @@
 #include <deal.II/base/utilities.h>
 
-#include <deal.II/lac/trilinos_block_vector.h>
+#include <deal.II/lac/trilinos_vector.h>
 #include <deal.II/lac/trilinos_sparse_matrix.h>
 #include <deal.II/lac/trilinos_block_sparse_matrix.h>
 #include <deal.II/lac/trilinos_precondition.h>

include/step_fma.h

@@ -34,7 +34,7 @@
 #include <deal.II/numerics/data_out.h>
 #include <deal.II/numerics/vector_tools.h>
 
-#include <deal.II/lac/trilinos_block_vector.h>
+#include <deal.II/lac/trilinos_vector.h>
 #include <deal.II/lac/trilinos_sparse_matrix.h>
 #include <deal.II/lac/trilinos_block_sparse_matrix.h>
 #include <deal.II/lac/trilinos_precondition.h>

source/computational_domain.cc

@@ -797,9 +797,9 @@ void ComputationalDomain<dim>::refine_and_resize(const unsigned int refinement_l
                                                                        n,
                                                                        tolerance);
                   // in correspondence with the projected point, we ask all the surface differential forms
-                  std_cxx11::tuple<Point<3>,Tensor<1,3>,double,double> tup = OpenCASCADE::closest_point_and_differential_forms(neededShape,
-                                                                             projection,
-                                                                             tolerance);
+                  auto tup = OpenCASCADE::closest_point_and_differential_forms(neededShape,
+                             projection,
+                             tolerance);
                   // among the differential point, we select the maximum absolute curvature
                   double max_abs_curv = fmax(fabs(std_cxx11::get<2>(tup)),fabs(std_cxx11::get<3>(tup)));
                   // this commented line is just for debug purposes