From f10b6325426b02ea11219ac358626d6906a93a98 Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 20 Aug 2012 19:18:35 +0000 Subject: [PATCH] Get rid of some piece of old code that isn't used any more according to Guido. git-svn-id: https://svn.dealii.org/trunk@26041 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/multigrid/mg_transfer.h | 9 ++------- .../include/deal.II/multigrid/mg_transfer.templates.h | 9 ++------- deal.II/include/deal.II/multigrid/mg_transfer_block.h | 9 ++------- .../include/deal.II/multigrid/mg_transfer_component.h | 9 ++------- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/deal.II/include/deal.II/multigrid/mg_transfer.h b/deal.II/include/deal.II/multigrid/mg_transfer.h index e4ae4006e3..926557ff79 100644 --- a/deal.II/include/deal.II/multigrid/mg_transfer.h +++ b/deal.II/include/deal.II/multigrid/mg_transfer.h @@ -16,13 +16,8 @@ #include #include -#ifdef DEAL_PREFER_MATRIX_EZ -# include -# include -#else -# include -# include -#endif +#include +#include #include #include diff --git a/deal.II/include/deal.II/multigrid/mg_transfer.templates.h b/deal.II/include/deal.II/multigrid/mg_transfer.templates.h index f8bbd96542..94b82212dc 100644 --- a/deal.II/include/deal.II/multigrid/mg_transfer.templates.h +++ b/deal.II/include/deal.II/multigrid/mg_transfer.templates.h @@ -215,16 +215,11 @@ MGTransferPrebuilt::memory_consumption () const { std::size_t result = sizeof(*this); result += sizeof(unsigned int) * sizes.size(); -#ifdef DEAL_PREFER_MATRIX_EZ - std::vector > >::const_iterator m; - const std::vector > >::const_iterator end = prolongation_matrices.end(); - for (m = prolongation_matrices.begin(); m != end ; ++m) - result += *m->memory_consumption(); -#else + for (unsigned int i=0;imemory_consumption() + prolongation_sparsities[i]->memory_consumption(); -#endif + return result; } diff --git a/deal.II/include/deal.II/multigrid/mg_transfer_block.h b/deal.II/include/deal.II/multigrid/mg_transfer_block.h index 3f4b19a219..bcb3016897 100644 --- a/deal.II/include/deal.II/multigrid/mg_transfer_block.h +++ b/deal.II/include/deal.II/multigrid/mg_transfer_block.h @@ -15,13 +15,8 @@ #include #include -#ifdef DEAL_PREFER_MATRIX_EZ -# include -# include -#else -# include -# include -#endif +#include +#include #include #include diff --git a/deal.II/include/deal.II/multigrid/mg_transfer_component.h b/deal.II/include/deal.II/multigrid/mg_transfer_component.h index 6c602e098c..c6308d6565 100644 --- a/deal.II/include/deal.II/multigrid/mg_transfer_component.h +++ b/deal.II/include/deal.II/multigrid/mg_transfer_component.h @@ -16,13 +16,8 @@ #include #include -#ifdef DEAL_PREFER_MATRIX_EZ -# include -# include -#else -# include -# include -#endif +#include +#include #include #include -- 2.39.5