From: Jean-Paul Pelteret Date: Sat, 23 May 2020 18:45:47 +0000 (+0200) Subject: Update to deal.II 9.1: time_dependent_navier_stokes X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=272357945c86c543436d1bd2d5a87d322e8dcd51;p=code-gallery.git 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 03b1d8d..f2c959a 100644 --- 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 ea012ca..848337a 100644 --- 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 #include +#include #include #include -#include #include #include #include @@ -572,8 +572,8 @@ namespace fluid QGauss volume_quad_formula; QGauss face_quad_formula; - ConstraintMatrix zero_constraints; - ConstraintMatrix nonzero_constraints; + AffineConstraints zero_constraints; + AffineConstraints 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 &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 &constraints_used = use_nonzero_constraints ? nonzero_constraints : zero_constraints; constraints_used.distribute(solution_increment);