]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
merge from mainline
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 3 Nov 2012 02:55:01 +0000 (02:55 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 3 Nov 2012 02:55:01 +0000 (02:55 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@27326 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/examples/step-6/step-6.cc

index 04902efdf76f60e6efc259153c5efbed7e3160a4,90c31101f1eea8b92e110fd30b26d3d9d52d50bf..96fc8b84f11c9fbf83ec434400056bb8eed532aa
@@@ -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<double> system_matrix;
 +    LA::SparseMatrix system_matrix;
  
 -    Vector<double>       solution;
 -    Vector<double>       system_rhs;
 +    LA::Vector       solution;
 +    LA::Vector       system_rhs;
  };
  
  

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.