From: heister Date: Sat, 3 Nov 2012 02:55:01 +0000 (+0000) Subject: merge from mainline X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6e306aec44aa5add1507b51e87bfe0212e1e4ff;p=dealii-svn.git merge from mainline git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@27326 0785d39b-7218-0410-832d-ea1e28bc413d --- a6e306aec44aa5add1507b51e87bfe0212e1e4ff diff --cc deal.II/examples/step-6/step-6.cc index 04902efdf7,90c31101f1..96fc8b84f1 --- a/deal.II/examples/step-6/step-6.cc +++ b/deal.II/examples/step-6/step-6.cc @@@ -153,15 -144,16 +153,16 @@@ class Step // This is the new variable in // the main class. We need an // object which holds a list of - // constraints originating from - // the hanging nodes: - ConstraintMatrix hanging_node_constraints; + // constraints to hold the + // hanging nodes and the + // boundary conditions. + ConstraintMatrix constraints; SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; + LA::SparseMatrix system_matrix; - Vector solution; - Vector system_rhs; + LA::Vector solution; + LA::Vector system_rhs; };