From 84cf7192a9fa59b3ebf8c590b23d22c6f02e24c9 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Sat, 23 May 2020 18:09:54 +0200 Subject: [PATCH] Update to deal.II 9.1: goal_oriented_elastoplasticity --- goal_oriented_elastoplasticity/CMakeLists.txt | 2 +- goal_oriented_elastoplasticity/elastoplastic.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/goal_oriented_elastoplasticity/CMakeLists.txt b/goal_oriented_elastoplasticity/CMakeLists.txt index 5bf0668..338f8e4 100644 --- a/goal_oriented_elastoplasticity/CMakeLists.txt +++ b/goal_oriented_elastoplasticity/CMakeLists.txt @@ -18,7 +18,7 @@ SET(CLEAN_UP_FILES *.vtu *.pvtu *.visit) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -FIND_PACKAGE(deal.II 9.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/goal_oriented_elastoplasticity/elastoplastic.cc b/goal_oriented_elastoplasticity/elastoplastic.cc index ec83fd3..b687c7f 100644 --- a/goal_oriented_elastoplasticity/elastoplastic.cc +++ b/goal_oriented_elastoplasticity/elastoplastic.cc @@ -3862,7 +3862,7 @@ namespace ElastoPlastic } - const CylindricalManifold inner_boundary_description(inner_radius, 2); + const CylindricalManifold inner_boundary_description(2); triangulation.set_manifold (10, inner_boundary_description); triangulation.refine_global(n_initial_global_refinements); @@ -3954,7 +3954,7 @@ namespace ElastoPlastic } // Extrude the triangulation_2d and make it 3d - const unsigned int n_slices = length*1000/20 + 1; + const unsigned int n_slices = static_cast(length*1000/20) + 1; extrude_triangulation(triangulation_2d, n_slices, length, triangulation); -- 2.39.5