Modification of the getHeapMemorySize computation.

diff --git a/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx b/src/MEDCoupling/MEDCouplingFieldDiscretization.cxx
index 04dc709084582968cdcdc0acc67a4d18e314a0c1..9e493da4193914f18e2e07ed6f4de554cc7e0c4a 100644 (file)
--- 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<MEDCouplingGaussLocalization>::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 5906ffc8b391b4c16de184378dfc59fba2208b1e..8a1b574c13e2fd67cab5f74e99fbbc729bd5d3d0 100644 (file)
--- 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 d8559ebd9c24f140018c2f519753dbdebc5576be..865e92d008521cb743e6e116f075d2eb72ec3493 100644 (file)
--- 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<int>& tinyInfo) const;

diff --git a/src/MEDCoupling/MEDCouplingMemArrayChar.cxx b/src/MEDCoupling/MEDCouplingMemArrayChar.cxx
index c9cb325c0e2960f54c254c790b94a974d89dfe2e..dd029ed862240a10b5c92fb014720c389dcc07d3 100644 (file)
--- 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)
 {