]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove deprecated MatrixFree functionalities 14037/head
authorDaniel Arndt <arndtd@ornl.gov>
Wed, 22 Jun 2022 21:33:27 +0000 (17:33 -0400)
committerDaniel Arndt <arndtd@ornl.gov>
Fri, 24 Jun 2022 19:03:28 +0000 (15:03 -0400)
114 files changed:
doc/news/changes/incompatibilities/20220622Arndt-2 [new file with mode: 0644]
include/deal.II/matrix_free/matrix_free.h
include/deal.II/matrix_free/matrix_free.templates.h
tests/arpack/step-36_parpack_mf.cc
tests/arpack/step-36_parpack_mf_02.cc
tests/arpack/step-36_parpack_mf_03.cc
tests/lac/utilities_02.cc
tests/mappings/mapping_q_eulerian_08.cc
tests/mappings/mapping_q_eulerian_14.cc
tests/matrix_free/advect_1d.cc
tests/matrix_free/advect_1d_system.cc
tests/matrix_free/advect_1d_vectorization_mask.cc
tests/matrix_free/categorize_by_boundary_ids_01.cc
tests/matrix_free/cell_categorization.cc
tests/matrix_free/cell_categorization_02.cc
tests/matrix_free/cell_level_and_index.cc
tests/matrix_free/compress_constraints.cc
tests/matrix_free/compress_mapping.cc
tests/matrix_free/copy.cc
tests/matrix_free/dg_pbc_01.cc
tests/matrix_free/dg_pbc_02.cc
tests/matrix_free/dof_info_01.cc
tests/matrix_free/dof_info_02.cc
tests/matrix_free/estimate_condition_number_mass.cc
tests/matrix_free/face_setup_01.cc
tests/matrix_free/faces_value_optimization.cc
tests/matrix_free/faces_value_optimization_02.cc
tests/matrix_free/faces_value_optimization_03.cc
tests/matrix_free/fe_evaluation_dofs_per_cell.cc
tests/matrix_free/get_functions_common.h
tests/matrix_free/get_functions_faces.cc
tests/matrix_free/get_functions_multife.cc
tests/matrix_free/get_functions_multife2.cc
tests/matrix_free/get_functions_variants.cc
tests/matrix_free/get_functions_variants_gl.cc
tests/matrix_free/get_values_plain.cc
tests/matrix_free/integrate_functions.cc
tests/matrix_free/integrate_functions_hessians.cc
tests/matrix_free/integrate_functions_multife.cc
tests/matrix_free/integrate_functions_multife2.cc
tests/matrix_free/interpolate_functions_common.h
tests/matrix_free/inverse_mass_02.cc
tests/matrix_free/inverse_mass_04.cc
tests/matrix_free/inverse_mass_07.cc
tests/matrix_free/inverse_mass_09.cc
tests/matrix_free/jxw_values.cc
tests/matrix_free/laplace_operator_01.cc
tests/matrix_free/laplace_operator_02.cc
tests/matrix_free/laplace_operator_03.cc
tests/matrix_free/loop_boundary.cc
tests/matrix_free/loop_boundary_02.cc
tests/matrix_free/mass_operator_01.cc
tests/matrix_free/mass_operator_02.cc
tests/matrix_free/mass_operator_03.cc
tests/matrix_free/mass_operator_04.cc
tests/matrix_free/matrix_vector_10.cc
tests/matrix_free/matrix_vector_11.cc
tests/matrix_free/matrix_vector_12.cc
tests/matrix_free/matrix_vector_13.cc
tests/matrix_free/matrix_vector_18.cc
tests/matrix_free/matrix_vector_19.cc
tests/matrix_free/matrix_vector_20.cc
tests/matrix_free/matrix_vector_21.cc
tests/matrix_free/matrix_vector_22.cc
tests/matrix_free/matrix_vector_23.cc
tests/matrix_free/matrix_vector_24.cc
tests/matrix_free/matrix_vector_blocks.cc
tests/matrix_free/matrix_vector_curl.cc
tests/matrix_free/matrix_vector_div.cc
tests/matrix_free/matrix_vector_faces_16.cc
tests/matrix_free/matrix_vector_faces_20.cc
tests/matrix_free/matrix_vector_faces_21.cc
tests/matrix_free/matrix_vector_faces_22.cc
tests/matrix_free/matrix_vector_faces_23.cc
tests/matrix_free/matrix_vector_faces_30.cc
tests/matrix_free/matrix_vector_faces_31.cc
tests/matrix_free/matrix_vector_faces_32.cc
tests/matrix_free/matrix_vector_hp.cc
tests/matrix_free/matrix_vector_hp_no_template.cc
tests/matrix_free/matrix_vector_hp_parallel_01.cc
tests/matrix_free/matrix_vector_large_degree_01.cc
tests/matrix_free/matrix_vector_large_degree_02.cc
tests/matrix_free/matrix_vector_large_degree_03.cc
tests/matrix_free/matrix_vector_stokes.cc
tests/matrix_free/matrix_vector_stokes_base.cc
tests/matrix_free/matrix_vector_stokes_flux.cc
tests/matrix_free/matrix_vector_stokes_qdg0.cc
tests/matrix_free/matrix_vector_stokes_qdg0b.cc
tests/matrix_free/no_index_initialize.cc
tests/matrix_free/pbc_orientation_01.cc
tests/matrix_free/pbc_orientation_02.cc
tests/matrix_free/pre_and_post_loops_01.cc
tests/matrix_free/pre_and_post_loops_02.cc
tests/matrix_free/pre_and_post_loops_03.cc
tests/matrix_free/pre_and_post_loops_04.cc
tests/matrix_free/pre_and_post_loops_06.cc
tests/matrix_free/step-37-inhomogeneous-1.cc
tests/matrix_free/step-37.cc
tests/matrix_free/step-48.cc
tests/matrix_free/step-48b.cc
tests/matrix_free/step-48c.cc
tests/matrix_free/stokes_computation.cc
tests/matrix_free/thread_correctness.cc
tests/matrix_free/thread_correctness_dg.cc
tests/matrix_free/thread_correctness_hp.cc
tests/mpi/parallel_block_vector_05.cc
tests/mpi/parallel_block_vector_06.cc
tests/mpi/parallel_block_vector_07.cc
tests/mpi/parallel_block_vector_08.cc
tests/mpi/parallel_block_vector_09.cc
tests/mpi/parallel_block_vector_10.cc
tests/mpi/parallel_block_vector_11.cc
tests/mpi/parallel_block_vector_12.cc
tests/mpi/step-37.cc

diff --git a/doc/news/changes/incompatibilities/20220622Arndt-2 b/doc/news/changes/incompatibilities/20220622Arndt-2
new file mode 100644 (file)
index 0000000..5f19323
--- /dev/null
@@ -0,0 +1,6 @@
+Removed: The deprecated functions MatrixFree::n_macro_cells(),
+MatrixFree::get_hp_cell_iterator(), MatrixFree::n_components_filled(),
+MatrixFree::get_dof_handler(), and
+MatrixFree::reinit() with default Mapping argument have been removed.
+<br>
+(Daniel Arndt, 2022/06/22)
index 40f8214c9c7b07ff9810d15cc53c17432bf51738..d8e519ab6d3d3e11788cbc6e97fe91c8ba891fcc 100644 (file)
@@ -585,19 +585,6 @@ public:
          const QuadratureType &            quad,
          const AdditionalData &            additional_data = AdditionalData());
 
-  /**
-   * Initializes the data structures. Same as above, but using a $Q_1$
-   * mapping.
-   *
-   * @deprecated Use the overload taking a Mapping object instead.
-   */
-  template <typename QuadratureType, typename number2>
-  DEAL_II_DEPRECATED void
-  reinit(const DoFHandler<dim> &           dof_handler,
-         const AffineConstraints<number2> &constraint,
-         const QuadratureType &            quad,
-         const AdditionalData &            additional_data = AdditionalData());
-
   /**
    * Extracts the information needed to perform loops over cells. The
    * DoFHandler and AffineConstraints objects describe the layout of degrees of
@@ -627,19 +614,6 @@ public:
          const std::vector<QuadratureType> &                    quad,
          const AdditionalData &additional_data = AdditionalData());
 
-  /**
-   * Initializes the data structures. Same as above, but  using a $Q_1$
-   * mapping.
-   *
-   * @deprecated Use the overload taking a Mapping object instead.
-   */
-  template <typename QuadratureType, typename number2>
-  DEAL_II_DEPRECATED void
-  reinit(const std::vector<const DoFHandler<dim> *> &           dof_handler,
-         const std::vector<const AffineConstraints<number2> *> &constraint,
-         const std::vector<QuadratureType> &                    quad,
-         const AdditionalData &additional_data = AdditionalData());
-
   /**
    * Initializes the data structures. Same as before, but now the index set
    * description of the locally owned range of degrees of freedom is taken
@@ -655,19 +629,6 @@ public:
          const QuadratureType &                                 quad,
          const AdditionalData &additional_data = AdditionalData());
 
-  /**
-   * Initializes the data structures. Same as above, but  using a $Q_1$
-   * mapping.
-   *
-   * @deprecated Use the overload taking a Mapping object instead.
-   */
-  template <typename QuadratureType, typename number2>
-  DEAL_II_DEPRECATED void
-  reinit(const std::vector<const DoFHandler<dim> *> &           dof_handler,
-         const std::vector<const AffineConstraints<number2> *> &constraint,
-         const QuadratureType &                                 quad,
-         const AdditionalData &additional_data = AdditionalData());
-
   /**
    * Copy function. Creates a deep copy of all data structures. It is usually
    * enough to keep the data for different operations once, so this function
@@ -1592,12 +1553,6 @@ public:
   unsigned int
   n_physical_cells() const;
 
-  /**
-   * @deprecated Use n_cell_batches() instead.
-   */
-  DEAL_II_DEPRECATED unsigned int
-  n_macro_cells() const;
-
   /**
    * Return the number of cell batches that this structure works on. The
    * batches are formed by application of vectorization over several cells in
@@ -1719,16 +1674,6 @@ public:
                     const bool         interior     = true,
                     const unsigned int fe_component = 0) const;
 
-  /**
-   * @copydoc MatrixFree::get_cell_iterator()
-   *
-   * @deprecated Use get_cell_iterator() instead.
-   */
-  DEAL_II_DEPRECATED typename DoFHandler<dim>::active_cell_iterator
-  get_hp_cell_iterator(const unsigned int cell_batch_index,
-                       const unsigned int lane_index,
-                       const unsigned int dof_handler_index = 0) const;
-
   /**
    * Since this class uses vectorized data types with usually more than one
    * value in the data field, a situation might occur when some components of
@@ -1744,12 +1689,6 @@ public:
   bool
   at_irregular_cell(const unsigned int cell_batch_index) const;
 
-  /**
-   * @deprecated Use n_active_entries_per_cell_batch() instead.
-   */
-  DEAL_II_DEPRECATED unsigned int
-  n_components_filled(const unsigned int cell_batch_number) const;
-
   /**
    * This query returns how many cells among the `VectorizedArrayType::size()`
    * many cells within a cell batch to actual cells in the mesh, rather than
@@ -2277,15 +2216,6 @@ MatrixFree<dim, Number, VectorizedArrayType>::get_task_info() const
 
 
 
-template <int dim, typename Number, typename VectorizedArrayType>
-inline unsigned int
-MatrixFree<dim, Number, VectorizedArrayType>::n_macro_cells() const
-{
-  return *(task_info.cell_partition_data.end() - 2);
-}
-
-
-
 template <int dim, typename Number, typename VectorizedArrayType>
 inline unsigned int
 MatrixFree<dim, Number, VectorizedArrayType>::n_physical_cells() const
@@ -2556,16 +2486,6 @@ MatrixFree<dim, Number, VectorizedArrayType>::get_face_active_fe_index(
 
 
 
-template <int dim, typename Number, typename VectorizedArrayType>
-inline unsigned int
-MatrixFree<dim, Number, VectorizedArrayType>::n_components_filled(
-  const unsigned int cell_batch_index) const
-{
-  return n_active_entries_per_cell_batch(cell_batch_index);
-}
-
-
-
 template <int dim, typename Number, typename VectorizedArrayType>
 inline unsigned int
 MatrixFree<dim, Number, VectorizedArrayType>::n_active_entries_per_cell_batch(
@@ -2960,42 +2880,6 @@ namespace internal
 
 
 
-template <int dim, typename Number, typename VectorizedArrayType>
-template <typename QuadratureType, typename number2>
-void
-MatrixFree<dim, Number, VectorizedArrayType>::reinit(
-  const DoFHandler<dim> &           dof_handler,
-  const AffineConstraints<number2> &constraints_in,
-  const QuadratureType &            quad,
-  const typename MatrixFree<dim, Number, VectorizedArrayType>::AdditionalData
-    &additional_data)
-{
-  std::vector<const DoFHandler<dim, dim> *>       dof_handlers;
-  std::vector<const AffineConstraints<number2> *> constraints;
-  std::vector<QuadratureType>                     quads;
-
-  dof_handlers.push_back(&dof_handler);
-  constraints.push_back(&constraints_in);
-  quads.push_back(quad);
-
-  std::vector<IndexSet> locally_owned_sets =
-    internal::MatrixFreeImplementation::extract_locally_owned_index_sets(
-      dof_handlers, additional_data.mg_level);
-
-  std::vector<hp::QCollection<dim>> quad_hp;
-  quad_hp.emplace_back(quad);
-
-  internal_reinit(std::make_shared<hp::MappingCollection<dim>>(
-                    StaticMappingQ1<dim>::mapping),
-                  dof_handlers,
-                  constraints,
-                  locally_owned_sets,
-                  quad_hp,
-                  additional_data);
-}
-
-
-
 template <int dim, typename Number, typename VectorizedArrayType>
 template <typename QuadratureType, typename number2, typename MappingType>
 void
@@ -3030,61 +2914,6 @@ MatrixFree<dim, Number, VectorizedArrayType>::reinit(
 
 
 
-template <int dim, typename Number, typename VectorizedArrayType>
-template <typename QuadratureType, typename number2>
-void
-MatrixFree<dim, Number, VectorizedArrayType>::reinit(
-  const std::vector<const DoFHandler<dim> *> &           dof_handler,
-  const std::vector<const AffineConstraints<number2> *> &constraint,
-  const std::vector<QuadratureType> &                    quad,
-  const typename MatrixFree<dim, Number, VectorizedArrayType>::AdditionalData
-    &additional_data)
-{
-  std::vector<IndexSet> locally_owned_set =
-    internal::MatrixFreeImplementation::extract_locally_owned_index_sets(
-      dof_handler, additional_data.mg_level);
-  std::vector<hp::QCollection<dim>> quad_hp;
-  for (unsigned int q = 0; q < quad.size(); ++q)
-    quad_hp.emplace_back(quad[q]);
-
-  internal_reinit(std::make_shared<hp::MappingCollection<dim>>(
-                    StaticMappingQ1<dim>::mapping),
-                  dof_handler,
-                  constraint,
-                  locally_owned_set,
-                  quad_hp,
-                  additional_data);
-}
-
-
-
-template <int dim, typename Number, typename VectorizedArrayType>
-template <typename QuadratureType, typename number2>
-void
-MatrixFree<dim, Number, VectorizedArrayType>::reinit(
-  const std::vector<const DoFHandler<dim> *> &           dof_handler,
-  const std::vector<const AffineConstraints<number2> *> &constraint,
-  const QuadratureType &                                 quad,
-  const typename MatrixFree<dim, Number, VectorizedArrayType>::AdditionalData
-    &additional_data)
-{
-  std::vector<IndexSet> locally_owned_set =
-    internal::MatrixFreeImplementation::extract_locally_owned_index_sets(
-      dof_handler, additional_data.mg_level);
-  std::vector<hp::QCollection<dim>> quad_hp;
-  quad_hp.emplace_back(quad);
-
-  internal_reinit(std::make_shared<hp::MappingCollection<dim>>(
-                    StaticMappingQ1<dim>::mapping),
-                  dof_handler,
-                  constraint,
-                  locally_owned_set,
-                  quad_hp,
-                  additional_data);
-}
-
-
-
 template <int dim, typename Number, typename VectorizedArrayType>
 template <typename QuadratureType, typename number2, typename MappingType>
 void
index e4553a40781dddda3173c98b6b68dfee101969f9..8ff2e3566c9267d8eea09fd8bd651847eb94e604 100644 (file)
@@ -307,30 +307,6 @@ MatrixFree<dim, Number, VectorizedArrayType>::get_face_iterator(
 
 
 
-template <int dim, typename Number, typename VectorizedArrayType>
-typename DoFHandler<dim>::active_cell_iterator
-MatrixFree<dim, Number, VectorizedArrayType>::get_hp_cell_iterator(
-  const unsigned int cell_batch_index,
-  const unsigned int lane_index,
-  const unsigned int dof_handler_index) const
-{
-  AssertIndexRange(dof_handler_index, dof_handlers.size());
-  AssertIndexRange(cell_batch_index, task_info.cell_partition_data.back());
-  AssertIndexRange(lane_index,
-                   n_active_entries_per_cell_batch(cell_batch_index));
-
-  std::pair<unsigned int, unsigned int> index =
-    cell_level_index[cell_batch_index * VectorizedArrayType::size() +
-                     lane_index];
-  return typename DoFHandler<dim>::cell_iterator(
-    &dof_handlers[dof_handler_index]->get_triangulation(),
-    index.first,
-    index.second,
-    &*dof_handlers[dof_handler_index]);
-}
-
-
-
 template <int dim, typename Number, typename VectorizedArrayType>
 void
 MatrixFree<dim, Number, VectorizedArrayType>::copy_from(
index 3e608b0a24886c1af61373fce816a055110034c8..468cb41f9f27a004d6269a3c98e98784014349f4 100644 (file)
@@ -103,7 +103,7 @@ test()
       MatrixFree<dim, double>::AdditionalData::partition_color;
     data.mapping_update_flags =
       update_values | update_gradients | update_JxW_values;
-    mf_data->reinit(dof_handler, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof_handler, constraints, quad, data);
   }
 
 
index 7d62acd873532e38b5054eeffc4660a829e2396a..8a62b1841b6d8a802f7255f31e6544fbe4c7ba03 100644 (file)
@@ -103,7 +103,7 @@ test()
       MatrixFree<dim, double>::AdditionalData::partition_color;
     data.mapping_update_flags =
       update_values | update_gradients | update_JxW_values;
-    mf_data->reinit(dof_handler, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof_handler, constraints, quad, data);
   }
 
   std::vector<LinearAlgebra::distributed::Vector<double>> eigenfunctions;
index 4b99c29950a18cbf5fc372b0cfb930eaa114bfde..805fe800dc18dc55072ba41123a34499f2516efa 100644 (file)
@@ -104,7 +104,7 @@ test()
       MatrixFree<dim, double>::AdditionalData::partition_color;
     data.mapping_update_flags =
       update_values | update_gradients | update_JxW_values;
-    mf_data->reinit(dof_handler, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof_handler, constraints, quad, data);
   }
 
   std::vector<LinearAlgebra::distributed::Vector<double>> eigenfunctions;
index ca213e18016b51ea78d6fb32f35885b98dda7346..81d6671d9f36a20c76fc8f02866b6d1284acfc4c 100644 (file)
@@ -114,7 +114,7 @@ test()
       MatrixFree<dim, double>::AdditionalData::partition_color;
     data.mapping_update_flags =
       update_values | update_gradients | update_JxW_values;
-    mf_data->reinit(dof_handler, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof_handler, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index dba5899345fa1be678d25a7d7b51c3537d3a92f6..681aac08694d367f31efe7e5ca4050b5dad2356d 100644 (file)
@@ -243,7 +243,8 @@ test(const unsigned int n_ref = 0)
       euler_fine, dof_handler, constraints, quadrature_formula, data);
 
     MatrixFree<dim, NumberType> matrix_free;
-    matrix_free.reinit(dof_handler, constraints, quadrature_formula, data);
+    matrix_free.reinit(
+      MappingQ1<dim>{}, dof_handler, constraints, quadrature_formula, data);
 
 
     // test fine-level mapping:
index fd1a7f34fc0ba7be24f65436c63afc54fc53bc10..ae32890603229268a702d4030aeaecbc27ce042e 100644 (file)
@@ -283,7 +283,8 @@ test(const unsigned int n_ref = 0)
       euler_fine, dof_handler, constraints, quadrature_formula, data);
 
     MatrixFree<dim, NumberType> matrix_free;
-    matrix_free.reinit(dof_handler, constraints, quadrature_formula, data);
+    matrix_free.reinit(
+      MappingQ1<dim>{}, dof_handler, constraints, quadrature_formula, data);
 
 
     // test fine-level mapping:
index 253b96aedc4ca72c09e6a6bd88f4ad1f6feb2681..063de99da3f49764e3efd02fe878171e4a02812a 100644 (file)
@@ -286,7 +286,7 @@ test(const unsigned int n_refine)
     (update_gradients | update_JxW_values);
 
   MatrixFree<dim, double> mf_data;
-  mf_data.reinit(dof, constraints, quad, data);
+  mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
   mf_data.initialize_dof_vector(in);
   mf_data.initialize_dof_vector(out);
index d0340ffb9e3d543eec9133c7874bc31f48de82ae..e1d0ddd8ec2cb318781b22f779a2a4529e85833c 100644 (file)
@@ -294,7 +294,7 @@ test(const unsigned int n_refine)
     (update_gradients | update_JxW_values);
 
   MatrixFree<dim, double> mf_data;
-  mf_data.reinit(dof, constraints, quad, data);
+  mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
   mf_data.initialize_dof_vector(in);
   mf_data.initialize_dof_vector(out);
index cc216654cc4eb9c6795e6bfd7fad77b34446ebc0..db7ea98e0b7c9b5b114af4eb5acbdbe9f2eb25b4 100644 (file)
@@ -312,7 +312,7 @@ test(const unsigned int n_refine)
     (update_gradients | update_JxW_values);
 
   MatrixFree<dim, double> mf_data;
-  mf_data.reinit(dof, constraints, quad, data);
+  mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
   mf_data.initialize_dof_vector(in);
   mf_data.initialize_dof_vector(out);
index cc423e2022a7239550d7f2fae9b5815a1a004011..28ca046bc44dfd633e21724a5b25f19ee01a0da8 100644 (file)
@@ -67,7 +67,8 @@ test(const unsigned int n_refinements)
     bool result = true;
 
     MatrixFree<dim, double> data;
-    data.reinit(dof_handler, dummy, quadrature, additional_data);
+    data.reinit(
+      MappingQ1<dim>{}, dof_handler, dummy, quadrature, additional_data);
 
     using VectorType = Vector<double>;
 
index 69ef8734912df9ef26606e7edd022389eb3c0377..9bc5b193594ed2b4f130c69fc89576e3b1450352 100644 (file)
@@ -87,7 +87,7 @@ test()
       static_cast<unsigned int>(cell->center()[1] * 10.);
 
   data.cell_vectorization_categories_strict = false;
-  mf_data.reinit(dof, constraints, QGauss<1>(2), data);
+  mf_data.reinit(MappingQ1<dim>{}, dof, constraints, QGauss<1>(2), data);
 
   deallog << "Number of cell batches: " << mf_data.n_cell_batches()
           << std::endl;
@@ -99,7 +99,7 @@ test()
   deallog << std::endl;
 
   data.cell_vectorization_categories_strict = true;
-  mf_data.reinit(dof, constraints, QGauss<1>(2), data);
+  mf_data.reinit(MappingQ1<dim>{}, dof, constraints, QGauss<1>(2), data);
   deallog << "Number of cell batches: " << mf_data.n_cell_batches()
           << std::endl;
   for (unsigned int i = 0; i < mf_data.n_cell_batches(); ++i)
@@ -116,7 +116,7 @@ test()
             100000000);
 
   data.cell_vectorization_categories_strict = false;
-  mf_data.reinit(dof, constraints, QGauss<1>(2), data);
+  mf_data.reinit(MappingQ1<dim>{}, dof, constraints, QGauss<1>(2), data);
   deallog << "Number of cell batches: " << mf_data.n_cell_batches()
           << std::endl;
   for (unsigned int i = 0; i < mf_data.n_cell_batches(); ++i)
index 70780239745340de30fb7048b4f7473c9aa4e63d..e028aaec03bfdd23984af0da7c3be8af0832b5be 100644 (file)
@@ -112,7 +112,7 @@ test()
         cell->material_id();
     }
 
-  mf_data.reinit(dof, constraints, QGauss<1>(2), data);
+  mf_data.reinit(MappingQ1<dim>{}, dof, constraints, QGauss<1>(2), data);
 
   const unsigned int max_level = tria.n_global_levels() - 1;
   std::vector<typename MatrixFree<dim, float>::AdditionalData>
@@ -154,7 +154,8 @@ test()
 
       mg_mf_data[level] = std::make_shared<MatrixFree<dim, float>>();
 
-      mg_mf_data[level]->reinit(dof,
+      mg_mf_data[level]->reinit(MappingQ1<dim>{},
+                                dof,
                                 level_constraints,
                                 QGauss<1>(2),
                                 mg_additional_data[level]);
index f49a110395afd4eed31ced8e46d0a96cf3b06185..6da5628102e6e85f6c684e60946b0f7a0a298d59 100644 (file)
@@ -108,7 +108,7 @@ test(const bool adaptive_ref = true)
 
   {
     std::cout << "Compare active indices." << std::endl;
-    mf_data->reinit(dof, constraints, quad, additional_data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, additional_data);
     compare_indices(mf_data.get());
   }
 
@@ -116,7 +116,7 @@ test(const bool adaptive_ref = true)
     std::cout << "Compare level indices." << std::endl;
     const unsigned int level = tria.n_global_levels() - 1;
     additional_data.mg_level = level;
-    mf_data->reinit(dof, constraints, quad, additional_data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, additional_data);
     compare_indices(mf_data.get());
   }
 }
index 9a562460459a0ef565c679e28b9084fa6b953417..7a82b46d8844f596f74559030bda5b35be769977 100644 (file)
@@ -83,7 +83,7 @@ test()
 
   const QGauss<1> quad(2);
   MatrixFree<dim> mf;
-  mf.reinit(dof, constraints, quad);
+  mf.reinit(MappingQ1<dim>{}, dof, constraints, quad);
 
   deallog << "Number of hanging nodes: " << constraints.n_constraints()
           << std::endl;
index f41700ddc5156e55d7f96f0fe7fcc3fdba54c051..8579d2c5e5d2d8dfeba3a18b1003a28247b45aa2 100644 (file)
@@ -81,7 +81,7 @@ test()
   MatrixFree<dim>                          mf;
   typename MatrixFree<dim>::AdditionalData data;
   data.tasks_parallel_scheme = MatrixFree<dim>::AdditionalData::none;
-  mf.reinit(dof, constraints, quad, data);
+  mf.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
   const unsigned int        n_cell_batches = mf.n_cell_batches();
   std::vector<unsigned int> n_cell_types(4, 0);
@@ -118,7 +118,7 @@ test_cube()
   MatrixFree<dim>                          mf;
   typename MatrixFree<dim>::AdditionalData data;
   data.tasks_parallel_scheme = MatrixFree<dim>::AdditionalData::none;
-  mf.reinit(dof, constraints, quad, data);
+  mf.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
   const unsigned int        n_cell_batches = mf.n_cell_batches();
   std::vector<unsigned int> n_cell_types(4, 0);
@@ -161,7 +161,7 @@ test_parallelogram()
   MatrixFree<dim>                          mf;
   typename MatrixFree<dim>::AdditionalData data;
   data.tasks_parallel_scheme = MatrixFree<dim>::AdditionalData::none;
-  mf.reinit(dof, constraints, quad, data);
+  mf.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
   const unsigned int        n_cell_batches = mf.n_cell_batches();
   std::vector<unsigned int> n_cell_types(4, 0);
@@ -236,7 +236,7 @@ test_deformed_cube()
   data.mapping_update_flags_boundary_faces =
     update_gradients | update_normal_vectors;
 
-  mf.reinit(dof, constraints, quad, data);
+  mf.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   const unsigned int n_cell_batches = mf.n_cell_batches();
   Assert(n_cell_batches > 1, ExcInternalError());
 
index 786221e9f13b5e2e5db8dea4b06fdb5842ed92e6..5d2f804a118a606d21199b0f46be7df37fb307e8 100644 (file)
@@ -83,7 +83,8 @@ sub_test()
       MatrixFree<dim, number> mf_data;
       {
         const QGauss<1> quad(fe_degree + 1);
-        mf_data.reinit(dof,
+        mf_data.reinit(MappingQ1<dim>{},
+                       dof,
                        constraints,
                        quad,
                        typename MatrixFree<dim, number>::AdditionalData(
index cf5fb323c5f555dc6baf51b187b8ad900c8fe505..8d510cd0ce3a70494617693cd7319dff7557e196 100644 (file)
@@ -81,7 +81,7 @@ test()
     (update_gradients | update_JxW_values);
 
   MatrixFree<dim> mf_data;
-  mf_data.reinit(dof, constraints, quad, data);
+  mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
   LinearAlgebra::distributed::Vector<double> rhs, sol;
   mf_data.initialize_dof_vector(rhs);
index 4e4668e84ed7c2ef0a594012541b2e676627b91c..bbae6eefc3e0039ef6e2def8c4edf38ec90e9fa7 100644 (file)
@@ -96,7 +96,7 @@ test()
     {
       MatrixFree<dim> mf_data;
       data.mg_level = level;
-      mf_data.reinit(dof, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
       std::vector<unsigned int> n_inner_faces(2 * dim),
         n_inner_other_faces(2 * dim), n_boundary_faces(2 * dim);
       for (unsigned int f = 0; f < mf_data.n_inner_face_batches(); ++f)
index 7d028ae68bb8d5f83543d717a864c7410a4ce9e5..bc00d956c31ed7d0bfc4ce11def80b7aaebd9947 100644 (file)
@@ -94,7 +94,7 @@ test(const bool adaptive_ref = true)
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   const unsigned int     n_cells         = mf_data->n_cell_batches();
index a6e4e13b12f4c0051abec4af4e4ad269d1236358..a35550f8636e0883f43e846ee0ad03d11e245510 100644 (file)
@@ -96,7 +96,7 @@ test(const bool adaptive_ref = true)
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   const unsigned int     n_cells         = mf_data->n_cell_batches();
index 31129ae5968f4795932f515feb4c8e22f11b9689..c7cb869c3e2d7950fab887e308a2898e98f087ce 100644 (file)
@@ -120,7 +120,7 @@ test(const FiniteElement<dim> &fe, const unsigned int n_iterations)
     const QGauss<1>                                  quad(fe_degree + 1);
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_block_size = 8 / VectorizedArray<number>::size();
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number> mf(mf_data);
index fbd8883b258c392e0c6c61b74cd6da156c86e18f..e677ea65cb1fc25ceadc99c83b31484ad561c28f 100644 (file)
@@ -69,7 +69,8 @@ main(int argc, char **argv)
   DoFTools::make_hanging_node_constraints(dof_handler, constraint);
   constraint.close();
 
-  matrix_free.reinit(dof_handler, constraint, QGauss<1>(4), data);
+  matrix_free.reinit(
+    MappingQ1<dim>{}, dof_handler, constraint, QGauss<1>(4), data);
 
   LinearAlgebra::distributed::Vector<double> src;
   matrix_free.initialize_dof_vector(src);
index 3e61358ff2ec07bf099c6833e6304bbe2fd3bba9..5250a7f13aab729ce31e7f640d78e4bdcb070f54 100644 (file)
@@ -221,7 +221,7 @@ test()
     data.mapping_update_flags_boundary_faces =
       (update_gradients | update_JxW_values);
 
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number> mf(mf_data);
index d5c4ed36a41b39e5f9d51e305deb41d8f6d4904a..421e9a9703d6d562bb6b4bd063af78e6d71febac 100644 (file)
@@ -221,7 +221,7 @@ test()
     data.mapping_update_flags_boundary_faces =
       (update_gradients | update_JxW_values);
 
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number> mf(mf_data);
index 7630a6adcc5f2214eed79a244474cf39791c5c55..08ef9dd319256d3dd778eaa8c9fbf9a9f46047a9 100644 (file)
@@ -225,7 +225,7 @@ test()
     data.mapping_update_flags_boundary_faces =
       (update_gradients | update_JxW_values);
 
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number> mf(mf_data);
index d875d17f6a377145df348e9a85c220d1e11b0825..5c285d99374e12445a3f56a656368b787f29331f 100644 (file)
@@ -78,7 +78,8 @@ test()
       deallog << "Checking " << fes[i]->get_name() << std::endl;
       dof.distribute_dofs(*fes[i]);
       MatrixFree<dim> matrix_free;
-      matrix_free.reinit(dof,
+      matrix_free.reinit(MappingQ1<dim>{},
+                         dof,
                          AffineConstraints<double>(),
                          QGauss<1>(degree + 3),
                          typename MatrixFree<dim>::AdditionalData());
index 6e4927fe3394f099d783ae70abff74efc79a9099..9b64dd67a98fcff70ba6a8765b77792698f0749b 100644 (file)
@@ -265,7 +265,7 @@ do_test(const DoFHandler<dim> &          dof,
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.mapping_update_flags  = update_gradients | update_hessians;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, fe_degree + 1, number> mf(mf_data);
index fbd802ef777ef695797d4d969c4d0311b06aafce..889003bce25ba51162da5aa9663fcd4c8962fcac 100644 (file)
@@ -143,7 +143,7 @@ test()
     data.mapping_update_flags_boundary_faces =
       (update_gradients | update_JxW_values);
 
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
   MatrixFreeTest<dim, fe_degree, double> mf(mf_data);
   Vector<double>                         in(dof.n_dofs());
index e299a94e792d17de0481d6188022f090e268292c..fdd2224625c6891186ce2cfc97d4b51b45de8946 100644 (file)
@@ -276,7 +276,8 @@ test()
     std::vector<Quadrature<1>> quad;
     for (unsigned int no = 0; no < 2; ++no)
       quad.push_back(QGauss<1>(fe_degree + 1 + no));
-    mf_data.reinit(dof,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dof,
                    constraints,
                    quad,
                    typename MatrixFree<dim, number>::AdditionalData(
index c0405b448ed5d00978e878066e7241f0660e258b..6931c1ac50ae52438b0c10b2e1b11a1e8c4c5ccd 100644 (file)
@@ -328,7 +328,8 @@ test()
     std::vector<Quadrature<1>> quad;
     quad.push_back(QGauss<1>(1));
     quad.push_back(QGauss<1>(fe_degree + 1));
-    mf_data.reinit(dof,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dof,
                    constraints,
                    quad,
                    typename MatrixFree<dim, number>::AdditionalData(
index 77ae5f593a917457681179cb7ff14747fcbf3e43..67f2abb0f1740a7741cd2f175fea7fda9f3ec10c 100644 (file)
@@ -184,7 +184,7 @@ test()
     typename MatrixFree<dim>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim>::AdditionalData::none;
     data.mapping_update_flags  = update_gradients | update_hessians;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, double> mf(mf_data);
index 7bb8f888d9ea9433fcdb65cade2bfe8bc1dcfad4..00751fc8403164b42fc288ef957ba1c0a5463036 100644 (file)
@@ -180,7 +180,7 @@ test()
     typename MatrixFree<dim>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim>::AdditionalData::none;
     data.mapping_update_flags  = update_gradients | update_hessians;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, double> mf(mf_data);
index c7698baddda77b28ae204686068486a8229a40fc..2e57f1d1eeef1bfd27a5988d74e2058e4067c486 100644 (file)
@@ -141,7 +141,7 @@ do_test(const DoFHandler<dim> &          dof,
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.store_plain_indices   = true;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, fe_degree + 1, number> mf(mf_data);
index b48c4fa210b2eb9877777431365a914474767fe5..30ae4a0d9b7d1fab170f0aa11e7ea1440932d165 100644 (file)
@@ -204,7 +204,8 @@ test()
   MatrixFree<dim, number> mf_data;
   {
     const QGauss<1> quad(fe_degree + 1);
-    mf_data.reinit(dof,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dof,
                    constraints,
                    quad,
                    typename MatrixFree<dim, number>::AdditionalData(
index ec4f2132de50892f96e4679eb2e2b556026c4281..b6e589dd239b956f9f80f450856c43e235a0c8fb 100644 (file)
@@ -223,7 +223,7 @@ test()
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.mapping_update_flags |= update_hessians;
     const QGauss<1> quad(fe_degree + 1);
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number> mf(mf_data);
index 7cf4569ada207245849f8d40ba2716d4b23dfebc..278e5172f742e5747a9e607ada21d6cec425dd9f 100644 (file)
@@ -323,7 +323,8 @@ test()
     std::vector<Quadrature<1>> quad;
     for (unsigned int no = 0; no < 2; ++no)
       quad.push_back(QGauss<1>(fe_degree + 1 + no));
-    mf_data.reinit(dof,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dof,
                    constraints,
                    quad,
                    typename MatrixFree<dim, number>::AdditionalData(
index 08b97bc456f3f70748814a9e422b2838ca42ebdf..d62a4723520987b4e0ccc0130d483e071d2ef96f 100644 (file)
@@ -313,7 +313,8 @@ test()
     std::vector<Quadrature<1>> quad;
     quad.push_back(QGauss<1>(1));
     quad.push_back(QGauss<1>(fe_degree + 1));
-    mf_data.reinit(dof,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dof,
                    constraints,
                    quad,
                    typename MatrixFree<dim, number>::AdditionalData(
index 7b0f90b5e43d57b50c23bd9977c07c33f10964cc..05253c65b3a6054af99f516d976149b6e52c1339 100644 (file)
@@ -342,7 +342,7 @@ do_test(const DoFHandler<dim> &          dof,
       update_gradients | update_hessians | update_quadrature_points;
     data.mapping_update_flags_inner_faces =
       update_gradients | update_hessians | update_quadrature_points;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, fe_degree + 1, number> mf(mf_data);
index e2317de3a268cab7f03cba91b616dc9a05e56d33..fe9ded62461f5d822818bcfb53da1ff38a84ce27 100644 (file)
@@ -142,7 +142,7 @@ do_test(const DoFHandler<dim> &dof)
     data.tasks_block_size = 3;
     AffineConstraints<double> constraints;
 
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number> mf(mf_data);
index 4b1f0aa7a9476716be866561ecd092d2fbaf8c40..fc0a869a5012801705c87d92eed997fd2964d19b 100644 (file)
@@ -59,7 +59,8 @@ test()
   AffineConstraints<double>                dummy;
   typename MatrixFree<dim>::AdditionalData additional_data;
   additional_data.mapping_update_flags |= update_quadrature_points;
-  matrix_free.reinit(dof, dummy, QGauss<1>(degree + 1), additional_data);
+  matrix_free.reinit(
+    MappingQ1<dim>{}, dof, dummy, QGauss<1>(degree + 1), additional_data);
 
   FEEvaluation<dim, degree> fe_eval(matrix_free);
   FEEvaluation<dim, degree> fe_eval_default(matrix_free);
index 0e2c72ff32dd50e89d826cb66b96b30a841d58c4..bf7558c2489d226d6ba79bbc5c5cdf5da926bacb 100644 (file)
@@ -136,7 +136,7 @@ do_test(const DoFHandler<dim> &dof)
     data.tasks_block_size = 3;
     AffineConstraints<double> constraints;
 
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number> mf(mf_data);
index 91737e817e04426bd10a7ccb1e7fafab6d19f57f..6413df82fa99aca4ad81c702d119eada3e5389d8 100644 (file)
@@ -134,7 +134,7 @@ do_test(const DoFHandler<dim> &dof)
     data.tasks_block_size = 3;
     AffineConstraints<double> constraints;
 
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, number> mf(mf_data);
index 81c71637c124672cf72d332d7919fa92972aea42..9cbb239f6b6ce22fe0e21413a559e11caa05a8d3 100644 (file)
@@ -71,7 +71,7 @@ test()
     typename MatrixFree<dim>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim>::AdditionalData::none;
     data.mapping_update_flags  = update_JxW_values;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   double error = 0, error2 = 0, abs = 0;
index 5224b70d761eac0669330a690ad15c166838dcf9..f7c0da4f75e8f0f89df252452ef0bf5bd52bc079 100644 (file)
@@ -113,7 +113,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::LaplaceOperator<
index eb5c0f5b364ec5804514dd80b1452b27616759c0..1c49149a7d651a1373d1351b193c06bcb78c7c83 100644 (file)
@@ -156,7 +156,7 @@ test()
     data.tasks_block_size      = 7;
     data.mapping_update_flags =
       update_quadrature_points | update_gradients | update_JxW_values;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   std::shared_ptr<Table<2, VectorizedArray<number>>> coefficient;
index ed588d9a92fcf1c3b641d55e783e38668b0715af..0338181cfbac38f9f4a3c1b7eff9edc4915f1434 100644 (file)
@@ -110,7 +110,7 @@ test()
     data.tasks_block_size      = 7;
     data.mapping_update_flags =
       update_quadrature_points | update_gradients | update_JxW_values;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   std::shared_ptr<Table<2, VectorizedArray<number>>> coefficient;
index 4e0ce30886b22abe80e659f644f2ecd6d4926691..7d5db81bb92f4cbb018c765fda1c523410fddc1a 100644 (file)
@@ -58,7 +58,8 @@ do_test(const unsigned int n_refine, const bool overlap_communication)
   add_data.mapping_update_flags_boundary_faces =
     update_values | update_JxW_values | update_quadrature_points;
   add_data.overlap_communication_computation = overlap_communication;
-  matrix_free.reinit(dof_handler,
+  matrix_free.reinit(MappingQ1<dim>{},
+                     dof_handler,
                      constraints,
                      QGauss<1>(fe.degree + 1),
                      add_data);
index 1736158ed5f0b1153563a7a3831c73c94795e4b5..d555f5752c51207f4e3289d6001c932e34b0b282 100644 (file)
@@ -60,7 +60,8 @@ do_test(const unsigned int n_refine)
                                   update_JxW_values | update_quadrature_points;
   add_data.mapping_update_flags_boundary_faces =
     update_values | update_JxW_values | update_quadrature_points;
-  matrix_free.reinit(dof_handler,
+  matrix_free.reinit(MappingQ1<dim>{},
+                     dof_handler,
                      constraints,
                      QGauss<1>(fe.degree + 1),
                      add_data);
index f0afa71489a9ec68710315d895eac034b7ddb9ab..202aaa98f157b04ef616958b9dbb2f132c37ced5 100644 (file)
@@ -120,7 +120,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index dc5100081fb5406b6b42e1923ed6d609ba987463..12d9f03ff7513ba72c3cf6b682e6aaeae87cbd88 100644 (file)
@@ -85,7 +85,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index 21e766516e04a59aad43ca7a328fa6adf6d5f0b1..6422f0b67dc7b204fb245cb536e773c3f34ea1ea 100644 (file)
@@ -82,7 +82,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index d1a5e2ef707573ac10481be45b7a240956c86076..68ebde28899e2b20f2e0eaf1d463d7ca74a0cde8 100644 (file)
@@ -77,14 +77,15 @@ test()
   const QGauss<1>                                  quad(2);
   typename MatrixFree<dim, number>::AdditionalData data;
   data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-  mf_data_0->reinit(dof, constraints_0, quad, data);
-  mf_data_1->reinit(dof, constraints_1, quad, data);
+  mf_data_0->reinit(MappingQ1<dim>{}, dof, constraints_0, quad, data);
+  mf_data_1->reinit(MappingQ1<dim>{}, dof, constraints_1, quad, data);
   {
     std::vector<const DoFHandler<dim> *>           dof_handlers(2, &dof);
     std::vector<const AffineConstraints<double> *> constraint(2);
     constraint[0] = &constraints_0;
     constraint[1] = &constraints_1;
-    mf_data_combined->reinit(dof_handlers, constraint, quad, data);
+    mf_data_combined->reinit(
+      MappingQ1<dim>{}, dof_handlers, constraint, quad, data);
   }
 
   MatrixFreeOperators::
index ad1a59c1e98c8b994dc0a2e9d7c01dd9fd1eaa87..fefbe0e37e76354c3ff73aae7f9fb0c4c0775fef 100644 (file)
@@ -118,7 +118,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim,
index 93fea07ed7a07712b778c9a2b587e6d1bef87a30..d25b7011362da4b433ab5e3f59e9407cc90f4e05 100644 (file)
@@ -111,7 +111,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim,
@@ -158,7 +158,7 @@ test()
         }
 
       data.tasks_block_size = 3;
-      mf_data.reinit(dof, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
       MatrixFreeTest<dim,
                      fe_degree,
                      number,
index 3424e3f87a7fb9c58047b37ecf7c1c5b63768554..0d35c5e19b7f10672132d08c008cb4218a25e4cd 100644 (file)
@@ -176,7 +176,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number>                  mf(mf_data);
index 03579dca421305e013fcdbbed1501b5026a414b6..5770be7e8705661d40b9b3da4b3e221969ee88e7 100644 (file)
@@ -174,7 +174,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number>          mf(mf_data);
index 680a048d24b7cbccd9fc4432bad0103fef8c4c24..f1da1bbee941b662ecaebc0def1e4bea238303f1 100644 (file)
@@ -134,7 +134,7 @@ do_test(const DoFHandler<dim> &          dof,
     data.tasks_block_size = 7;
     data.mapping_update_flags |= update_hessians;
 
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number> mf(mf_data);
index 02ebc587827f1586b751889276fa50e1af622769..8d04d28139439e5c3f7eba28d131a5d6c2277809 100644 (file)
@@ -112,7 +112,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim,
index 1185d5fb8c30b066b4975121e4656106ed28689f..22d5b90d378a71664dad0aa0fdbb8374de7a88fe 100644 (file)
@@ -180,7 +180,7 @@ test()
     data.tasks_parallel_scheme =
       MatrixFree<dim, number>::AdditionalData::partition_color;
     data.tasks_block_size = 7;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number>          mf(mf_data);
index bfc4a2fd28613b5353eee1ce637876aa313254a0..051b6da361ddf6d0b8d0aa8cefcd8dad36566124 100644 (file)
@@ -170,7 +170,7 @@ test()
     data.tasks_parallel_scheme =
       MatrixFree<dim, number>::AdditionalData::partition_color;
     data.tasks_block_size = 7;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number>          mf(mf_data);
index d829da9476094011dd12bdd56b6a22ecf1908bec..9024633c7a7130d627cc4971268e4ab301b70ec9 100644 (file)
@@ -177,7 +177,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number>                  mf(mf_data);
index cc64976947fecb6ab004cf23c996e4ac9dd72b76..aff768c0592c4e9f9b97caa26b3e62d6be3fe8bb 100644 (file)
@@ -188,7 +188,7 @@ test()
     const QGauss<1>                                  quad(fe_degree + 1);
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number>                  mf(mf_data);
index 4fa936fae2d2ec2ca0f93bce1fe7fbe097a036a1..ba604f974ba8cee436db42faa73d58a5f08ba4a8 100644 (file)
@@ -102,7 +102,7 @@ test()
     const QGauss<1>                                  quad(fe_degree + 1);
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeVariant<dim,
index 1876e2d2ae28052cf656252a33f2d9375fb86a9f..fbf0251f03d7a11bf2d164d68518faf6ccdcf133 100644 (file)
@@ -153,7 +153,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.overlap_communication_computation = false;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim,
index 7ac40fe69a40b82a664f8f99068871a86f87c191..ba3c43df08ac26ff6af0435af89097eefebc5f87 100644 (file)
@@ -255,7 +255,8 @@ test()
   // setup matrix-free structure
   {
     QGauss<1> quad(fe_degree + 1);
-    mf_data.reinit(dof_handler_sca,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dof_handler_sca,
                    constraints,
                    quad,
                    typename MatrixFree<dim>::AdditionalData(
index e7541cbb0fd4a126ecccd5c83dd6ed52957adfa9..e48584a1763b0b1ae1f17663e715cf03f4a66856 100644 (file)
@@ -255,7 +255,8 @@ test()
   // setup matrix-free structure
   {
     QGauss<1> quad(fe_degree + 1);
-    mf_data.reinit(dof_handler_sca,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dof_handler_sca,
                    constraints,
                    quad,
                    typename MatrixFree<dim>::AdditionalData(
index 14d4c9fd03b85b7b371c54fe1ae184af5878826b..764a5b829e117690544049b1bbad3ec6d9711892 100644 (file)
@@ -85,7 +85,7 @@ test()
   data.mapping_update_flags_boundary_faces =
     (update_gradients | update_JxW_values);
 
-  mf_data.reinit(dof, constraints, quad, data);
+  mf_data.reinit(MappingQ1<mydim>{}, dof, constraints, quad, data);
   mf_data.initialize_dof_vector(in);
   mf_data.initialize_dof_vector(out);
 
@@ -105,7 +105,7 @@ test()
   mf_data.renumber_dofs(renumbering);
   dof.renumber_dofs(renumbering);
 
-  mf_data.reinit(dof, constraints, quad, data);
+  mf_data.reinit(MappingQ1<mydim>{}, dof, constraints, quad, data);
   mf_data.initialize_dof_vector(in2);
   mf_data.initialize_dof_vector(out2);
   for (unsigned int i = 0; i < in.local_size(); ++i)
index 98589c5d31587551dec7f974b051c5e27a93df66..1e125b545472636c1cfc7e7222ee7705601def7b 100644 (file)
@@ -97,7 +97,7 @@ test()
         (update_gradients | update_JxW_values);
       data.mapping_update_flags_boundary_faces =
         (update_gradients | update_JxW_values);
-      mf_data.reinit(dof_system, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof_system, constraints, quad, data);
 
       mf_data.initialize_dof_vector(in);
       mf_data.initialize_dof_vector(out);
@@ -209,7 +209,7 @@ test()
 
       // finally compare to a series of scalar problems
       MatrixFree<dim, double> mf_data_scalar;
-      mf_data_scalar.reinit(dof, constraints, quad, data);
+      mf_data_scalar.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
       LinearAlgebra::distributed::Vector<double> in_small, out_small, ref_small;
       mf_data_scalar.initialize_dof_vector(in_small);
index 1b9ed1ca9b701582ce0f4fe33556ae7e079263a7..68583c53850919ef1937fa35dcef04cf1bd30dc0 100644 (file)
@@ -100,14 +100,14 @@ test()
         (update_gradients | update_JxW_values);
       data.initialize_mapping = false;
 
-      mf_data.reinit(dof_system, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof_system, constraints, quad, data);
 
       std::vector<types::global_dof_index> renumbering;
       mf_data.renumber_dofs(renumbering);
       dof_system.renumber_dofs(renumbering);
 
       data.initialize_mapping = true;
-      mf_data.reinit(dof_system, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof_system, constraints, quad, data);
 
       mf_data.initialize_dof_vector(in);
       mf_data.initialize_dof_vector(out);
@@ -219,7 +219,7 @@ test()
 
       // finally compare to a series of scalar problems
       MatrixFree<dim, double> mf_data_scalar;
-      mf_data_scalar.reinit(dof, constraints, quad, data);
+      mf_data_scalar.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
       LinearAlgebra::distributed::Vector<double> in_small, out_small, ref_small;
       mf_data_scalar.initialize_dof_vector(in_small);
index 122d63d8f4779dc29cd31b991ff3e28553b0d0b9..beb03ae66c5d811e5f3a02a686f74acc1daea4fc 100644 (file)
@@ -96,7 +96,7 @@ test()
         (update_gradients | update_JxW_values);
       data.mapping_update_flags_boundary_faces =
         (update_gradients | update_JxW_values);
-      mf_data.reinit(dof_system, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof_system, constraints, quad, data);
 
       mf_data.initialize_dof_vector(in);
       mf_data.initialize_dof_vector(out);
@@ -192,7 +192,7 @@ test()
 
       // finally compare to a series of scalar problems
       MatrixFree<dim, double> mf_data_scalar;
-      mf_data_scalar.reinit(dof, constraints, quad, data);
+      mf_data_scalar.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
       LinearAlgebra::distributed::Vector<double> in_small, out_small, ref_small;
       mf_data_scalar.initialize_dof_vector(in_small);
index b8bc76912a72f500679b9855ff902d81d6e8f3bf..d7fc6abe84536399822434e6d4e34cfb2c31e235 100644 (file)
@@ -100,14 +100,14 @@ test()
         (update_gradients | update_JxW_values);
       data.initialize_mapping = false;
 
-      mf_data.reinit(dof_system, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof_system, constraints, quad, data);
 
       std::vector<types::global_dof_index> renumbering;
       mf_data.renumber_dofs(renumbering);
       dof_system.renumber_dofs(renumbering);
 
       data.initialize_mapping = true;
-      mf_data.reinit(dof_system, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof_system, constraints, quad, data);
 
       mf_data.initialize_dof_vector(in);
       mf_data.initialize_dof_vector(out);
@@ -203,7 +203,7 @@ test()
 
       // finally compare to a series of scalar problems
       MatrixFree<dim, double> mf_data_scalar;
-      mf_data_scalar.reinit(dof, constraints, quad, data);
+      mf_data_scalar.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
       LinearAlgebra::distributed::Vector<double> in_small, out_small, ref_small;
       mf_data_scalar.initialize_dof_vector(in_small);
index 96a0db6187a7d5b8cd65a40b900980c828280c12..f3bfcfbbc42ee16fa2e0ab51e8a5280c9108d781 100644 (file)
@@ -98,7 +98,7 @@ test()
         (update_gradients | update_JxW_values);
       data.mapping_update_flags_boundary_faces =
         (update_gradients | update_JxW_values);
-      mf_data.reinit(dof_system, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof_system, constraints, quad, data);
 
       mf_data.initialize_dof_vector(in);
       mf_data.initialize_dof_vector(out);
@@ -210,7 +210,7 @@ test()
 
       // finally compare to a series of scalar problems
       MatrixFree<dim, double> mf_data_scalar;
-      mf_data_scalar.reinit(dof, constraints, quad, data);
+      mf_data_scalar.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
       LinearAlgebra::distributed::Vector<double> in_small, out_small, ref_small;
       mf_data_scalar.initialize_dof_vector(in_small);
index fa6b13f7c6582a2567d7dd20f4337de933158f70..a0feb60f1121634b96fd3a7fa59a893b55a59809 100644 (file)
@@ -93,7 +93,7 @@ do_test(const unsigned int fe_degree)
         (update_gradients | update_JxW_values);
       data.mapping_update_flags_boundary_faces =
         (update_gradients | update_JxW_values);
-      mf_data.reinit(dof_system, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof_system, constraints, quad, data);
 
       mf_data.initialize_dof_vector(in);
       mf_data.initialize_dof_vector(out);
@@ -205,7 +205,7 @@ do_test(const unsigned int fe_degree)
 
       // finally compare to a series of scalar problems
       MatrixFree<dim, double> mf_data_scalar;
-      mf_data_scalar.reinit(dof, constraints, quad, data);
+      mf_data_scalar.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
       LinearAlgebra::distributed::Vector<double> in_small, out_small, ref_small;
       mf_data_scalar.initialize_dof_vector(in_small);
index 63689845c3d8462d9f6d0e3ba24904a7dd3fd37a..b1aab3525ae27331383a71b47e7719ae4eeec8f7 100644 (file)
@@ -93,7 +93,7 @@ do_test(const unsigned int fe_degree)
         (update_gradients | update_JxW_values);
       data.mapping_update_flags_boundary_faces =
         (update_gradients | update_JxW_values);
-      mf_data.reinit(dof_system, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof_system, constraints, quad, data);
 
       mf_data.initialize_dof_vector(in);
       mf_data.initialize_dof_vector(out);
@@ -189,7 +189,7 @@ do_test(const unsigned int fe_degree)
 
       // finally compare to a series of scalar problems
       MatrixFree<dim, double> mf_data_scalar;
-      mf_data_scalar.reinit(dof, constraints, quad, data);
+      mf_data_scalar.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
 
       LinearAlgebra::distributed::Vector<double> in_small, out_small, ref_small;
       mf_data_scalar.initialize_dof_vector(in_small);
index e942e0ceb7b1ced55160412fe8ce11ef0a4a4013..4e118b3612fce97f37d5dcef174c6ee3a56b923a 100644 (file)
@@ -194,7 +194,8 @@ test()
   MatrixFree<dim, number>                          mf_data;
   typename MatrixFree<dim, number>::AdditionalData data;
   data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-  mf_data.reinit(dof, constraints, quadrature_collection_mf, data);
+  mf_data.reinit(
+    MappingQ1<dim>{}, dof, constraints, quadrature_collection_mf, data);
   MatrixFreeTestHP<dim, number> mf(mf_data);
 
   // assemble sparse matrix with (\nabla v,
index 10ac6975e8b5ff13b2f08b823807c63e62806b78..547e112ec8dfd1b6a17ea94b82b1e14314420c5a 100644 (file)
@@ -157,7 +157,8 @@ test()
   MatrixFree<dim, number>                          mf_data;
   typename MatrixFree<dim, number>::AdditionalData data;
   data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-  mf_data.reinit(dof, constraints, quadrature_collection_mf, data);
+  mf_data.reinit(
+    MappingQ1<dim>{}, dof, constraints, quadrature_collection_mf, data);
   MatrixFreeTestHP<dim, number> mf(mf_data);
 
   // assemble sparse matrix with (\nabla v,
index 7c2244f40df6b2848c5187b719e0016b21e5f86b..052d4ebdec83fa22a4bfcd08e302c63029ea1add 100644 (file)
@@ -198,7 +198,8 @@ test()
   MatrixFree<dim, number>                          mf_data;
   typename MatrixFree<dim, number>::AdditionalData data;
   data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-  mf_data.reinit(dof, constraints, quadrature_collection_mf, data);
+  mf_data.reinit(
+    MappingQ1<dim>{}, dof, constraints, quadrature_collection_mf, data);
   MatrixFreeTestHP<dim, number> mf(mf_data);
 
   // assemble sparse matrix with (\nabla v,
index 3de882743e0e02139e9f1d9dd8755a7d60108ca5..d05473f3d1442f255c49305416520722934328bf 100644 (file)
@@ -73,7 +73,7 @@ test()
       typename MatrixFree<dim, double>::AdditionalData data;
       data.tasks_parallel_scheme =
         MatrixFree<dim, double>::AdditionalData::none;
-      mf_data.reinit(dof, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
     }
 
     MatrixFreeTest<dim, fe_degree, double, Vector<double>, fe_degree + 1> mf(
@@ -88,7 +88,7 @@ test()
       typename MatrixFree<dim, double>::AdditionalData data;
       data.tasks_parallel_scheme =
         MatrixFree<dim, double>::AdditionalData::none;
-      mf_data.reinit(dof, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
     }
 
     MatrixFreeTest<dim, fe_degree, double, Vector<double>, fe_degree + 2> mf(
index b815c42aedca1f0f578162893a8db87279db212d..b2c64f8683707b46608a9bc315da5c82d01d6e35 100644 (file)
@@ -96,7 +96,7 @@ test()
     const QGauss<1>                                  quad(fe_degree + 1);
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeTest<dim, fe_degree, number, Vector<number>> mf(mf_data);
index 752d7ccf512c7640d1684b5a680077ff8ea215a3..c43244f06049ee75f680db9956e81ee66627e281 100644 (file)
@@ -71,7 +71,7 @@ test()
       typename MatrixFree<dim, double>::AdditionalData data;
       data.tasks_parallel_scheme =
         MatrixFree<dim, double>::AdditionalData::none;
-      mf_data.reinit(dof, constraints, quad, data);
+      mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
     }
 
     MatrixFreeTest<dim, fe_degree, double, Vector<double>, fe_degree + 1> mf(
@@ -84,7 +84,8 @@ test()
   MatrixFree<dim, double> mf_data;
 
   {
-    mf_data.reinit(dof, constraints, QGauss<1>(fe_degree + 2), data);
+    mf_data.reinit(
+      MappingQ1<dim>{}, dof, constraints, QGauss<1>(fe_degree + 2), data);
     MatrixFreeTest<dim, fe_degree, double, Vector<double>, fe_degree + 2> mf(
       mf_data);
     mf.vmult(out, in);
@@ -96,7 +97,7 @@ test()
   // unfortunately we cannot use for loops due to the template, so duplicate
   // some code here
   {
-    mf_data.reinit(dof, constraints, QGauss<1>(100), data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, QGauss<1>(100), data);
     MatrixFreeTest<dim, fe_degree, double, Vector<double>, 100> mf(mf_data);
     mf.vmult(out, in);
     out -= ref;
@@ -104,7 +105,7 @@ test()
             << " quadrature points: " << out.l2_norm() << std::endl;
   }
   {
-    mf_data.reinit(dof, constraints, QGauss<1>(200), data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, QGauss<1>(200), data);
     MatrixFreeTest<dim, fe_degree, double, Vector<double>, 200> mf(mf_data);
     mf.vmult(out, in);
     out -= ref;
@@ -112,7 +113,7 @@ test()
             << " quadrature points: " << out.l2_norm() << std::endl;
   }
   {
-    mf_data.reinit(dof, constraints, QGauss<1>(500), data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, QGauss<1>(500), data);
     MatrixFreeTest<dim, fe_degree, double, Vector<double>, 500> mf(mf_data);
     mf.vmult(out, in);
     out -= ref;
@@ -120,7 +121,7 @@ test()
             << " quadrature points: " << out.l2_norm() << std::endl;
   }
   {
-    mf_data.reinit(dof, constraints, QGauss<1>(1000), data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, QGauss<1>(1000), data);
     MatrixFreeTest<dim, fe_degree, double, Vector<double>, 1000> mf(mf_data);
     mf.vmult(out, in);
     out -= ref;
index b4ca43baaa190812a6f4d351a4a7bc333bfc33dd..47ef30df7b76e6ff26e7fbe63a63d0bfdab38a57 100644 (file)
@@ -286,7 +286,8 @@ test()
     constraints.push_back(&dummy_constraints);
     constraints.push_back(&dummy_constraints);
     QGauss<1> quad(fe_degree + 2);
-    mf_data.reinit(dofs,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dofs,
                    constraints,
                    quad,
                    typename MatrixFree<dim>::AdditionalData(
index 7e81a77fe90e03165bb3c0209456b1dd565d64fb..734640ece3079504042fe35327469796d2b4c4ba 100644 (file)
@@ -265,7 +265,8 @@ test()
     constraints.push_back(&constraints_p);
     QGauss<1> quad(degree + 2);
     // no parallelism
-    mf_data->reinit(dofs,
+    mf_data->reinit(MappingQ1<dim>{},
+                    dofs,
                     constraints,
                     quad,
                     typename MatrixFree<dim>::AdditionalData(
index 4c9faf4e289656aa7f121c04e689305293c7d1e7..6c356c8fca68a4bfad633a05293c5f86cb4b22d5 100644 (file)
@@ -271,7 +271,8 @@ test()
   {
     QGauss<1> quad(fe_degree + 2);
     // no parallelism
-    mf_data.reinit(dof_handler,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dof_handler,
                    constraints,
                    quad,
                    typename MatrixFree<dim>::AdditionalData(
index 9b6ce902a517b864f9fcbef6b617462a3d525d66..b3979b955a0f275e3478ead27a7187cfc4eb277c 100644 (file)
@@ -288,7 +288,8 @@ test()
     constraints.push_back(&dummy_constraints);
     constraints.push_back(&dummy_constraints);
     QGauss<1> quad(fe_degree + 2);
-    mf_data.reinit(dofs,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dofs,
                    constraints,
                    quad,
                    typename MatrixFree<dim>::AdditionalData(
index 1d54f670913e0279511dbd9c38068ed4391ee512..32f0ac05d6ad0bdff71695d191c3baabeacc6360 100644 (file)
@@ -285,7 +285,8 @@ test(const unsigned int fe_degree)
     constraints.push_back(&dummy_constraints);
     constraints.push_back(&dummy_constraints);
     QGauss<1> quad(fe_degree + 2);
-    mf_data.reinit(dofs,
+    mf_data.reinit(MappingQ1<dim>{},
+                   dofs,
                    constraints,
                    quad,
                    typename MatrixFree<dim>::AdditionalData(
index 777d1f4659f0c5e5b48e4228eb9cff57eb11fe96..c06e562f798371978b3f2b4d628798fce3b54299 100644 (file)
@@ -144,7 +144,7 @@ do_test(const DoFHandler<dim> &          dof,
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.mapping_update_flags  = update_gradients | update_hessians;
     data.initialize_indices    = false;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   deallog << "Testing " << dof.get_fe().get_name() << " without read"
index 2b274a13662ff65a1636f8514bb664c2afdb443a..10ebba40b7566014016321224bdded4be8f54d27 100644 (file)
@@ -154,7 +154,8 @@ test()
 
       AffineConstraints<double> dummy;
       dummy.close();
-      data.reinit(dof_handler, dummy, quadrature, additional_data);
+      data.reinit(
+        MappingQ1<dim>{}, dof_handler, dummy, quadrature, additional_data);
 
       using VectorType = LinearAlgebra::distributed::Vector<double>;
 
index 3bf0819cf42edbdd6ddaeac70794af2f5aaa2e41..dbca48e58a9cd395d1f8ed09da3ce99a67fff9e0 100644 (file)
@@ -153,7 +153,8 @@ test()
 
       AffineConstraints<double> dummy;
       dummy.close();
-      data.reinit(dof_handler, dummy, quadrature, additional_data);
+      data.reinit(
+        MappingQ1<dim>{}, dof_handler, dummy, quadrature, additional_data);
 
       using VectorType = LinearAlgebra::distributed::Vector<double>;
 
index ce596651162e94e253ff9069e31099bbb1ac541f..4f12630946182cb4453d8f823797b2b98b4520d0 100644 (file)
@@ -148,7 +148,7 @@ test()
     const QGauss<1>                                  quad(fe_degree + 1);
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   Matrix<dim, fe_degree, fe_degree + 1, number> mf(mf_data);
index 28bc8354a95051679db77c061390c109280cf06f..741ca5cdb508751548b721efa66e718c0616c208 100644 (file)
@@ -157,7 +157,7 @@ test()
     const QGauss<1>                                  quad(fe_degree + 1);
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   Matrix<dim, fe_degree, fe_degree + 1, number> mf(mf_data);
index 98f06de90b90529f52e4d41e42e5ba859beb1f57..f5e073ec6ca807cfa97dede81e4a5c2a37b149b3 100644 (file)
@@ -150,7 +150,7 @@ test()
     const QGauss<1>                                  quad(fe_degree + 1);
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   Matrix<dim, fe_degree, fe_degree + 1, number> mf(mf_data);
index b0458e2b55bb519bb333f02d6dfcd9163d20f603..4e4d4bcf150af506be525b1e88b48992649fc35e 100644 (file)
@@ -147,7 +147,7 @@ test()
     const QGauss<1>                                  quad(fe_degree + 1);
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   Matrix<dim, fe_degree, fe_degree + 1, number> mf(mf_data);
index 97c140dfba8cd90f8911189a7b516c11f6a09933..1c2ad7ddf09661c1d10b17e20cd41e469b53cff0 100644 (file)
@@ -150,7 +150,7 @@ test()
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme =
       MatrixFree<dim, number>::AdditionalData::partition_partition;
-    mf_data.reinit(dof, constraints, quad, data);
+    mf_data.reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   Matrix<dim, fe_degree, fe_degree + 1, number> mf(mf_data);
index f6e98219bdae03c68c79e839d6b1eb3ff45d492d..5b31b9b00b6e824db3649df677cb27ba88bc930e 100644 (file)
@@ -419,7 +419,8 @@ namespace Step37
         (update_gradients | update_JxW_values | update_quadrature_points);
       std::shared_ptr<MatrixFree<dim, double>> system_mf_storage(
         new MatrixFree<dim, double>());
-      system_mf_storage->reinit(dof_handler,
+      system_mf_storage->reinit(MappingQ1<dim>{},
+                                dof_handler,
                                 constraints,
                                 QGauss<1>(fe.degree + 1),
                                 additional_data);
@@ -459,7 +460,8 @@ namespace Step37
         additional_data.mg_level = level;
         std::shared_ptr<MatrixFree<dim, float>> mg_mf_storage_level(
           new MatrixFree<dim, float>());
-        mg_mf_storage_level->reinit(dof_handler,
+        mg_mf_storage_level->reinit(MappingQ1<dim>{},
+                                    dof_handler,
                                     level_constraints,
                                     QGauss<1>(fe.degree + 1),
                                     additional_data);
index 04a1e1b681d20455e5ce2c7c895f74208ed83acf..8fb95bf791c9cb3e69fad4d340a78944067ebb05 100644 (file)
@@ -219,7 +219,8 @@ namespace Step37
     additional_data.mg_level = level;
     additional_data.mapping_update_flags =
       (update_gradients | update_JxW_values | update_quadrature_points);
-    data.reinit(dof_handler,
+    data.reinit(MappingQ1<dim>{},
+                dof_handler,
                 constraints,
                 QGauss<1>(fe_degree + 1),
                 additional_data);
index c23a8a321d5403eb3c31909e68188aa6557753cd..0164a9f778bf0c89c95e69a9f36c9c7da326a45a 100644 (file)
@@ -305,10 +305,8 @@ namespace Step48
     additional_data.tasks_parallel_scheme =
       MatrixFree<dim>::AdditionalData::partition_partition;
 
-    matrix_free_data.reinit(dof_handler,
-                            constraints,
-                            quadrature,
-                            additional_data);
+    matrix_free_data.reinit(
+      MappingQ1<dim>{}, dof_handler, constraints, quadrature, additional_data);
 
     matrix_free_data.initialize_dof_vector(solution);
     old_solution.reinit(solution);
index 549d8b0cf8fab8c3078a66d62bcb65b4324b3fdc..0afaa049263f999c2670ca32a7dfe981c00a675f 100644 (file)
@@ -269,10 +269,8 @@ namespace Step48
     additional_data.tasks_parallel_scheme =
       MatrixFree<dim>::AdditionalData::none;
 
-    matrix_free_data.reinit(dof_handler,
-                            constraints,
-                            quadrature,
-                            additional_data);
+    matrix_free_data.reinit(
+      MappingQ1<dim>{}, dof_handler, constraints, quadrature, additional_data);
 
     matrix_free_data.initialize_dof_vector(solution);
     old_solution.reinit(solution);
index f3b3e0318cd89333a98be94482480fe9b00f4ac0..44e99d4c92068e2eda0ad14cd4075e0785a4e2e6 100644 (file)
@@ -275,10 +275,8 @@ namespace Step48
     additional_data.tasks_parallel_scheme =
       MatrixFree<dim>::AdditionalData::partition_partition;
 
-    matrix_free_data.reinit(dof_handler,
-                            constraints,
-                            quadrature,
-                            additional_data);
+    matrix_free_data.reinit(
+      MappingQ1<dim>{}, dof_handler, constraints, quadrature, additional_data);
 
     matrix_free_data.initialize_dof_vector(solution);
     old_solution.reinit(solution);
index 8a247fc8274dc20f6c510c0748d6f2ed84374b82..b6b2410686d5a6b86e12797507afb8b854797e84 100644 (file)
@@ -1086,7 +1086,8 @@ namespace StokesClass
       (update_values | update_JxW_values | update_quadrature_points);
     std::shared_ptr<MatrixFree<dim, double>> mass_mf_storage(
       new MatrixFree<dim, double>());
-    mass_mf_storage->reinit(dof_handler_p,
+    mass_mf_storage->reinit(MappingQ1<dim>{},
+                            dof_handler_p,
                             constraints_p,
                             QGauss<1>(degree_u + 1),
                             additional_data_mass);
@@ -1128,7 +1129,8 @@ namespace StokesClass
         additional_data.mg_level = level;
         std::shared_ptr<MatrixFree<dim, double>> mg_mf_storage_level(
           new MatrixFree<dim, double>());
-        mg_mf_storage_level->reinit(dof_handler_u,
+        mg_mf_storage_level->reinit(MappingQ1<dim>{},
+                                    dof_handler_u,
                                     level_constraints,
                                     QGauss<1>(degree_u + 1),
                                     additional_data);
index db99a6b3019b8520ad43ed30f20d8647a20d5998..f94a12e4800f2653af7ae2c4e0acdb5527aacafe 100644 (file)
@@ -86,7 +86,8 @@ sub_test()
       MatrixFree<dim, number> mf_data, mf_data_color, mf_data_partition;
       {
         const QGauss<1> quad(fe_degree + 1);
-        mf_data.reinit(dof,
+        mf_data.reinit(MappingQ1<dim>{},
+                       dof,
                        constraints,
                        quad,
                        typename MatrixFree<dim, number>::AdditionalData(
@@ -96,12 +97,14 @@ sub_test()
         // some irregularity to the blocks (stress the
         // non-overlapping computation harder)
         mf_data_color.reinit(
+          MappingQ1<dim>{},
           dof,
           constraints,
           quad,
           typename MatrixFree<dim, number>::AdditionalData(
             MatrixFree<dim, number>::AdditionalData::partition_color, 3));
         mf_data_partition.reinit(
+          MappingQ1<dim>{},
           dof,
           constraints,
           quad,
index e8c4a89ba74359e92ed0be73d06dea1023763d7a..5a1163943ecfbaae28b11dcda7a8569dbeca8860 100644 (file)
@@ -84,7 +84,8 @@ sub_test()
       MatrixFree<dim, number> mf_data, mf_data_color, mf_data_partition;
       {
         const QGauss<1> quad(fe_degree + 1);
-        mf_data.reinit(dof,
+        mf_data.reinit(MappingQ1<dim>{},
+                       dof,
                        constraints,
                        quad,
                        typename MatrixFree<dim, number>::AdditionalData(
@@ -94,6 +95,7 @@ sub_test()
         // some irregularity to the blocks (stress the
         // non-overlapping computation harder)
         mf_data_color.reinit(
+          MappingQ1<dim>{},
           dof,
           constraints,
           quad,
@@ -101,6 +103,7 @@ sub_test()
             MatrixFree<dim, number>::AdditionalData::partition_color, 3));
 
         mf_data_partition.reinit(
+          MappingQ1<dim>{},
           dof,
           constraints,
           quad,
index 852563232bfcef261aa9d538fca6fbc8e306975d..9ba60e2dfdb4acf2113aef0cdb94edfeeefd5f2d 100644 (file)
@@ -146,7 +146,8 @@ do_test(const unsigned int parallel_option)
   MatrixFree<dim, number>                          mf_data;
   typename MatrixFree<dim, number>::AdditionalData data;
   data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
-  mf_data.reinit(dof, constraints, quadrature_collection_mf, data);
+  mf_data.reinit(
+    MappingQ1<dim>{}, dof, constraints, quadrature_collection_mf, data);
   MatrixFreeTestHP<dim, number> mf(mf_data);
 
   // test different block sizes, starting from
@@ -174,7 +175,8 @@ do_test(const unsigned int parallel_option)
           deallog << "Parallel option partition/color" << std::endl;
         }
       data.tasks_block_size = 1;
-      mf_data_par.reinit(dof, constraints, quadrature_collection_mf, data);
+      mf_data_par.reinit(
+        MappingQ1<dim>{}, dof, constraints, quadrature_collection_mf, data);
       MatrixFreeTestHP<dim, number> mf_par(mf_data_par);
 
       // fill a right hand side vector with random
index 6d7ae5f10f5d8bf56efc3a5f9f81e704dac3a4aa..b3c6852647865d8387e9cc22f5e1398309aebc51 100644 (file)
@@ -106,7 +106,7 @@ test(const unsigned int n_blocks = 5)
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index 69b371bf815e751fecfb4bdf0d5159447632c2e8..c642c969c169776501f2ede5c9a151e611c193c3 100644 (file)
@@ -108,7 +108,7 @@ test(const unsigned int n_blocks = 5)
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index c80ed7b019ecda4255430082f8d24cf0ac0f1b3c..096874f9a33f19abda5e2859e4924106b4722f29 100644 (file)
@@ -106,7 +106,7 @@ test(const unsigned int n_blocks = 5)
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index fec5a7741d1b35bfac36d0caceafa68b88eab68f..e62702543fdf8a4f137d485f6110c3a790e88eea 100644 (file)
@@ -106,7 +106,7 @@ test(const unsigned int n_blocks = 5)
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index acd57dad3d909a8a81e73f57c9799fbf727c68ba..10c5b02d950c93fed80a894863cee14e3739a696 100644 (file)
@@ -109,7 +109,7 @@ test(const unsigned int n_blocks = 5)
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index 4b064be81e5709f61e650349111ad7fd4f0430ec..495a34c079679f6f7f6433350371f7594c1488aa 100644 (file)
@@ -105,7 +105,7 @@ test(const unsigned int n_blocks = 5)
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index 7f7c2871cb7f34f4c0ada2dc2d939aa20493a106..b9a72eae1cabe127e1264ffe41ed04f62c965852 100644 (file)
@@ -107,7 +107,7 @@ test(const unsigned int n_blocks = 5)
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index 885b2eeb80c383b10f3b4cf207ed1fff062f69b3..3bc5110f1c1e184775814fe4c048b633350b5ff3 100644 (file)
@@ -107,7 +107,7 @@ test(const unsigned int n = 5, const unsigned int m = 3)
     typename MatrixFree<dim, number>::AdditionalData data;
     data.tasks_parallel_scheme = MatrixFree<dim, number>::AdditionalData::none;
     data.tasks_block_size      = 7;
-    mf_data->reinit(dof, constraints, quad, data);
+    mf_data->reinit(MappingQ1<dim>{}, dof, constraints, quad, data);
   }
 
   MatrixFreeOperators::MassOperator<dim,
index 434a3f18813f76aad859c3cc14eb27320c87408f..3f18dbbc6fa4cbb9b80ff5a63b02735d68f4cdbd 100644 (file)
@@ -269,7 +269,8 @@ namespace Step37
         additional_data.mg_level = level;
         std::shared_ptr<MatrixFree<dim, float>> mg_mf_storage_level(
           new MatrixFree<dim, float>());
-        mg_mf_storage_level->reinit(dof_handler,
+        mg_mf_storage_level->reinit(MappingQ1<dim>{},
+                                    dof_handler,
                                     level_constraints,
                                     QGauss<1>(fe.degree + 1),
                                     additional_data);

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.