From 5c9fd611c6e1005c6bef613b4964ee8b262ccfd5 Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 1 Jul 2010 16:54:24 +0000 Subject: [PATCH] Take over patch 21431 from mainline. git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-3@21432 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/block_info.h | 35 ++++++++++++++++------- deal.II/deal.II/source/dofs/block_info.cc | 15 ---------- deal.II/deal.II/source/grid/tria.cc | 6 ++++ deal.II/doc/news/changes.h | 18 +++++++++--- 4 files changed, 45 insertions(+), 29 deletions(-) diff --git a/deal.II/deal.II/include/dofs/block_info.h b/deal.II/deal.II/include/dofs/block_info.h index b9054d4dd0..3cde99c259 100644 --- a/deal.II/deal.II/include/dofs/block_info.h +++ b/deal.II/deal.II/include/dofs/block_info.h @@ -14,6 +14,7 @@ #define __deal2__block_info_h #include +#include #include DEAL_II_NAMESPACE_OPEN @@ -97,7 +98,7 @@ class BlockInfo : public Subscriptor */ template void initialize(const DoFHandler&); - + /** * @brief Fill the object with values * describing level block @@ -112,7 +113,7 @@ class BlockInfo : public Subscriptor */ template void initialize(const MGDoFHandler&, bool levels_only = false); - + /** * @brief Initialize block structure * on cells and compute @@ -121,20 +122,20 @@ class BlockInfo : public Subscriptor */ template void initialize_local(const DoFHandler&); - + /** * Access the BlockIndices * structure of the global * system. */ const BlockIndices& global() const; - + /** * Access BlockIndices for the * local system on a cell. */ const BlockIndices& local() const; - + /** * Access the BlockIndices * structure of a level in the @@ -164,13 +165,13 @@ class BlockInfo : public Subscriptor * The number of base elements. */ unsigned int n_base_elements() const; - + /** * Return the base element of * this index. */ unsigned int base_element(unsigned int i) const; - + /** * Determine an estimate for the * memory consumption (in bytes) @@ -188,19 +189,19 @@ class BlockInfo : public Subscriptor * @brief The multilevel block structure. */ std::vector levels; - + /** * @brief The block structure * of the cell systems. */ BlockIndices bi_local; - + /** * The base element associated * with each block. */ std::vector base_elements; - + /** * A vector containing the * renumbering from the @@ -269,6 +270,20 @@ BlockInfo::n_base_elements() const +inline +unsigned int +BlockInfo::memory_consumption () const +{ + unsigned int mem = (MemoryConsumption::memory_consumption (bi_global) + + MemoryConsumption::memory_consumption (levels) + + MemoryConsumption::memory_consumption (bi_local) + + MemoryConsumption::memory_consumption (base_elements) + ); + + return mem; +} + + DEAL_II_NAMESPACE_CLOSE #endif diff --git a/deal.II/deal.II/source/dofs/block_info.cc b/deal.II/deal.II/source/dofs/block_info.cc index 2c17677374..e3b2991c6f 100644 --- a/deal.II/deal.II/source/dofs/block_info.cc +++ b/deal.II/deal.II/source/dofs/block_info.cc @@ -12,7 +12,6 @@ //--------------------------------------------------------------------------- -#include #include #include #include @@ -73,20 +72,6 @@ BlockInfo::initialize(const MGDoFHandler& dof, bool levels_only) } -unsigned int -BlockInfo::memory_consumption () const -{ - unsigned int mem = (MemoryConsumption::memory_consumption (bi_global) + - MemoryConsumption::memory_consumption (levels) + - MemoryConsumption::memory_consumption (bi_local) + - MemoryConsumption::memory_consumption (base_elements) - ); - - return mem; -} - - - template void BlockInfo::initialize(const DoFHandler&); template void BlockInfo::initialize(const MGDoFHandler&, bool); template void BlockInfo::initialize_local(const DoFHandler&); diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index 24aa7f2986..06cbc43b94 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -11458,6 +11458,7 @@ namespace internal { namespace Triangulation { + inline unsigned int n_cells (const internal::Triangulation::NumberCache<1> &c) { @@ -11465,6 +11466,7 @@ namespace internal } + inline unsigned int n_active_cells (const internal::Triangulation::NumberCache<1> &c) { @@ -11472,6 +11474,7 @@ namespace internal } + inline unsigned int n_cells (const internal::Triangulation::NumberCache<2> &c) { @@ -11479,6 +11482,7 @@ namespace internal } + inline unsigned int n_active_cells (const internal::Triangulation::NumberCache<2> &c) { @@ -11486,6 +11490,7 @@ namespace internal } + inline unsigned int n_cells (const internal::Triangulation::NumberCache<3> &c) { @@ -11493,6 +11498,7 @@ namespace internal } + inline unsigned int n_active_cells (const internal::Triangulation::NumberCache<3> &c) { diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index c1ef366600..81c4d4e8c2 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -38,6 +38,16 @@ inconvenience this causes.

General

    +
  1. +

    Fixed: Linking with more than one of the deal.II 1d, 2d, or 3d libraries + when using static libraries did not work. This is now fixed. However, due to + GCC bug 10591, GCC versions prior to and including 4.1.x will + still not work. +
    + (WB 2010/07/01) +

    +

  2. Fixed: GCC version 4.0.1 had a bug that prevented it from compiling release 6.3.0 because it apparently had an infinite loop allocating @@ -46,7 +56,7 @@ inconvenience this causes. this GCC version in their Xcode environment.
    (WB 2010/06/30) -

    +

  3. Fixed: Configuring with an external BOOST version did not work when @@ -54,7 +64,7 @@ inconvenience this causes. to another configure test. This is now fixed.
    (Bradley Froehle 2010/06/29) -

    +

@@ -77,7 +87,7 @@ inconvenience this causes. 10.0. This is now fixed.
(Martin Kronbichler, WB 2010/06/28) -

+

@@ -92,7 +102,7 @@ inconvenience this causes. This is now fixed.
(WB 2010/06/28) -

+

-- 2.39.5