From 0f0673db6ea6c6eab9b9be836b8603f585fc1e83 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 21 Jun 2019 17:07:43 -0600 Subject: [PATCH] Avoid deprecated stuff. --- .../elastoplastic.cc | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/goal_oriented_elastoplasticity/elastoplastic.cc b/goal_oriented_elastoplasticity/elastoplastic.cc index 0eabcef..38da377 100644 --- a/goal_oriented_elastoplasticity/elastoplastic.cc +++ b/goal_oriented_elastoplasticity/elastoplastic.cc @@ -56,7 +56,6 @@ #include #include #include -#include #include #include @@ -2395,37 +2394,37 @@ namespace ElastoPlastic void output_results (); const FESystem &fe; - DoFHandler dof_handler; - const Vector solution; + DoFHandler dof_handler; + const Vector solution; - const unsigned int fe_degree; + const unsigned int fe_degree; - const unsigned int fe_degree_dual; - FESystem fe_dual; - DoFHandler dof_handler_dual; + const unsigned int fe_degree_dual; + FESystem fe_dual; + DoFHandler dof_handler_dual; - const QGauss quadrature_formula; - const QGauss face_quadrature_formula; + const QGauss quadrature_formula; + const QGauss face_quadrature_formula; - AffineConstraints constraints_hanging_nodes_dual; - AffineConstraints constraints_dirichlet_and_hanging_nodes_dual; + AffineConstraints constraints_hanging_nodes_dual; + AffineConstraints constraints_dirichlet_and_hanging_nodes_dual; - SparsityPattern sparsity_pattern_dual; - SparseMatrix system_matrix_dual; - Vector system_rhs_dual; - Vector solution_dual; + SparsityPattern sparsity_pattern_dual; + SparseMatrix system_matrix_dual; + Vector system_rhs_dual; + Vector solution_dual; const ConstitutiveLaw constitutive_law; const SmartPointer > triangulation; const SmartPointer > dual_functional; - unsigned int timestep_no; - std::string output_dir; - const std::string base_mesh; - double present_time; - double end_time; + unsigned int timestep_no; + std::string output_dir; + const std::string base_mesh; + double present_time; + double end_time; }; @@ -4904,7 +4903,7 @@ namespace ElastoPlastic KellyErrorEstimator::estimate(dof_handler, QGauss(fe.degree + 2), - FunctionMap(), + std::map *>(), tmp_solution, estimated_error_per_cell); -- 2.39.5