Merge pull request #26 from nicola-giuliani/no_warning

Erased warnings and useless old files

Author: nicola-giuliani

include/min_bem_operator.h

@@ -1,7 +1,8 @@
 #!/bin/bash
-IMG=`grep image .travis.yml | awk '{print $2}'` 
+IMG=mathlab/deal2lkit:latest #`grep image .travis.yml | awk '{print $2}'` 
 echo $IMG
 
 CMD=`grep -e '- ' .travis.yml | sed 's/- //'`
+echo $CMD
 docker pull $IMG 
-docker run -v `pwd`/..:/builds/studenti/pi-BEM/ $IMG /bin/sh -c "$CMD" 
+docker run -v `pwd`/..:/app/ $IMG /bin/sh -c "cd /app && $CMD" 

include/step_fma.h

@@ -170,10 +170,6 @@ void BEMFMA<dim>::direct_integrals()
   // general):
 
 
-  cell_it
-  cell = fma_dh->begin_active(),
-  endc = fma_dh->end();
-
   // first, we (re)initialize the
   // preconditioning matricies by
   // generating the corresponding
@@ -793,7 +789,7 @@ void BEMFMA<dim>::direct_integrals()
 
                         // here are the vectors of the quad points and normals vectors
 
-                        const std::vector<Tensor<1, dim> > &singular_normals = fe_v_singular.get_all_normal_vectors();
+                        const std::vector<Tensor<1, dim> > &singular_normals = fe_v_singular.get_normal_vectors();
                         const std::vector<Point<dim> > &singular_q_points = fe_v_singular.get_quadrature_points();
 
 
@@ -1732,7 +1728,6 @@ void BEMFMA<dim>::generate_multipole_expansions(const TrilinosWrappers::MPI::Vec
 // these two variables will be handy in the following
 
   std::vector<types::global_dof_index> local_dof_indices(fma_dh->get_fe().dofs_per_cell);
-  double delta;
 
 // we loop on blocks and for each of them we create an empty multipole expansion
 // centered in the block center
@@ -2098,7 +2093,6 @@ void BEMFMA<dim>::multipole_matr_vect_products(const TrilinosWrappers::MPI::Vect
   DoFTools::map_dofs_to_support_points<dim-1, dim>( *fma_mapping,
                                                     *fma_dh, support_points);
   std::vector<types::global_dof_index> local_dof_indices(fma_dh->get_fe().dofs_per_cell);
-  double delta;
 
 
 
@@ -2387,7 +2381,7 @@ void BEMFMA<dim>::multipole_matr_vect_products(const TrilinosWrappers::MPI::Vect
 
       // The Workstream has to run only if there are blocks in the current level. Then it basically performs
       // a loop over all the blocks in the current level.
-      if (endLevel[level]>=startLevel[level])
+      if (endBlockLevel>=startBlockLevel)
         WorkStream::run(dofs_filled_blocks[level].begin(),
                         dofs_filled_blocks[level].end(),
                         std_cxx11::bind(f_worker_Descend, std_cxx11::_1,  std_cxx11::_2, std_cxx11::_3, startBlockLevel),
@@ -3254,7 +3248,7 @@ void BEMFMA<dim>::generate_octree_blocking()
       const unsigned int n_q_points = fe_v.n_quadrature_points;
       quadPoints[cell] = fe_v.get_quadrature_points();
       // quadNormals[cell] = fe_v.get_normal_vectors();
-      quadNormals[cell] = fe_v.get_all_normal_vectors();
+      quadNormals[cell] = fe_v.get_normal_vectors();
       quadJxW[cell].resize(n_q_points);
       quadShapeFunValues[cell].resize(n_q_points);
       for (unsigned int q=0; q<n_q_points; ++q)

scripts/run_docker.sh

@@ -678,7 +678,7 @@ void BEMProblem<dim>::assemble_system()
       cell->get_dof_indices(local_dof_indices);
 
       const std::vector<Point<dim> > &q_points = fe_v.get_quadrature_points();
-      const std::vector<Tensor<1, dim> > &normals = fe_v.get_all_normal_vectors();
+      const std::vector<Tensor<1, dim> > &normals = fe_v.get_normal_vectors();
 
       // We then form the integral over
       // the current cell for all
@@ -975,7 +975,7 @@ void BEMProblem<dim>::assemble_system()
 
                   fe_v_singular.reinit(cell);
 
-                  const std::vector<Tensor<1, dim> > &singular_normals = fe_v_singular.get_all_normal_vectors();
+                  const std::vector<Tensor<1, dim> > &singular_normals = fe_v_singular.get_normal_vectors();
                   const std::vector<Point<dim> > &singular_q_points = fe_v_singular.get_quadrature_points();
 
                   for (unsigned int q=0; q<singular_quadrature->size(); ++q)
@@ -1766,8 +1766,7 @@ void BEMProblem<dim>::compute_gradients(const TrilinosWrappers::MPI::Vector &glo
   std::vector< Tensor<1,dim> > dummy_phi_surf_grads(n_q_points);
 
   cell_it
-  vector_cell = gradient_dh.begin_active(),
-  vector_endc = gradient_dh.end();
+  vector_cell = gradient_dh.begin_active();
 
   cell_it
   cell = dh.begin_active(),
@@ -1785,7 +1784,7 @@ void BEMProblem<dim>::compute_gradients(const TrilinosWrappers::MPI::Vector &glo
           vector_fe_v.reinit (vector_cell);
           local_gradients_matrix = 0;
           local_gradients_rhs = 0;
-          const std::vector<Tensor<1, dim> > &vector_node_normals = vector_fe_v.get_all_normal_vectors();
+          const std::vector<Tensor<1, dim> > &vector_node_normals = vector_fe_v.get_normal_vectors();
           fe_v.get_function_gradients(phi, phi_surf_grads);
           fe_v.get_function_values(dphi_dn, phi_norm_grads);
           unsigned int comp_i, comp_j;
@@ -1902,8 +1901,7 @@ void BEMProblem<dim>::compute_surface_gradients(const TrilinosWrappers::MPI::Vec
   std::vector< Tensor<1,dim> > dummy_phi_surf_grads(n_q_points);
 
   cell_it
-  vector_cell = gradient_dh.begin_active(),
-  vector_endc = gradient_dh.end();
+  vector_cell = gradient_dh.begin_active();
 
   cell_it
   cell = dh.begin_active(),
@@ -2021,7 +2019,7 @@ void BEMProblem<dim>::compute_normals()
           vector_fe_v.reinit (vector_cell);
           local_normals_matrix = 0;
           local_normals_rhs = 0;
-          const std::vector<Tensor<1, dim> > &vector_node_normals = vector_fe_v.get_all_normal_vectors();
+          const std::vector<Tensor<1, dim> > &vector_node_normals = vector_fe_v.get_normal_vectors();
           unsigned int comp_i, comp_j;
 
           for (unsigned int q=0; q<vector_n_q_points; ++q)