From 980ab8637bb6939e9293ece7a1700546058400f4 Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Mon, 4 Jan 2016 10:18:13 +0100 Subject: [PATCH] Address deprecations for 8.4-pre. --- .../cook_membrane.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc b/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc index 4d5adee..0721148 100644 --- a/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc +++ b/Quasi_static_Finite_strain_Compressible_Elasticity/cook_membrane.cc @@ -1373,11 +1373,11 @@ Point grid_y_transform (const Point &pt_in) if (cell->face(face)->at_boundary() == true) { if (std::abs(cell->face(face)->center()[0] - 0.0) < tol_boundary) - cell->face(face)->set_boundary_indicator(1); // -X faces + cell->face(face)->set_boundary_id(1); // -X faces else if (std::abs(cell->face(face)->center()[0] - 48.0) < tol_boundary) - cell->face(face)->set_boundary_indicator(11); // +X faces + cell->face(face)->set_boundary_id(11); // +X faces else if (std::abs(std::abs(cell->face(face)->center()[0]) - 0.5) < tol_boundary) - cell->face(face)->set_boundary_indicator(2); // +Z and -Z faces + cell->face(face)->set_boundary_id(2); // +Z and -Z faces } // Transform the hyper-rectangle into the beam shape @@ -1422,7 +1422,7 @@ Point grid_y_transform (const Point &pt_in) { const types::global_dof_index n_dofs_u = dofs_per_block[u_dof]; - BlockCompressedSimpleSparsityPattern csp(n_blocks, n_blocks); + BlockDynamicSparsityPattern csp(n_blocks, n_blocks); csp.block(u_dof, u_dof).reinit(n_dofs_u, n_dofs_u); csp.collect_sizes(); @@ -2084,7 +2084,7 @@ Point grid_y_transform (const Point &pt_in) for (unsigned int face = 0; face < GeometryInfo::faces_per_cell; ++face) if (cell->face(face)->at_boundary() == true - && cell->face(face)->boundary_indicator() == 11) + && cell->face(face)->boundary_id() == 11) { scratch.fe_face_values_ref.reinit(cell, face); @@ -2316,7 +2316,7 @@ Point grid_y_transform (const Point &pt_in) Vector soln(solution_n.size()); for (unsigned int i = 0; i < soln.size(); ++i) soln(i) = solution_n(i); - MappingQEulerian q_mapping(degree, soln, dof_handler_ref); + MappingQEulerian q_mapping(degree, dof_handler_ref, soln); data_out.build_patches(q_mapping, degree); std::ostringstream filename; -- 2.39.5