]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Get rid of some piece of old code that isn't used any more according to Guido.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 20 Aug 2012 19:18:35 +0000 (19:18 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 20 Aug 2012 19:18:35 +0000 (19:18 +0000)
git-svn-id: https://svn.dealii.org/trunk@26041 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/multigrid/mg_transfer.h
deal.II/include/deal.II/multigrid/mg_transfer.templates.h
deal.II/include/deal.II/multigrid/mg_transfer_block.h
deal.II/include/deal.II/multigrid/mg_transfer_component.h

index e4ae4006e3a93e0c9c80b3e82cc169cd6bcd0249..926557ff794b28fbf1cedab87b76232e3efacd90 100644 (file)
 
 #include <deal.II/lac/block_vector.h>
 #include <deal.II/lac/constraint_matrix.h>
-#ifdef DEAL_PREFER_MATRIX_EZ
-#  include <deal.II/lac/sparse_matrix_ez.h>
-#  include <deal.II/lac/block_sparse_matrix_ez.h>
-#else
-#  include <deal.II/lac/sparsity_pattern.h>
-#  include <deal.II/lac/block_sparsity_pattern.h>
-#endif
+#include <deal.II/lac/sparsity_pattern.h>
+#include <deal.II/lac/block_sparsity_pattern.h>
 #include <deal.II/lac/vector_memory.h>
 
 #include <deal.II/multigrid/mg_base.h>
index f8bbd965428fa0799ad91c8261c34dea4c68f722..94b82212dc953478024c25355a4acaaeb5f39ff1 100644 (file)
@@ -215,16 +215,11 @@ MGTransferPrebuilt<VECTOR>::memory_consumption () const
 {
   std::size_t result = sizeof(*this);
   result += sizeof(unsigned int) * sizes.size();
-#ifdef DEAL_PREFER_MATRIX_EZ
-  std::vector<std_cxx1x::shared_ptr<SparseMatrixEZ<double> > >::const_iterator m;
-  const std::vector<std_cxx1x::shared_ptr<SparseMatrixEZ<double> > >::const_iterator end = prolongation_matrices.end();
-  for (m = prolongation_matrices.begin(); m != end ; ++m)
-    result += *m->memory_consumption();
-#else
+
   for (unsigned int i=0;i<prolongation_matrices.size();++i)
     result += prolongation_matrices[i]->memory_consumption()
               + prolongation_sparsities[i]->memory_consumption();
-#endif
+
   return result;
 }
 
index 3f4b19a2197debdbc31d0cab9f76b0a8d4de9e69..bcb3016897de92669de2fe904fe4ed538b9dc962 100644 (file)
 #include <deal.II/base/config.h>
 
 #include <deal.II/lac/block_vector.h>
-#ifdef DEAL_PREFER_MATRIX_EZ
-#  include <deal.II/lac/sparse_matrix_ez.h>
-#  include <deal.II/lac/block_sparse_matrix_ez.h>
-#else
-#  include <deal.II/lac/sparsity_pattern.h>
-#  include <deal.II/lac/block_sparsity_pattern.h>
-#endif
+#include <deal.II/lac/sparsity_pattern.h>
+#include <deal.II/lac/block_sparsity_pattern.h>
 #include <deal.II/lac/vector_memory.h>
 #include <deal.II/lac/block_matrix_array.h>
 
index 6c602e098ce37c3539292812edbf6b8108396460..c6308d6565d2f69051c151cb58f01ff7e33cc3c4 100644 (file)
 
 #include <deal.II/lac/block_vector.h>
 #include <deal.II/lac/constraint_matrix.h>
-#ifdef DEAL_PREFER_MATRIX_EZ
-#  include <deal.II/lac/sparse_matrix_ez.h>
-#  include <deal.II/lac/block_sparse_matrix_ez.h>
-#else
-#  include <deal.II/lac/sparsity_pattern.h>
-#  include <deal.II/lac/block_sparsity_pattern.h>
-#endif
+#include <deal.II/lac/sparsity_pattern.h>
+#include <deal.II/lac/block_sparsity_pattern.h>
 #include <deal.II/lac/vector_memory.h>
 
 #include <deal.II/multigrid/mg_base.h>

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.