X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEM%2FOverlapInterpolationMatrix.cxx;h=6fdc35ff7e28c25e95ec03e84eb8a2e87e2f5a9c;hb=7e632de173a3f7701ed288471c5de2bc0f55dbc3;hp=9be3646f257cd437121b5cd02616166a059f9b87;hpb=d40f0fdb4e67ed8a7c910935954c546290e2b732;p=tools%2Fmedcoupling.git

diff --git a/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx b/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx
index 9be3646f2..6fdc35ff7 100644
--- a/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx
+++ b/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016  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
@@ -42,7 +42,7 @@
 
 using namespace std;
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   OverlapInterpolationMatrix::OverlapInterpolationMatrix(ParaFIELD *source_field,
                                                          ParaFIELD *target_field,
@@ -257,14 +257,14 @@ namespace ParaMEDMEM
 
   void OverlapInterpolationMatrix::computeSurfacesAndDeno()
   {
-    if(_target_field->getField()->getNature()==ConservativeVolumic)
+    if(_target_field->getField()->getNature()==IntensiveMaximum)
       _mapping.computeDenoConservativeVolumic(_target_field->getField()->getNumberOfTuplesExpected());
     else
-      throw INTERP_KERNEL::Exception("OverlapDEC: Policy not implemented yet: only ConservativeVolumic!");
+      throw INTERP_KERNEL::Exception("OverlapDEC: Policy not implemented yet: only IntensiveMaximum!");
 //      {
-//      if(_target_field->getField()->getNature()==RevIntegral)
+//      if(_target_field->getField()->getNature()==IntensiveConservation)
 //        {
-//          MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> f;
+//          MCAuto<MEDCouplingFieldDouble> f;
 //          int orient = getOrientation(); // From InterpolationOptions inheritance
 //          if(orient == 2)  // absolute areas
 //             f = _target_support->getMeasureField(true);
@@ -276,7 +276,7 @@ namespace ParaMEDMEM
 //          _mapping.computeDenoRevIntegral(*f->getArray());
 //        }
 //      else
-//        throw INTERP_KERNEL::Exception("OverlapDEC: Policy not implemented yet: only ConservativeVolumic and RevIntegral defined!");
+//        throw INTERP_KERNEL::Exception("OverlapDEC: Policy not implemented yet: only IntensiveMaximum and IntensiveConservation defined!");
 //      }
   }