Update to deal.II 9.1: goal_oriented_elastoplasticity

diff --git a/goal_oriented_elastoplasticity/CMakeLists.txt b/goal_oriented_elastoplasticity/CMakeLists.txt
index 5bf0668d9d8e0709be3db6ab4ce88dea5da08761..338f8e41d8cf4271d35e17d81412a77a3934d309 100644 (file)
--- 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 ec83fd35820a5917d0429524fa6c5b44a8861d82..b687c7f91c7b9c88505eabd5ec38eac83ff53762 100644 (file)
--- a/goal_oriented_elastoplasticity/elastoplastic.cc
+++ b/goal_oriented_elastoplasticity/elastoplastic.cc
@@ -3862,7 +3862,7 @@ namespace ElastoPlastic
 
         }
 
-        const CylindricalManifold<dim> inner_boundary_description(inner_radius, 2);
+        const CylindricalManifold<dim> 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<int>(length*1000/20) + 1;
         extrude_triangulation(triangulation_2d,
                               n_slices, length, triangulation);