Update to deal.II 9.1: time_dependent_navier_stokes

diff --git a/time_dependent_navier_stokes/CMakeLists.txt b/time_dependent_navier_stokes/CMakeLists.txt
index 03b1d8d3bf1d8584558dcccdb6972d79e8b8d8bb..f2c959af35bc8ebf84abc7d4d08d84ac40f9fd23 100644 (file)
--- a/time_dependent_navier_stokes/CMakeLists.txt
+++ b/time_dependent_navier_stokes/CMakeLists.txt
@@ -23,7 +23,7 @@ SET(TARGET_SRC
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
 
-FIND_PACKAGE(deal.II 9.0.0 QUIET
+FIND_PACKAGE(deal.II 9.1 QUIET
   HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}
   )
 IF(NOT ${deal.II_FOUND})

diff --git a/time_dependent_navier_stokes/time_dependent_navier_stokes.cc b/time_dependent_navier_stokes/time_dependent_navier_stokes.cc
index ea012ca574598c1d0787048485d8120e6126236d..848337aca5978697654a4e8831ebafd2538584e5 100644 (file)
--- a/time_dependent_navier_stokes/time_dependent_navier_stokes.cc
+++ b/time_dependent_navier_stokes/time_dependent_navier_stokes.cc
@@ -6,9 +6,9 @@
 #include <deal.II/base/timer.h>
 #include <deal.II/base/utilities.h>
 
+#include <deal.II/lac/affine_constraints.h>
 #include <deal.II/lac/block_sparse_matrix.h>
 #include <deal.II/lac/block_vector.h>
-#include <deal.II/lac/constraint_matrix.h>
 #include <deal.II/lac/dynamic_sparsity_pattern.h>
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/precondition.h>
@@ -572,8 +572,8 @@ namespace fluid
     QGauss<dim> volume_quad_formula;
     QGauss<dim - 1> face_quad_formula;
 
-    ConstraintMatrix zero_constraints;
-    ConstraintMatrix nonzero_constraints;
+    AffineConstraints<double> zero_constraints;
+    AffineConstraints<double> nonzero_constraints;
 
     BlockSparsityPattern sparsity_pattern;
     // System matrix to be solved
@@ -873,7 +873,7 @@ namespace fluid
 
             cell->get_dof_indices(local_dof_indices);
 
-            const ConstraintMatrix &constraints_used =
+            const AffineConstraints<double> &constraints_used =
               use_nonzero_constraints ? nonzero_constraints : zero_constraints;
             if (assemble_system)
               {
@@ -903,7 +903,7 @@ namespace fluid
 
   // @sect4{InsIMEX::solve}
   // Solve the linear system using FGMRES solver with block preconditioner.
-  // After solving the linear system, the same ConstraintMatrix as used
+  // After solving the linear system, the same AffineConstraints object as used
   // in assembly must be used again, to set the constrained value.
   // The second argument is used to determine whether the block
   // preconditioner should be reset or not.
@@ -935,7 +935,7 @@ namespace fluid
     // The solution vector must be non-ghosted
     gmres.solve(system_matrix, solution_increment, system_rhs, *preconditioner);
 
-    const ConstraintMatrix &constraints_used =
+    const AffineConstraints<double> &constraints_used =
       use_nonzero_constraints ? nonzero_constraints : zero_constraints;
     constraints_used.distribute(solution_increment);