Update physics tests to use QP range based loop

diff --git a/tests/physics/step-18-rotation_matrix.cc b/tests/physics/step-18-rotation_matrix.cc
index e1a61f1a7c0a78384d9c1def5e9cf3e52bdf4f94..9fce0e15a6e4576e468d251e6ab80cf72ed1e478 100644 (file)
--- a/tests/physics/step-18-rotation_matrix.cc
+++ b/tests/physics/step-18-rotation_matrix.cc
@@ -402,7 +402,8 @@ namespace Step18
           fe_values.reinit(cell);
           for (unsigned int i = 0; i < dofs_per_cell; ++i)
             for (unsigned int j = 0; j < dofs_per_cell; ++j)
-              for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+              for (const unsigned int q_point :
+                   fe_values.quadrature_point_indices())
                 {
                   const SymmetricTensor<2, dim>
                     eps_phi_i = get_strain(fe_values, i, q_point),
@@ -418,7 +419,8 @@ namespace Step18
             {
               const unsigned int component_i =
                 fe.system_to_component_index(i).first;
-              for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+              for (const unsigned int q_point :
+                   fe_values.quadrature_point_indices())
                 {
                   const SymmetricTensor<2, dim> &old_stress =
                     local_quadrature_points_data[q_point].old_stress;

diff --git a/tests/physics/step-18.cc b/tests/physics/step-18.cc
index 0292da33eadeba8d8123b99663e0bd1036b09993..cdda878fa0e3cbb1731c4cfafdb9c1edc5790bc1 100644 (file)
--- a/tests/physics/step-18.cc
+++ b/tests/physics/step-18.cc
@@ -418,7 +418,8 @@ namespace Step18
           fe_values.reinit(cell);
           for (unsigned int i = 0; i < dofs_per_cell; ++i)
             for (unsigned int j = 0; j < dofs_per_cell; ++j)
-              for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+              for (const unsigned int q_point :
+                   fe_values.quadrature_point_indices())
                 {
                   const SymmetricTensor<2, dim>
                     eps_phi_i = get_strain(fe_values, i, q_point),
@@ -434,7 +435,8 @@ namespace Step18
             {
               const unsigned int component_i =
                 fe.system_to_component_index(i).first;
-              for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+              for (const unsigned int q_point :
+                   fe_values.quadrature_point_indices())
                 {
                   const SymmetricTensor<2, dim> &old_stress =
                     local_quadrature_points_data[q_point].old_stress;

diff --git a/tests/physics/step-44-standard_tensors-material_push_forward.cc b/tests/physics/step-44-standard_tensors-material_push_forward.cc
index 52973660b93fbdae92c1692394dbf34f0fa1b896..ddff955d077ff9808b5f2a9737a9f02a102bc9ba 100644 (file)
--- a/tests/physics/step-44-standard_tensors-material_push_forward.cc
+++ b/tests/physics/step-44-standard_tensors-material_push_forward.cc
@@ -1426,7 +1426,8 @@ namespace Step44
       scratch.solution_total, scratch.solution_values_p_total);
     scratch.fe_values_ref[J_fe].get_function_values(
       scratch.solution_total, scratch.solution_values_J_total);
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       lqph[q_point]->update_values(scratch.solution_grads_u_total[q_point],
                                    scratch.solution_values_p_total[q_point],
                                    scratch.solution_values_J_total[q_point]);
@@ -1535,7 +1536,8 @@ namespace Step44
         const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
           quadrature_point_history.get_data(cell);
         Assert(lqph.size() == n_q_points, ExcInternalError());
-        for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+        for (const unsigned int q_point :
+             fe_values_ref.quadrature_point_indices())
           {
             const double det_F_qp = lqph[q_point]->get_det_F();
             const double JxW      = fe_values_ref.JxW(q_point);
@@ -1560,7 +1562,8 @@ namespace Step44
         const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
           quadrature_point_history.get_data(cell);
         Assert(lqph.size() == n_q_points, ExcInternalError());
-        for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+        for (const unsigned int q_point :
+             fe_values_ref.quadrature_point_indices())
           {
             const double det_F_qp   = lqph[q_point]->get_det_F();
             const double J_tilde_qp = lqph[q_point]->get_J_tilde();
@@ -1658,7 +1661,8 @@ namespace Step44
     const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
       quadrature_point_history.get_data(cell);
     Assert(lqph.size() == n_q_points, ExcInternalError());
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const Tensor<2, dim> F_inv = lqph[q_point]->get_F_inv();
         for (unsigned int k = 0; k < dofs_per_cell; ++k)
@@ -1681,7 +1685,8 @@ namespace Step44
               Assert(k_group <= J_dof, ExcInternalError());
           }
       }
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const Tensor<2, dim>          tau = lqph[q_point]->get_tau();
         const SymmetricTensor<4, dim> Jc  = lqph[q_point]->get_Jc();
@@ -1783,7 +1788,8 @@ namespace Step44
     const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
       quadrature_point_history.get_data(cell);
     Assert(lqph.size() == n_q_points, ExcInternalError());
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const Tensor<2, dim> F_inv = lqph[q_point]->get_F_inv();
         for (unsigned int k = 0; k < dofs_per_cell; ++k)
@@ -1802,7 +1808,8 @@ namespace Step44
               Assert(k_group <= J_dof, ExcInternalError());
           }
       }
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const SymmetricTensor<2, dim> tau     = lqph[q_point]->get_tau();
         const double                  det_F   = lqph[q_point]->get_det_F();
@@ -1831,8 +1838,8 @@ namespace Step44
           cell->face(face)->boundary_id() == 6)
         {
           scratch.fe_face_values_ref.reinit(cell, face);
-          for (unsigned int f_q_point = 0; f_q_point < n_q_points_f;
-               ++f_q_point)
+          for (const unsigned int f_q_point :
+               scratch.fe_face_values_ref.quadrature_point_indices())
             {
               const Tensor<1, dim> &N =
                 scratch.fe_face_values_ref.normal_vector(f_q_point);

diff --git a/tests/physics/step-44-standard_tensors-spatial.cc b/tests/physics/step-44-standard_tensors-spatial.cc
index d5463d9a4e3ca8ff044080f0403603ebcf6f1376..ac83a20a5df296b1306c978aeb3c0df2035a6032 100644 (file)
--- a/tests/physics/step-44-standard_tensors-spatial.cc
+++ b/tests/physics/step-44-standard_tensors-spatial.cc
@@ -1226,7 +1226,8 @@ namespace Step44
       scratch.solution_total, scratch.solution_values_p_total);
     scratch.fe_values_ref[J_fe].get_function_values(
       scratch.solution_total, scratch.solution_values_J_total);
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       lqph[q_point]->update_values(scratch.solution_grads_u_total[q_point],
                                    scratch.solution_values_p_total[q_point],
                                    scratch.solution_values_J_total[q_point]);
@@ -1335,7 +1336,8 @@ namespace Step44
         const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
           quadrature_point_history.get_data(cell);
         Assert(lqph.size() == n_q_points, ExcInternalError());
-        for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+        for (const unsigned int q_point :
+             fe_values_ref.quadrature_point_indices())
           {
             const double det_F_qp = lqph[q_point]->get_det_F();
             const double JxW      = fe_values_ref.JxW(q_point);
@@ -1360,7 +1362,8 @@ namespace Step44
         const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
           quadrature_point_history.get_data(cell);
         Assert(lqph.size() == n_q_points, ExcInternalError());
-        for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+        for (const unsigned int q_point :
+             fe_values_ref.quadrature_point_indices())
           {
             const double det_F_qp   = lqph[q_point]->get_det_F();
             const double J_tilde_qp = lqph[q_point]->get_J_tilde();
@@ -1458,7 +1461,8 @@ namespace Step44
     const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
       quadrature_point_history.get_data(cell);
     Assert(lqph.size() == n_q_points, ExcInternalError());
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const Tensor<2, dim> F_inv = lqph[q_point]->get_F_inv();
         for (unsigned int k = 0; k < dofs_per_cell; ++k)
@@ -1481,7 +1485,8 @@ namespace Step44
               Assert(k_group <= J_dof, ExcInternalError());
           }
       }
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const Tensor<2, dim>          tau = lqph[q_point]->get_tau();
         const SymmetricTensor<4, dim> Jc  = lqph[q_point]->get_Jc();
@@ -1583,7 +1588,8 @@ namespace Step44
     const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
       quadrature_point_history.get_data(cell);
     Assert(lqph.size() == n_q_points, ExcInternalError());
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const Tensor<2, dim> F_inv = lqph[q_point]->get_F_inv();
         for (unsigned int k = 0; k < dofs_per_cell; ++k)
@@ -1602,7 +1608,8 @@ namespace Step44
               Assert(k_group <= J_dof, ExcInternalError());
           }
       }
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const SymmetricTensor<2, dim> tau     = lqph[q_point]->get_tau();
         const double                  det_F   = lqph[q_point]->get_det_F();
@@ -1631,8 +1638,8 @@ namespace Step44
           cell->face(face)->boundary_id() == 6)
         {
           scratch.fe_face_values_ref.reinit(cell, face);
-          for (unsigned int f_q_point = 0; f_q_point < n_q_points_f;
-               ++f_q_point)
+          for (const unsigned int f_q_point :
+               scratch.fe_face_values_ref.quadrature_point_indices())
             {
               const Tensor<1, dim> &N =
                 scratch.fe_face_values_ref.normal_vector(f_q_point);

diff --git a/tests/physics/step-44.cc b/tests/physics/step-44.cc
index 1f050ffc8f6bb3a0af654544c0cd51b7917c0f4b..0cbbecb2fb9a2500e901f3eb989c56141215220e 100644 (file)
--- a/tests/physics/step-44.cc
+++ b/tests/physics/step-44.cc
@@ -1239,7 +1239,8 @@ namespace Step44
       scratch.solution_total, scratch.solution_values_p_total);
     scratch.fe_values_ref[J_fe].get_function_values(
       scratch.solution_total, scratch.solution_values_J_total);
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       lqph[q_point]->update_values(scratch.solution_grads_u_total[q_point],
                                    scratch.solution_values_p_total[q_point],
                                    scratch.solution_values_J_total[q_point]);
@@ -1348,7 +1349,8 @@ namespace Step44
         const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
           quadrature_point_history.get_data(cell);
         Assert(lqph.size() == n_q_points, ExcInternalError());
-        for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+        for (const unsigned int q_point :
+             fe_values_ref.quadrature_point_indices())
           {
             const double det_F_qp = lqph[q_point]->get_det_F();
             const double JxW      = fe_values_ref.JxW(q_point);
@@ -1373,7 +1375,8 @@ namespace Step44
         const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
           quadrature_point_history.get_data(cell);
         Assert(lqph.size() == n_q_points, ExcInternalError());
-        for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+        for (const unsigned int q_point :
+             fe_values_ref.quadrature_point_indices())
           {
             const double det_F_qp   = lqph[q_point]->get_det_F();
             const double J_tilde_qp = lqph[q_point]->get_J_tilde();
@@ -1471,7 +1474,8 @@ namespace Step44
     const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
       quadrature_point_history.get_data(cell);
     Assert(lqph.size() == n_q_points, ExcInternalError());
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const Tensor<2, dim> F_inv = lqph[q_point]->get_F_inv();
         for (unsigned int k = 0; k < dofs_per_cell; ++k)
@@ -1494,7 +1498,8 @@ namespace Step44
               Assert(k_group <= J_dof, ExcInternalError());
           }
       }
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const Tensor<2, dim>          tau = lqph[q_point]->get_tau();
         const SymmetricTensor<4, dim> Jc  = lqph[q_point]->get_Jc();
@@ -1594,7 +1599,8 @@ namespace Step44
     const std::vector<std::shared_ptr<const PointHistory<dim>>> lqph =
       quadrature_point_history.get_data(cell);
     Assert(lqph.size() == n_q_points, ExcInternalError());
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const Tensor<2, dim> F_inv = lqph[q_point]->get_F_inv();
         for (unsigned int k = 0; k < dofs_per_cell; ++k)
@@ -1613,7 +1619,8 @@ namespace Step44
               Assert(k_group <= J_dof, ExcInternalError());
           }
       }
-    for (unsigned int q_point = 0; q_point < n_q_points; ++q_point)
+    for (const unsigned int q_point :
+         scratch.fe_values_ref.quadrature_point_indices())
       {
         const SymmetricTensor<2, dim> tau     = lqph[q_point]->get_tau();
         const double                  det_F   = lqph[q_point]->get_det_F();
@@ -1642,8 +1649,8 @@ namespace Step44
           cell->face(face)->boundary_id() == 6)
         {
           scratch.fe_face_values_ref.reinit(cell, face);
-          for (unsigned int f_q_point = 0; f_q_point < n_q_points_f;
-               ++f_q_point)
+          for (const unsigned int f_q_point :
+               scratch.fe_face_values_ref.quadrature_point_indices())
             {
               const Tensor<1, dim> &N =
                 scratch.fe_face_values_ref.normal_vector(f_q_point);