From bde41d0a39baf43e15a86d17a9c5fe4ae553035c Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 10 May 2018 14:55:44 +0200 Subject: [PATCH] Avoid using the deprecated functions --- .../viscoelastic_strip_with_hole.cc | 2 +- .../elastoplastic.cc | 28 ++++++++++++------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Quasi_static_Finite_strain_Quasi_incompressible_ViscoElasticity/viscoelastic_strip_with_hole.cc b/Quasi_static_Finite_strain_Quasi_incompressible_ViscoElasticity/viscoelastic_strip_with_hole.cc index b69a651..384a5e5 100644 --- a/Quasi_static_Finite_strain_Quasi_incompressible_ViscoElasticity/viscoelastic_strip_with_hole.cc +++ b/Quasi_static_Finite_strain_Quasi_incompressible_ViscoElasticity/viscoelastic_strip_with_hole.cc @@ -1318,7 +1318,7 @@ namespace ViscoElasStripHole SphericalManifold<2> spherical_manifold_2d (centre_2d); tria_2d_not_flat.set_manifold(10,spherical_manifold_2d); tria_2d_not_flat.refine_global(std::max (1U, n_repetitions_xy)); - tria_2d_not_flat.set_manifold(10); // Clear manifold + tria_2d_not_flat.reset_manifold(10); // Clear manifold GridGenerator::flatten_triangulation(tria_2d_not_flat,tria_2d); } diff --git a/goal_oriented_elastoplasticity/elastoplastic.cc b/goal_oriented_elastoplasticity/elastoplastic.cc index 6dd79f9..c6e84ad 100644 --- a/goal_oriented_elastoplasticity/elastoplastic.cc +++ b/goal_oriented_elastoplasticity/elastoplastic.cc @@ -3648,8 +3648,8 @@ namespace ElastoPlastic triangulation.refine_global(n_initial_global_refinements); - triangulation.set_manifold (0); - triangulation.set_manifold (1); + triangulation.reset_manifold (0); + triangulation.reset_manifold (1); } else if (base_mesh == "Perforated_strip_tension") @@ -3787,7 +3787,7 @@ namespace ElastoPlastic triangulation_2d.refine_global(3); - triangulation_2d.set_manifold (10); + triangulation_2d.reset_manifold (10); } // Extrude the triangulation_2d and make it 3d @@ -3868,7 +3868,7 @@ namespace ElastoPlastic triangulation.refine_global(n_initial_global_refinements); - triangulation.set_manifold (10); + triangulation.reset_manifold (10); } else if (base_mesh == "Cantiliver_beam_3d") @@ -4242,7 +4242,7 @@ namespace ElastoPlastic { TimerOutput::Scope t(computing_timer, "Assembling"); - types::boundary_id traction_surface_id; + types::boundary_id traction_surface_id = numbers::invalid_boundary_id; if (base_mesh == "Timoshenko beam") { traction_surface_id = 5; @@ -4255,6 +4255,10 @@ namespace ElastoPlastic { traction_surface_id = 2; } + else + { + AssertThrow(false, ExcNotImplemented()); + } FEValues fe_values(fe, quadrature_formula, update_values | update_gradients | @@ -4451,7 +4455,7 @@ namespace ElastoPlastic ElastoPlasticProblem:: compute_nonlinear_residual (const TrilinosWrappers::MPI::Vector &linearization_point) { - types::boundary_id traction_surface_id; + types::boundary_id traction_surface_id = numbers::invalid_boundary_id; if (base_mesh == "Timoshenko beam") { traction_surface_id = 5; @@ -4464,6 +4468,10 @@ namespace ElastoPlastic { traction_surface_id = 2; } + else + { + AssertThrow(false, ExcNotImplemented()); + } FEValues fe_values(fe, quadrature_formula, update_values | update_gradients | update_quadrature_points | @@ -6904,7 +6912,7 @@ namespace ElastoPlastic // table_results_3: Demonstrate the Stress_mean (average tensile stress) // on the bottom edge versus epsilon_yy on the bottom left corner { - double strain_yy_A; + double strain_yy_A = 0.; // compute strain_yy_A // Since the point A is the node on the bottom left corner, @@ -7216,12 +7224,12 @@ namespace ElastoPlastic if (base_mesh == "Thick_tube_internal_pressure") { - triangulation.set_manifold (0); - triangulation.set_manifold (1); + triangulation.reset_manifold (0); + triangulation.reset_manifold (1); } else if (base_mesh == "Perforated_strip_tension") { - triangulation.set_manifold (10); + triangulation.reset_manifold (10); } } -- 2.39.5