From 47e76454766b3d00e16ca5891488ffc67cbedb4e Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Wed, 21 May 2014 09:37:19 +0000 Subject: [PATCH] errors in mg_renumbered_?? fixed git-svn-id: https://svn.dealii.org/trunk@32954 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/meshworker/vector_selector.h | 2 +- .../deal.II/meshworker/vector_selector.templates.h | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/deal.II/include/deal.II/meshworker/vector_selector.h b/deal.II/include/deal.II/meshworker/vector_selector.h index ff4d2e2fd4..e35975a1bb 100644 --- a/deal.II/include/deal.II/meshworker/vector_selector.h +++ b/deal.II/include/deal.II/meshworker/vector_selector.h @@ -373,7 +373,7 @@ namespace MeshWorker */ template class MGVectorData : - public VectorDataBase + public VectorData { public: /** diff --git a/deal.II/include/deal.II/meshworker/vector_selector.templates.h b/deal.II/include/deal.II/meshworker/vector_selector.templates.h index c48e19e25d..f367c3d06d 100644 --- a/deal.II/include/deal.II/meshworker/vector_selector.templates.h +++ b/deal.II/include/deal.II/meshworker/vector_selector.templates.h @@ -176,8 +176,8 @@ namespace MeshWorker template MGVectorData::MGVectorData(const VectorSelector &s) - : - VectorDataBase(s) + : + VectorData(s) {} @@ -241,16 +241,6 @@ namespace MeshWorker fe.get_function_hessians((*src)[level], make_slice(index, start, size), dst, true); } } - - - template - std::size_t - MGVectorData::memory_consumption () const - { - std::size_t mem = VectorSelector::memory_consumption(); - mem += sizeof (this->data); - return mem; - } } DEAL_II_NAMESPACE_CLOSE -- 2.39.5