Merge pull request #68 from nmuch/update-QTrapezoid-name

Update name of QTrapez to QTrapezoid
kronbichler · Jun 30, 2022 · a80bb7d · a80bb7d
2 parents eb0333d + 9f95bc5
commit a80bb7d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/source/level_set_okz_advance_concentration.cc b/source/level_set_okz_advance_concentration.cc
@@ -42,7 +42,7 @@ namespace
     const Quadrature<dim> quadrature_formula =
       dof_handler.get_fe().reference_cell() == ReferenceCells::get_hypercube<dim>() ?
         Quadrature<dim>(
-          QIterated<dim>(QTrapez<1>(), dof_handler.get_fe().tensor_degree() + 1)) :
+          QIterated<dim>(QTrapezoid<1>(), dof_handler.get_fe().tensor_degree() + 1)) :
         quad_in;
 
     FEValues<dim> fe_values(dof_handler.get_fe(), quadrature_formula, update_values);

diff --git a/source/two_phase_base.cc b/source/two_phase_base.cc
@@ -480,7 +480,8 @@ template <int dim>
 double
 TwoPhaseBaseAlgorithm<dim>::get_maximal_velocity() const
 {
-  const QIterated<dim> quadrature_formula(QTrapez<1>(), parameters.velocity_degree + 1);
+  const QIterated<dim> quadrature_formula(QTrapezoid<1>(),
+                                          parameters.velocity_degree + 1);
   const unsigned int   n_q_points = quadrature_formula.size();
 
   FEValues<dim> fe_values(navier_stokes.get_fe_u(), quadrature_formula, update_values);
@@ -513,7 +514,7 @@ template <int dim>
 std::pair<double, double>
 TwoPhaseBaseAlgorithm<dim>::get_concentration_range() const
 {
-  const QIterated<dim> quadrature_formula(QTrapez<1>(), fe->degree + 2);
+  const QIterated<dim> quadrature_formula(QTrapezoid<1>(), fe->degree + 2);
   FEValues<dim>        fe_values(*fe, quadrature_formula, update_values);
   const unsigned int   n_q_points = quadrature_formula.size();
   std::vector<double>  concentration_values(n_q_points);
@@ -626,7 +627,7 @@ TwoPhaseBaseAlgorithm<2>::compute_bubble_statistics(
   const int            sub_per_d = sub_refinements == numbers::invalid_unsigned_int ?
                                      parameters.velocity_degree + 3 :
                                      sub_refinements;
-  const QIterated<dim> quadrature_formula(QTrapez<1>(), sub_per_d);
+  const QIterated<dim> quadrature_formula(QTrapezoid<1>(), sub_per_d);
   const QGauss<dim>    interior_quadrature(parameters.velocity_degree);
   const unsigned int   n_q_points = quadrature_formula.size();
   FEValues<dim>        fe_values(this->mapping,

diff --git a/tests/sim_spurious_currents.cc b/tests/sim_spurious_currents.cc
@@ -120,7 +120,8 @@ MicroFluidicProblem<dim>::evaluate_spurious_velocities(
   NavierStokes<dim> &navier_stokes_solver)
 {
   double               local_norm_velocity, norm_velocity;
-  const QIterated<dim> quadrature_formula(QTrapez<1>(), parameters.velocity_degree + 2);
+  const QIterated<dim> quadrature_formula(QTrapezoid<1>(),
+                                          parameters.velocity_degree + 2);
   const unsigned int   n_q_points = quadrature_formula.size();
 
   const MPI_Comm &            mpi_communicator = triangulation.get_communicator();

diff --git a/tests/spurious_currents.cc b/tests/spurious_currents.cc
@@ -122,7 +122,8 @@ void
 MicroFluidicProblem<dim>::evaluate_spurious_velocities()
 {
   double               local_norm_velocity, norm_velocity;
-  const QIterated<dim> quadrature_formula(QTrapez<1>(), parameters.velocity_degree + 2);
+  const QIterated<dim> quadrature_formula(QTrapezoid<1>(),
+                                          parameters.velocity_degree + 2);
   const unsigned int   n_q_points = quadrature_formula.size();
 
   const NavierStokes<dim> &navier_stokes    = solver->get_navier_stokes();