Merge branch 'master' of ssh://git.salome-platform.org/tools/medcoupling

[tools/medcoupling.git] / src / ParaMEDMEM / InterpolationMatrix.hxx

diff --git a/src/ParaMEDMEM/InterpolationMatrix.hxx b/src/ParaMEDMEM/InterpolationMatrix.hxx
index b60c9ee54b2e8408a89108b4bc31e10f3aa7a366..a9dcef734557f0e80f71727d257312480ec1ea22 100644 (file)
--- a/src/ParaMEDMEM/InterpolationMatrix.hxx
+++ b/src/ParaMEDMEM/InterpolationMatrix.hxx
@@ -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
@@ -25,7 +25,7 @@
 #include "InterpolationOptions.hxx"
 #include "DECOptions.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class ElementLocator;
 
@@ -42,7 +42,7 @@ namespace ParaMEDMEM
   {
   public:
     
-    InterpolationMatrix(const ParaMEDMEM::ParaFIELD *source_field, 
+    InterpolationMatrix(const MEDCoupling::ParaFIELD *source_field, 
                         const ProcessorGroup& source_group,
                         const ProcessorGroup& target_group,
                         const DECOptions& dec_opt,
@@ -93,7 +93,7 @@ namespace ParaMEDMEM
   private:
     bool isSurfaceComputationNeeded(const std::string& method) const;
   private:
-    const ParaMEDMEM::ParaFIELD *_source_field;
+    const MEDCoupling::ParaFIELD *_source_field;
     std::vector<int> _row_offsets;
     std::map<std::pair<int,int>, int > _col_offsets;
     MEDCouplingPointSet *_source_support;