Undo Martin's patch 18223 for a moment since it leads to linker errors about an undef...

git-svn-id: https://svn.dealii.org/trunk@18244 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/deal.II/include/numerics/vectors.templates.h b/deal.II/deal.II/include/numerics/vectors.templates.h
index 6f4616b6d34a513af81843c1c4b8c7ad45686f17..c347cb5fa425c7a08d35f29f6c46cfac9dde205b 100644 (file)
--- a/deal.II/deal.II/include/numerics/vectors.templates.h
+++ b/deal.II/deal.II/include/numerics/vectors.templates.h
@@ -19,7 +19,6 @@
 #include <lac/vector.h>
 #include <lac/block_vector.h>
 #include <lac/sparse_matrix.h>
-#include <lac/compressed_simple_sparsity_pattern.h>
 #include <lac/precondition.h>
 #include <lac/solver_cg.h>
 #include <lac/vector_memory.h>
@@ -461,18 +460,12 @@ void VectorTools::project (const Mapping<dim, spacedim>       &mapping,
 
                                   // set up mass matrix and right hand side
   Vector<double> vec (dof.n_dofs());
-  SparsityPattern sparsity;
-
-                                  // use csp to consume less memory and to
-                                  // still be fast
-  {
-    CompressedSimpleSparsityPattern csp (dof.n_dofs(), dof.n_dofs());
-    DoFTools::make_sparsity_pattern (dof, csp);
-    constraints.condense(csp);
-
-    sparsity.copy_from (csp);
-  }
-
+  SparsityPattern sparsity(dof.n_dofs(),
+                          dof.n_dofs(),
+                          dof.max_couplings_between_dofs());
+  DoFTools::make_sparsity_pattern (dof, sparsity);
+  constraints.condense (sparsity);
+  
   SparseMatrix<double> mass_matrix (sparsity);
   Vector<double> tmp (mass_matrix.n());