From: Martin Kronbichler Date: Thu, 4 Feb 2010 15:11:54 +0000 (+0000) Subject: Express memory consumption in std::size_t since this can be quite large numbers. X-Git-Tag: v8.0.0~6551 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5808e99ea6b46082e31e00884dfc75e8848954f;p=dealii.git Express memory consumption in std::size_t since this can be quite large numbers. git-svn-id: https://svn.dealii.org/trunk@20496 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/sparsity_pattern.h b/deal.II/lac/include/lac/sparsity_pattern.h index d0cc5182f9..1b60e216b3 100644 --- a/deal.II/lac/include/lac/sparsity_pattern.h +++ b/deal.II/lac/include/lac/sparsity_pattern.h @@ -1161,7 +1161,7 @@ class SparsityPattern : public Subscriptor * matrix struct is compressed. It does not * make too much sense otherwise anyway. */ - unsigned int n_nonzero_elements () const; + std::size_t n_nonzero_elements () const; /** * Return whether the structure is @@ -1379,7 +1379,7 @@ class SparsityPattern : public Subscriptor * of this object. See * MemoryConsumption. */ - unsigned int memory_consumption () const; + std::size_t memory_consumption () const; /** * This is kind of an expert mode. Get @@ -2010,7 +2010,7 @@ SparsityPattern::column_number (const unsigned int row, inline -unsigned int +std::size_t SparsityPattern::n_nonzero_elements () const { Assert ((rowstart!=0) && (colnums!=0), ExcEmptyObject()); diff --git a/deal.II/lac/source/sparsity_pattern.cc b/deal.II/lac/source/sparsity_pattern.cc index 6fed1e7b8a..7ce2b210cc 100644 --- a/deal.II/lac/source/sparsity_pattern.cc +++ b/deal.II/lac/source/sparsity_pattern.cc @@ -1030,11 +1030,11 @@ SparsityPattern::block_read (std::istream &in) -unsigned int +std::size_t SparsityPattern::memory_consumption () const { - return (sizeof(*this) + - max_dim * sizeof(unsigned int) + + return (max_dim * static_cast(sizeof(unsigned int)) + + sizeof(*this) + max_vec_len * sizeof(unsigned int)); }