From 12d24f4e1c8bad56e47c140de06cf657891c9ba7 Mon Sep 17 00:00:00 2001 From: kanschat Date: Fri, 21 Sep 2007 19:08:59 +0000 Subject: [PATCH] return to old behavior git-svn-id: https://svn.dealii.org/trunk@15231 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/vector_memory.h | 10 ++++++---- deal.II/lac/source/vector_memory.cc | 9 +++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/deal.II/lac/include/lac/vector_memory.h b/deal.II/lac/include/lac/vector_memory.h index 852eb042f6..0210ba93ce 100644 --- a/deal.II/lac/include/lac/vector_memory.h +++ b/deal.II/lac/include/lac/vector_memory.h @@ -215,7 +215,7 @@ class PrimitiveVectorMemory : public VectorMemory * earliest possible time and may therefore lead to an increased * overall memory consumption. * - * @author Guido Kanschat, 1999 + * @author Guido Kanschat, 1999, 2007 */ template > class GrowingVectorMemory : public VectorMemory @@ -227,7 +227,8 @@ class GrowingVectorMemory : public VectorMemory * certain number of vectors. The * default is not to do this. */ - GrowingVectorMemory (const unsigned int initial_size = 0); + GrowingVectorMemory (const unsigned int initial_size = 0, + const bool log_statistics = true); /** * Destructor. @@ -321,9 +322,10 @@ class GrowingVectorMemory : public VectorMemory template -GrowingVectorMemory::GrowingVectorMemory (const unsigned int initial_size) +GrowingVectorMemory::GrowingVectorMemory (const unsigned int initial_size, + const bool log_statistics) : - log_statistics(false), + log_statistics(log_statistics), pool(initial_size) { Threads::ThreadMutex::ScopedLock lock(mutex); diff --git a/deal.II/lac/source/vector_memory.cc b/deal.II/lac/source/vector_memory.cc index d77f5b1198..f47f12a2ac 100644 --- a/deal.II/lac/source/vector_memory.cc +++ b/deal.II/lac/source/vector_memory.cc @@ -21,10 +21,11 @@ DEAL_II_NAMESPACE_OPEN namespace { - GrowingVectorMemory > default_pool_Vector_double; - GrowingVectorMemory > default_pool_Vector_float; - GrowingVectorMemory > default_pool_BlockVector_double; - GrowingVectorMemory > default_pool_BlockVector_float; + GrowingVectorMemory > default_pool_Vector_double(0, false); + GrowingVectorMemory > default_pool_Vector_float(0, false); + GrowingVectorMemory > default_pool_BlockVector_double(0, false); + GrowingVectorMemory > default_pool_BlockVector_float(0, false); + template inline -- 2.39.5