From 8cae133b778c741445fd20f2a86fda4343cf1acb Mon Sep 17 00:00:00 2001 From: ageay Date: Wed, 21 Aug 2013 14:07:06 +0000 Subject: [PATCH] Modification of the getHeapMemorySize computation. --- src/MEDCoupling/MEDCouplingFieldDiscretization.cxx | 2 +- src/MEDCoupling/MEDCouplingGaussLocalization.cxx | 2 +- src/MEDCoupling/MEDCouplingGaussLocalization.hxx | 2 +- src/MEDCoupling/MEDCouplingMemArrayChar.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx b/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx index 04dc70908..9e493da41 100644 --- a/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx +++ b/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx @@ -1323,7 +1323,7 @@ std::size_t MEDCouplingFieldDiscretizationGauss::getHeapMemorySizeWithoutChildre std::size_t ret(MEDCouplingFieldDiscretizationPerCell::getHeapMemorySizeWithoutChildren()); ret+=_loc.capacity()*sizeof(MEDCouplingGaussLocalization); for(std::vector::const_iterator it=_loc.begin();it!=_loc.end();it++) - ret+=(*it).getHeapMemorySize(); + ret+=(*it).getMemorySize(); return ret; } diff --git a/src/MEDCoupling/MEDCouplingGaussLocalization.cxx b/src/MEDCoupling/MEDCouplingGaussLocalization.cxx index 5906ffc8b..8a1b574c1 100644 --- a/src/MEDCoupling/MEDCouplingGaussLocalization.cxx +++ b/src/MEDCoupling/MEDCouplingGaussLocalization.cxx @@ -104,7 +104,7 @@ std::string ParaMEDMEM::MEDCouplingGaussLocalization::getStringRepr() const return oss.str(); } -std::size_t ParaMEDMEM::MEDCouplingGaussLocalization::getHeapMemorySize() const +std::size_t ParaMEDMEM::MEDCouplingGaussLocalization::getMemorySize() const { std::size_t ret=0; ret+=_ref_coord.capacity()*sizeof(double); diff --git a/src/MEDCoupling/MEDCouplingGaussLocalization.hxx b/src/MEDCoupling/MEDCouplingGaussLocalization.hxx index d8559ebd9..865e92d00 100644 --- a/src/MEDCoupling/MEDCouplingGaussLocalization.hxx +++ b/src/MEDCoupling/MEDCouplingGaussLocalization.hxx @@ -43,7 +43,7 @@ namespace ParaMEDMEM int getDimension() const; int getNumberOfPtsInRefCell() const; std::string getStringRepr() const; - std::size_t getHeapMemorySize() const; + std::size_t getMemorySize() const; void checkCoherency() const throw(INTERP_KERNEL::Exception); bool isEqual(const MEDCouplingGaussLocalization& other, double eps) const; void pushTinySerializationIntInfo(std::vector& tinyInfo) const; diff --git a/src/MEDCoupling/MEDCouplingMemArrayChar.cxx b/src/MEDCoupling/MEDCouplingMemArrayChar.cxx index c9cb325c0..dd029ed86 100644 --- a/src/MEDCoupling/MEDCouplingMemArrayChar.cxx +++ b/src/MEDCoupling/MEDCouplingMemArrayChar.cxx @@ -204,7 +204,7 @@ char DataArrayChar::popBackSilent() throw(INTERP_KERNEL::Exception) /*! * This method \b do \b not modify content of \a this. It only modify its memory footprint if the allocated memory is to high regarding real data to store. * - * \sa DataArrayChar::getHeapMemorySize, DataArrayChar::reserve + * \sa DataArrayChar::getHeapMemorySizeWithoutChildren, DataArrayChar::reserve */ void DataArrayChar::pack() const throw(INTERP_KERNEL::Exception) { -- 2.39.2