From: ageay <ageay>
Date: Tue, 30 Jul 2013 15:46:16 +0000 (+0000)
Subject: MEDReader -> debugging session
X-Git-Tag: B4PolyhIntersect~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7cf6fcfa06e9192faedc09bcc3d455bfd5f46bb9;p=modules%2Fmed.git

MEDReader -> debugging session
---

diff --git a/src/MEDCoupling/MEDCouplingMemArray.cxx b/src/MEDCoupling/MEDCouplingMemArray.cxx
index 395bcb8bb..03cf0c323 100644
--- a/src/MEDCoupling/MEDCouplingMemArray.cxx
+++ b/src/MEDCoupling/MEDCouplingMemArray.cxx
@@ -6149,7 +6149,16 @@ DataArrayInt *DataArrayInt::invertArrayN2O2O2N(int oldNbOfElem) const
   std::fill(pt,pt+oldNbOfElem,-1);
   int nbOfNewElems=getNumberOfTuples();
   for(int i=0;i<nbOfNewElems;i++)
-    pt[new2Old[i]]=i;
+    {
+      int v(new2Old[i]);
+      if(v>=0 && v<oldNbOfElem)
+         pt[v]=i;
+      else
+        {
+          std::ostringstream oss; oss << "DataArrayInt::invertArrayN2O2O2N : in new id #" << i << " old value is " << v << " expected to be in [0," << oldNbOfElem << ") !";
+          throw INTERP_KERNEL::Exception(oss.str().c_str());
+        }
+    }
   return ret.retn();
 }
 
diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
index 0df84a8f3..68f4dcbc9 100644
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest.py
@@ -13498,6 +13498,15 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual([8,9,14,13],m.getNodeIdsOfCell(7))
         pass
 
+    def testSwig2ThrowOnDAIInvertN2O2ON2(self):
+        p1=DataArrayInt([3,5,8])
+        p2=DataArrayInt([0,3,4,5,6,7,8,9,10])
+        p1.transformWithIndArr(p2.invertArrayN2O2O2N(11))
+        self.assertTrue(p1.isEqual(DataArrayInt([1,3,6])))
+        self.assertTrue(p2.invertArrayN2O2O2N(11).isEqual(DataArrayInt([0,-1,-1,1,2,3,4,5,6,7,8])))
+        self.assertRaises(InterpKernelException,p2.invertArrayN2O2O2N,10)
+        pass
+
     def setUp(self):
         pass
     pass