Small refactoring NavierStokesOperatorBase (#1006)

Small changes to matrix free Operator.
 Use quadrature_point_indices()
 Rename phi to integrator

Former-commit-id: ab122f1

Author: peterrum

source/solvers/mf_navier_stokes_operators.cc

@@ -209,8 +209,6 @@ template <int dim, typename number>
 void
 NavierStokesOperatorBase<dim, number>::compute_element_size()
 {
-  FECellIntegrator phi(matrix_free);
-
   const unsigned int n_cells =
     matrix_free.n_cell_batches() + matrix_free.n_ghost_cell_batches();
   element_size.resize(n_cells);
@@ -447,25 +445,25 @@ NavierStokesOperatorBase<dim, number>::evaluate_non_linear_term(
   const VectorType &newton_step)
 {
   const unsigned int n_cells = matrix_free.n_cell_batches();
-  FECellIntegrator   phi(matrix_free);
+  FECellIntegrator   integrator(matrix_free);
 
-  nonlinear_previous_values.reinit(n_cells, phi.n_q_points);
-  nonlinear_previous_gradient.reinit(n_cells, phi.n_q_points);
-  nonlinear_previous_hessian_diagonal.reinit(n_cells, phi.n_q_points);
+  nonlinear_previous_values.reinit(n_cells, integrator.n_q_points);
+  nonlinear_previous_gradient.reinit(n_cells, integrator.n_q_points);
+  nonlinear_previous_hessian_diagonal.reinit(n_cells, integrator.n_q_points);
 
   for (unsigned int cell = 0; cell < n_cells; ++cell)
     {
-      phi.reinit(cell);
-      phi.read_dof_values_plain(newton_step);
-      phi.evaluate(EvaluationFlags::values | EvaluationFlags::gradients |
-                   EvaluationFlags::hessians);
+      integrator.reinit(cell);
+      integrator.read_dof_values_plain(newton_step);
+      integrator.evaluate(EvaluationFlags::values | EvaluationFlags::gradients |
+                          EvaluationFlags::hessians);
 
-      for (unsigned int q = 0; q < phi.n_q_points; ++q)
+      for (const auto q : integrator.quadrature_point_indices())
         {
-          nonlinear_previous_values(cell, q)   = phi.get_value(q);
-          nonlinear_previous_gradient(cell, q) = phi.get_gradient(q);
+          nonlinear_previous_values(cell, q)   = integrator.get_value(q);
+          nonlinear_previous_gradient(cell, q) = integrator.get_gradient(q);
           nonlinear_previous_hessian_diagonal(cell, q) =
-            phi.get_hessian_diagonal(q);
+            integrator.get_hessian_diagonal(q);
         }
     }
 }
@@ -477,17 +475,17 @@ NavierStokesOperatorBase<dim, number>::
     const VectorType &time_derivative_previous_solutions)
 {
   const unsigned int n_cells = matrix_free.n_cell_batches();
-  FECellIntegrator   phi(matrix_free);
+  FECellIntegrator   integrator(matrix_free);
 
-  time_derivatives_previous_solutions.reinit(n_cells, phi.n_q_points);
+  time_derivatives_previous_solutions.reinit(n_cells, integrator.n_q_points);
 
   for (unsigned int cell = 0; cell < n_cells; ++cell)
     {
-      phi.reinit(cell);
-      phi.read_dof_values_plain(time_derivative_previous_solutions);
-      phi.evaluate(EvaluationFlags::values);
-      for (unsigned int q = 0; q < phi.n_q_points; ++q)
-        time_derivatives_previous_solutions(cell, q) += phi.get_value(q);
+      integrator.reinit(cell);
+      integrator.read_dof_values_plain(time_derivative_previous_solutions);
+      integrator.evaluate(EvaluationFlags::values);
+      for (const auto q : integrator.quadrature_point_indices())
+        time_derivatives_previous_solutions(cell, q) += integrator.get_value(q);
     }
 }
 
@@ -591,7 +589,7 @@ NavierStokesSUPGPSPGOperator<dim, number>::do_cell_integral_local(
 
   const auto h = integrator.read_cell_data(this->get_element_size());
 
-  for (unsigned int q = 0; q < integrator.n_q_points; ++q)
+  for (const auto q : integrator.quadrature_point_indices())
     {
       // Evaluate source term function
       Tensor<1, dim + 1, VectorizedArray<number>> source_value;
@@ -731,7 +729,7 @@ NavierStokesSUPGPSPGOperator<dim, number>::local_evaluate_residual(
 
       const auto h = integrator.read_cell_data(this->get_element_size());
 
-      for (unsigned int q = 0; q < integrator.n_q_points; ++q)
+      for (const auto q : integrator.quadrature_point_indices())
         {
           // Evaluate source term function
           Tensor<1, dim + 1, VectorizedArray<number>> source_value;
@@ -864,7 +862,7 @@ NavierStokesTransientSUPGPSPGOperator<dim, number>::do_cell_integral_local(
   const double   sdt       = 1. / dt;
   Vector<double> bdf_coefs = bdf_coefficients(method, time_steps_vector);
 
-  for (unsigned int q = 0; q < integrator.n_q_points; ++q)
+  for (const auto q : integrator.quadrature_point_indices())
     {
       // Evaluate source term function
       Tensor<1, dim + 1, VectorizedArray<number>> source_value;
@@ -1023,7 +1021,7 @@ NavierStokesTransientSUPGPSPGOperator<dim, number>::local_evaluate_residual(
       const double   sdt       = 1. / dt;
       Vector<double> bdf_coefs = bdf_coefficients(method, time_steps_vector);
 
-      for (unsigned int q = 0; q < integrator.n_q_points; ++q)
+      for (const auto q : integrator.quadrature_point_indices())
         {
           // Evaluate source term function
           Tensor<1, dim + 1, VectorizedArray<number>> source_value;