merge from mainline

git-svn-id: https://svn.dealii.org/branches/branch_merge_mg_into_dof_handler@27818 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/examples/step-46/step-46.cc
Simple merge

diff --cc deal.II/include/deal.II/base/geometry_info.h
Simple merge

diff --cc deal.II/include/deal.II/base/utilities.h
Simple merge

diff --cc deal.II/include/deal.II/dofs/dof_tools.h
Simple merge

diff --cc deal.II/include/deal.II/lac/constraint_matrix.h
Simple merge

diff --cc deal.II/include/deal.II/lac/constraint_matrix.templates.h
Simple merge

diff --cc deal.II/include/deal.II/lac/petsc_solver.h
Simple merge

diff --cc deal.II/include/deal.II/lac/sparse_matrix.h
index 2d77baf4b07cf90e345a5c6163670ade067765e9,9092530630d276188d6485fcd872cb3cc43cd90b..add3c011084623a5b5994703b42e44a6af36bb81
--- 1/deal.II/include/deal.II/lac/sparse_matrix.h
--- 2/deal.II/include/deal.II/lac/sparse_matrix.h
+++ b/deal.II/include/deal.II/lac/sparse_matrix.h
@@@ -610,24 -484,17 +484,17 @@@ public
    explicit SparseMatrix (const SparsityPattern &sparsity);
  
    /**
-    * Copy constructor: initialize
-    * the matrix with the identity
-    * matrix. This constructor will
-    * throw an exception if the
-    * sizes of the sparsity pattern
-    * and the identity matrix do not
-    * coincide, or if the sparsity
-    * pattern does not provide for
-    * nonzero entries on the entire
-    * diagonal.
+    * Copy constructor: initialize the matrix with the identity matrix. This
+    * constructor will throw an exception if the sizes of the sparsity pattern
+    * and the identity matrix do not coincide, or if the sparsity pattern does
+    * not provide for nonzero entries on the entire diagonal.
     */
    SparseMatrix (const SparsityPattern &sparsity,
 -                const IdentityMatrix &id);
 +                const IdentityMatrix  &id);
  
    /**
-    * Destructor. Free all memory, but do not
-    * release the memory of the sparsity
-    * structure.
+    * Destructor. Free all memory, but do not release the memory of the
+    * sparsity structure.
     */
    virtual ~SparseMatrix ();
  
@@@ -653,34 -510,21 +510,21 @@@
    SparseMatrix<number> &operator = (const SparseMatrix<number> &);
  
    /**
-    * Copy operator: initialize
-    * the matrix with the identity
-    * matrix. This operator will
-    * throw an exception if the
-    * sizes of the sparsity pattern
-    * and the identity matrix do not
-    * coincide, or if the sparsity
-    * pattern does not provide for
-    * nonzero entries on the entire
-    * diagonal.
+    * Copy operator: initialize the matrix with the identity matrix. This
+    * operator will throw an exception if the sizes of the sparsity pattern and
+    * the identity matrix do not coincide, or if the sparsity pattern does not
+    * provide for nonzero entries on the entire diagonal.
     */
    SparseMatrix<number> &
 -  operator= (const IdentityMatrix &id);
 +  operator= (const IdentityMatrix  &id);
  
    /**
-    * This operator assigns a scalar to
-    * a matrix. Since this does usually
-    * not make much sense (should we set
-    * all matrix entries to this value?
-    * Only the nonzero entries of the
-    * sparsity pattern?), this operation
-    * is only allowed if the actual
-    * value to be assigned is zero. This
-    * operator only exists to allow for
-    * the obvious notation
-    * <tt>matrix=0</tt>, which sets all
-    * elements of the matrix to zero,
-    * but keep the sparsity pattern
+    * This operator assigns a scalar to a matrix. Since this does usually not
+    * make much sense (should we set all matrix entries to this value?  Only
+    * the nonzero entries of the sparsity pattern?), this operation is only
+    * allowed if the actual value to be assigned is zero. This operator only
+    * exists to allow for the obvious notation <tt>matrix=0</tt>, which sets
+    * all elements of the matrix to zero, but keep the sparsity pattern
     * previously used.
     */
    SparseMatrix &operator = (const double d);

diff --cc deal.II/include/deal.II/lac/sparse_matrix.templates.h
Simple merge

diff --cc deal.II/include/deal.II/lac/sparsity_pattern.h
index 0eb882880764b2fe639310ad2c8cf7dcbc7d89da,fe87da3f19aa9e2ca5ab68655ccd57e9bb229187..5c13c278e0a3e4d85157a750afcafc4e68f608a1
--- 1/deal.II/include/deal.II/lac/sparsity_pattern.h
--- 2/deal.II/include/deal.II/lac/sparsity_pattern.h
+++ b/deal.II/include/deal.II/lac/sparsity_pattern.h
@@@ -496,46 -385,26 +385,26 @@@ public
    /**
     * Make a copy with extra off-diagonals.
     *
-    * This constructs objects intended for
-    * the application of the ILU(n)-method
-    * or other incomplete decompositions.
-    * Therefore, additional to the original
-    * entry structure, space for
-    * <tt>extra_off_diagonals</tt>
-    * side-diagonals is provided on both
-    * sides of the main diagonal.
-    *
-    * <tt>max_per_row</tt> is the
-    * maximum number of nonzero
-    * elements per row which this
-    * structure is to hold. It is
-    * assumed that this number is
-    * sufficiently large to
-    * accommodate both the elements
-    * in <tt>original</tt> as well
-    * as the new off-diagonal
-    * elements created by this
-    * constructor. You will usually
-    * want to give the same number
-    * as you gave for
-    * <tt>original</tt> plus the
-    * number of side diagonals times
-    * two. You may however give a
-    * larger value if you wish to
-    * add further nonzero entries
-    * for the decomposition based on
-    * other criteria than their
-    * being on side-diagonals.
-    *
-    * This function requires that
-    * <tt>original</tt> refers to a
-    * quadratic matrix structure.
-    * It must be compressed. The
-    * matrix structure is not
-    * compressed after this function
-    * finishes.
+    * This constructs objects intended for the application of the ILU(n)-method
+    * or other incomplete decompositions.  Therefore, additional to the
+    * original entry structure, space for <tt>extra_off_diagonals</tt>
+    * side-diagonals is provided on both sides of the main diagonal.
+    *
+    * <tt>max_per_row</tt> is the maximum number of nonzero elements per row
+    * which this structure is to hold. It is assumed that this number is
+    * sufficiently large to accommodate both the elements in <tt>original</tt>
+    * as well as the new off-diagonal elements created by this constructor. You
+    * will usually want to give the same number as you gave for
+    * <tt>original</tt> plus the number of side diagonals times two. You may
+    * however give a larger value if you wish to add further nonzero entries
+    * for the decomposition based on other criteria than their being on
+    * side-diagonals.
+    *
+    * This function requires that <tt>original</tt> refers to a quadratic
+    * matrix structure.  It must be compressed. The matrix structure is not
+    * compressed after this function finishes.
     */
 -  SparsityPattern (const SparsityPattern &original,
 +  SparsityPattern (const SparsityPattern  &original,
                     const unsigned int      max_per_row,
                     const unsigned int      extra_off_diagonals);
  

diff --cc deal.II/include/deal.II/lac/vector.templates.h
Simple merge

diff --cc deal.II/include/deal.II/matrix_free/fe_evaluation.h
Simple merge

diff --cc deal.II/include/deal.II/numerics/vector_tools.templates.h
Simple merge

diff --cc deal.II/source/dofs/dof_handler_policy.cc
Simple merge

diff --cc deal.II/source/dofs/dof_tools.cc
index cd9d434d1ab9e317d3ecb43858e4febd3f2c6d27,619d4788148682a3eb4f0694edce35abc7f9c417..d813b2a3e0aa43a3518bb4d991675446ffcdf631
--- 1/deal.II/source/dofs/dof_tools.cc
--- 2/deal.II/source/dofs/dof_tools.cc
+++ b/deal.II/source/dofs/dof_tools.cc
@@@ -1947,28 -1781,26 +1781,26 @@@ namespace DoFTool
  
  
      void
 -    make_hp_hanging_node_constraints (const dealii::hp::DoFHandler<1> & /*dof_handler*/,
 -                                      ConstraintMatrix &        /*constraints*/)
 +    make_hp_hanging_node_constraints (const dealii::hp::DoFHandler<1> &/*dof_handler*/,
 +                                      ConstraintMatrix        &/*constraints*/)
      {
-       // we may have to compute
-       // constraints for
-       // vertices. gotta think about
+       // we may have to compute constraints for vertices. gotta think about
        // that a bit more
- //TODO[WB]: think about what to do here...
+ 
+       //TODO[WB]: think about what to do here...
      }
  
  
  
      void
 -    make_oldstyle_hanging_node_constraints (const dealii::hp::DoFHandler<1> & /*dof_handler*/,
 -                                            ConstraintMatrix &        /*constraints*/,
 +    make_oldstyle_hanging_node_constraints (const dealii::hp::DoFHandler<1> &/*dof_handler*/,
 +                                            ConstraintMatrix        &/*constraints*/,
                                              dealii::internal::int2type<1>)
      {
-       // we may have to compute
-       // constraints for
-       // vertices. gotta think about
+       // we may have to compute constraints for vertices. gotta think about
        // that a bit more
- //TODO[WB]: think about what to do here...
+ 
+       //TODO[WB]: think about what to do here...
      }
  
  
@@@ -4112,10 -3573,9 +3573,9 @@@
      for (unsigned int i=0; i<fe.dofs_per_cell; ++i)
        local_selected_dofs[i] = component_mask[local_component_asssociation[i]];
  
-     // then loop over all cells and do
-     // work
+     // then loop over all cells and do work
      std::vector<unsigned int> indices(fe.dofs_per_cell);
 -    typename MGDoFHandler<dim,spacedim>::cell_iterator c;
 +    typename DH::cell_iterator c;
      for (c = dof.begin(level) ; c != dof.end(level) ; ++ c)
        {
          c->get_mg_dof_indices(indices);

diff --cc deal.II/source/fe/fe_system.cc
Simple merge

diff --cc deal.II/source/grid/grid_tools.cc
Simple merge

diff --cc deal.II/source/lac/constraint_matrix.cc
Simple merge

diff --cc deal.II/source/lac/petsc_solver.cc
Simple merge

diff --cc deal.II/source/lac/trilinos_sparse_matrix.cc
Simple merge