X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingFieldOverTime.cxx;h=1a803cebee79e79bd3e8e8d0931370fb54371525;hb=4643866bcc351da857d08e9abce42aa58b6d6309;hp=20d5f283f054dce272ffbd80288d1c75c548d107;hpb=56fddf07c0b7170f79791d38e2b909a8a5b0b872;p=tools%2Fmedcoupling.git

diff --git a/src/MEDCoupling/MEDCouplingFieldOverTime.cxx b/src/MEDCoupling/MEDCouplingFieldOverTime.cxx
index 20d5f283f..1a803cebe 100644
--- a/src/MEDCoupling/MEDCouplingFieldOverTime.cxx
+++ b/src/MEDCoupling/MEDCouplingFieldOverTime.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -23,7 +23,7 @@
 
 #include <cmath>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingFieldOverTime *MEDCouplingFieldOverTime::New(const std::vector<MEDCouplingFieldDouble *>& fs)
 {
@@ -32,7 +32,7 @@ MEDCouplingFieldOverTime *MEDCouplingFieldOverTime::New(const std::vector<MEDCou
 
 double MEDCouplingFieldOverTime::getTimeTolerance() const
 {
-  std::vector< MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> >::const_iterator it=_fs.begin();
+  std::vector< MCAuto<MEDCouplingFieldDouble> >::const_iterator it=_fs.begin();
   if(_fs.empty())
     throw INTERP_KERNEL::Exception("MEDCouplingFieldOverTime::getTimeTolerance : empty set !");
   for(;it!=_fs.end();it++)
@@ -41,14 +41,14 @@ double MEDCouplingFieldOverTime::getTimeTolerance() const
   throw INTERP_KERNEL::Exception("MEDCouplingFieldOverTime::getTimeTolerance : only empty fields in this !");
 }
 
-void MEDCouplingFieldOverTime::checkCoherency() const
+void MEDCouplingFieldOverTime::checkConsistencyLight() const
 {
-  MEDCouplingMultiFields::checkCoherency();
-  std::vector< MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> >::const_iterator it=_fs.begin();
+  MEDCouplingMultiFields::checkConsistencyLight();
+  std::vector< MCAuto<MEDCouplingFieldDouble> >::const_iterator it=_fs.begin();
   for(;it!=_fs.end();it++)
     if((*it)->getTimeDiscretization()==NO_TIME)
       {
-        std::ostringstream oss; oss << "MEDCouplingFieldOverTime::checkCoherency : At rank #" << std::distance(_fs.begin(),it) << " the field has no time !";
+        std::ostringstream oss; oss << "MEDCouplingFieldOverTime::checkConsistencyLight : At rank #" << std::distance(_fs.begin(),it) << " the field has no time !";
         throw INTERP_KERNEL::Exception(oss.str().c_str());
       }
   if(_fs.empty())
@@ -68,7 +68,7 @@ void MEDCouplingFieldOverTime::checkCoherency() const
         }
       double curt=(*it)->getStartTime(tt1,tt2);
       if(curt<reft-eps)
-        throw INTERP_KERNEL::Exception("MEDCouplingFieldOverTime::checkCoherency : fields are NOT sorted properly in ascending time !");
+        throw INTERP_KERNEL::Exception("MEDCouplingFieldOverTime::checkConsistencyLight : fields are NOT sorted properly in ascending time !");
       reft=(*it)->getEndTime(tt1,tt2);
     }
 }
@@ -123,25 +123,25 @@ bool MEDCouplingFieldOverTime::isEqualWithoutConsideringStr(const MEDCouplingMul
 
 std::vector<MEDCouplingMesh *> MEDCouplingFieldOverTime::getMeshes() const
 {
-  checkCoherency();
+  checkConsistencyLight();
   return MEDCouplingMultiFields::getMeshes();
 }
 
 std::vector<MEDCouplingMesh *> MEDCouplingFieldOverTime::getDifferentMeshes(std::vector<int>& refs) const
 {
-  checkCoherency();
+  checkConsistencyLight();
   return MEDCouplingMultiFields::getDifferentMeshes(refs);
 }
 
 std::vector<DataArrayDouble *> MEDCouplingFieldOverTime::getArrays() const
 {
-  checkCoherency();
+  checkConsistencyLight();
   return MEDCouplingMultiFields::getArrays();
 }
 
 std::vector<DataArrayDouble *> MEDCouplingFieldOverTime::getDifferentArrays(std::vector< std::vector<int> >& refs) const
 {
-  checkCoherency();
+  checkConsistencyLight();
   return MEDCouplingMultiFields::getDifferentArrays(refs);
 }
 
@@ -157,7 +157,7 @@ MEDCouplingDefinitionTime MEDCouplingFieldOverTime::getDefinitionTimeZone() cons
 
 MEDCouplingFieldOverTime::MEDCouplingFieldOverTime(const std::vector<MEDCouplingFieldDouble *>& fs):MEDCouplingMultiFields(fs)
 {
-  checkCoherency();
+  checkConsistencyLight();
 }
 
 MEDCouplingFieldOverTime::MEDCouplingFieldOverTime()