From 1ab667023b3866e50630e94e07a1805121ab2de4 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Sat, 23 May 2020 18:24:04 +0200 Subject: [PATCH] Update to deal.II 9.1: Quasi_static_Finite_strain_Compressible_Elasticity --- .../CMakeLists.txt | 2 +- .../cook_membrane.cc | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Quasi_static_Finite_strain_Compressible_Elasticity/CMakeLists.txt b/Quasi_static_Finite_strain_Compressible_Elasticity/CMakeLists.txt index b6b6434..6f40451 100644 --- a/Quasi_static_Finite_strain_Compressible_Elasticity/CMakeLists.txt +++ b/Quasi_static_Finite_strain_Compressible_Elasticity/CMakeLists.txt @@ -20,7 +20,7 @@ SET(CLEAN_UP_FILES CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 8.5 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/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc b/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc index 7a40efe..9b19f0c 100644 --- a/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc +++ b/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -50,6 +49,7 @@ #include #include +#include #include #include #include @@ -57,7 +57,6 @@ #include #include #include -#include #include #include @@ -76,6 +75,7 @@ #include #include +#include // We then stick everything that relates to this tutorial program into a @@ -892,10 +892,10 @@ namespace Cook_Membrane const unsigned int n_q_points_f; // Objects that store the converged solution and right-hand side vectors, - // as well as the tangent matrix. There is a ConstraintMatrix object used + // as well as the tangent matrix. There is a AffineConstraints object used // to keep track of constraints. We make use of a sparsity pattern // designed for a block system. - ConstraintMatrix constraints; + AffineConstraints constraints; BlockSparsityPattern sparsity_pattern; BlockSparseMatrix tangent_matrix; BlockVector system_rhs; @@ -1591,7 +1591,7 @@ namespace Cook_Membrane void copy_local_to_global_ASM(const PerTaskData_ASM &data) { - const ConstraintMatrix &constraints = data.solid->constraints; + const AffineConstraints &constraints = data.solid->constraints; BlockSparseMatrix &tangent_matrix = const_cast *>(data.solid)->tangent_matrix; BlockVector &system_rhs = const_cast *>(data.solid)->system_rhs; @@ -2139,8 +2139,9 @@ namespace Cook_Membrane std::cout << " SLV " << std::flush; if (parameters.type_lin == "CG") { - const int solver_its = tangent_matrix.block(u_dof, u_dof).m() - * parameters.max_iterations_lin; + const int solver_its = static_cast( + tangent_matrix.block(u_dof, u_dof).m() + * parameters.max_iterations_lin); const double tol_sol = parameters.tol_lin * system_rhs.block(u_dof).l2_norm(); -- 2.39.5