Fix MatrixCreator::create_mass/laplace_matrix for hp

diff --git a/include/deal.II/numerics/matrix_creator.templates.h b/include/deal.II/numerics/matrix_creator.templates.h
index 586ca63beb39d9f2b67cb54048476008596f8752..ff9f2fac5c33eaffff762d2f78cc10fd289a9aee 100644 (file)
--- a/include/deal.II/numerics/matrix_creator.templates.h
+++ b/include/deal.II/numerics/matrix_creator.templates.h
@@ -640,8 +640,8 @@ namespace MatrixCreator
     Assert(matrix.n() == dof.n_dofs(),
            ExcDimensionMismatch(matrix.n(), dof.n_dofs()));
 
-    hp::FECollection<dim, spacedim>      fe_collection(dof.get_fe());
-    hp::QCollection<dim>                 q_collection(q);
+    const auto &         fe_collection = dof.get_fe_collection();
+    hp::QCollection<dim> q_collection(q);
     hp::MappingCollection<dim, spacedim> mapping_collection(mapping);
     MatrixCreator::internal::AssemblerData::Scratch<dim, spacedim, number>
       assembler_data(fe_collection,
@@ -715,8 +715,8 @@ namespace MatrixCreator
     Assert(matrix.n() == dof.n_dofs(),
            ExcDimensionMismatch(matrix.n(), dof.n_dofs()));
 
-    hp::FECollection<dim, spacedim>      fe_collection(dof.get_fe());
-    hp::QCollection<dim>                 q_collection(q);
+    const auto &         fe_collection = dof.get_fe_collection();
+    hp::QCollection<dim> q_collection(q);
     hp::MappingCollection<dim, spacedim> mapping_collection(mapping);
     MatrixCreator::internal::AssemblerData::Scratch<dim, spacedim, number>
       assembler_data(fe_collection,
@@ -1871,8 +1871,8 @@ namespace MatrixCreator
     Assert(matrix.n() == dof.n_dofs(),
            ExcDimensionMismatch(matrix.n(), dof.n_dofs()));
 
-    hp::FECollection<dim, spacedim>      fe_collection(dof.get_fe());
-    hp::QCollection<dim>                 q_collection(q);
+    const auto &         fe_collection = dof.get_fe_collection();
+    hp::QCollection<dim> q_collection(q);
     hp::MappingCollection<dim, spacedim> mapping_collection(mapping);
     MatrixCreator::internal::AssemblerData::Scratch<dim, spacedim, double>
       assembler_data(fe_collection,
@@ -1944,8 +1944,8 @@ namespace MatrixCreator
     Assert(matrix.n() == dof.n_dofs(),
            ExcDimensionMismatch(matrix.n(), dof.n_dofs()));
 
-    hp::FECollection<dim, spacedim>      fe_collection(dof.get_fe());
-    hp::QCollection<dim>                 q_collection(q);
+    const auto &         fe_collection = dof.get_fe_collection();
+    hp::QCollection<dim> q_collection(q);
     hp::MappingCollection<dim, spacedim> mapping_collection(mapping);
     MatrixCreator::internal::AssemblerData::Scratch<dim, spacedim, double>
       assembler_data(fe_collection,