]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Tests: Fix matrix_free/step-37
authorMatthias Maier <tamiko@43-1.org>
Mon, 28 May 2018 03:51:25 +0000 (22:51 -0500)
committerMatthias Maier <tamiko@43-1.org>
Wed, 6 Jun 2018 15:19:38 +0000 (10:19 -0500)
tests/matrix_free/step-37.cc

index 6ff6d2f543b5c7aa91a5a5cd45301ec13e353274..0fb005d470e31177eda7350522e623796279c2f3 100644 (file)
@@ -129,9 +129,9 @@ namespace Step37
     clear();
 
     void
-    reinit(const DoFHandler<dim> & dof_handler,
-           const ConstraintMatrix &constraints,
-           const unsigned int      level = numbers::invalid_unsigned_int);
+    reinit(const DoFHandler<dim> &          dof_handler,
+           const AffineConstraints<number> &constraints,
+           const unsigned int level = numbers::invalid_unsigned_int);
 
     unsigned int
     m() const;
@@ -209,9 +209,9 @@ namespace Step37
   template <int dim, int fe_degree, typename number>
   void
   LaplaceOperator<dim, fe_degree, number>::reinit(
-    const DoFHandler<dim> & dof_handler,
-    const ConstraintMatrix &constraints,
-    const unsigned int      level)
+    const DoFHandler<dim> &          dof_handler,
+    const AffineConstraints<number> &constraints,
+    const unsigned int               level)
   {
     typename MatrixFree<dim, number>::AdditionalData additional_data;
     additional_data.tasks_parallel_scheme =
@@ -377,15 +377,15 @@ namespace Step37
                                                                SystemMatrixType;
     typedef LaplaceOperator<dim, degree_finite_element, float> LevelMatrixType;
 
-    Triangulation<dim> triangulation;
-    FE_Q<dim>          fe;
-    DoFHandler<dim>    dof_handler;
-    ConstraintMatrix   constraints;
+    Triangulation<dim>        triangulation;
+    FE_Q<dim>                 fe;
+    DoFHandler<dim>           dof_handler;
+    AffineConstraints<double> constraints;
 
-    SystemMatrixType                system_matrix;
-    MGLevelObject<LevelMatrixType>  mg_matrices;
-    FullMatrix<float>               coarse_matrix;
-    MGLevelObject<ConstraintMatrix> mg_constraints;
+    SystemMatrixType                        system_matrix;
+    MGLevelObject<LevelMatrixType>          mg_matrices;
+    FullMatrix<float>                       coarse_matrix;
+    MGLevelObject<AffineConstraints<float>> mg_constraints;
 
     Vector<double> solution;
     Vector<double> system_rhs;

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.