From: Anthony Geay <anthony.geay@edf.fr>
Date: Wed, 3 Jan 2018 10:23:44 +0000 (+0100)
Subject: Almost ready to merge to master
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4d970dda8939bb5f905f179ffc4b0b31e7329c94;p=tools%2Fmedcoupling.git

Almost ready to merge to master
---

diff --git a/src/INTERP_KERNEL/Interpolation1D0D.txx b/src/INTERP_KERNEL/Interpolation1D0D.txx
index 3227d3a39..7c62140fe 100644
--- a/src/INTERP_KERNEL/Interpolation1D0D.txx
+++ b/src/INTERP_KERNEL/Interpolation1D0D.txx
@@ -43,7 +43,7 @@ namespace INTERP_KERNEL
   template<class MyMeshType, class MatrixType>
   int Interpolation1D0D::interpolateMeshes(const MyMeshType& srcMesh, const MyMeshType& targetMesh, MatrixType& result, const std::string& method)
   {
-//#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L
     constexpr int SPACEDIM=MyMeshType::MY_SPACEDIM;
     using ConnType=typename MyMeshType::MyConnType;
     IKAssert(SPACEDIM==3);
@@ -95,7 +95,7 @@ namespace INTERP_KERNEL
         IKAssert(trgConnIPtr[i+1]==i+1 && trgConnIPtr[i]==i);
         std::vector<ConnType> srcSegCondidates;
         const double *trgCellPosition(trgCooPtr+SPACEDIM*trgConnPtr[i]);
-        typename MatrixType::value_type& resRow(result[i]);
+        typename MatrixType::value_type& resRow(result[trgConnPtr[i]]);
         tree.getElementsAroundPoint(trgCellPosition, srcSegCondidates);
         for(auto srcSeg: srcSegCondidates)
           {
@@ -115,7 +115,9 @@ namespace INTERP_KERNEL
       delete srcElems[i];
     return srcMesh.getNumberOfNodes();
   }
-//#endif
+#else
+  throw INTERP_KERNEL::Exception("Go buying a C++11 compiler :)");
+#endif
 }
 
 #endif
diff --git a/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py b/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py
index b00dc71ef..a0a0b01a3 100644
--- a/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py
@@ -1155,6 +1155,51 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(1, len(rmp.getCrudeMatrix()[0]))
         pass
 
+    @unittest.skipUnless(MEDCouplingHasNumPyBindings() and MEDCouplingHasSciPyBindings() and IsCXX11Compiled(),"requires numpy AND scipy AND C++11")
+    def testP1P1PL3DSpaceFrom1DTo0D(self):
+        from scipy.sparse import csr_matrix
+        from numpy import array
+
+        def generateTrg(eps):
+            trgArr=DataArrayDouble([(0.5,0.5,0.5),(0.2,0.2,0.2),(0.9,0.9,0.9),(0.7+eps*sqrt(3),0.7-eps*sqrt(3),0.7)])
+            trg=MEDCouplingUMesh("trg",0) ; trg.setCoords(trgArr)
+            trg.allocateCells()
+            RenumTrg=[2,3,0,1]
+            for rt in RenumTrg:
+                trg.insertNextCell(NORM_POINT1,[rt])
+            return trg
+
+        srcArr=DataArrayDouble([(0.,0.,1.),(0.,0.,0.),(1.,1.,1.)])
+        src=MEDCouplingUMesh("src",1) ; src.setCoords(srcArr)
+        src.allocateCells()
+        src.insertNextCell(NORM_SEG2,[1,2])
+        #
+        trg=generateTrg(1e-7)# trg point 3 of trg cell 1 is NOT closer enough to source edge #1 -> not intercepted
+        #
+        rem=MEDCouplingRemapper()
+        rem.setIntersectionType(PointLocator)
+        self.assertEqual(rem.prepare(src,trg,"P1P1"),1)
+        mat=rem.getCrudeCSRMatrix()
+        row=array([2,2, 0,0, 1,1]) # here no ref to point 3 !
+        col=array([1,2, 1,2, 1,2])
+        data=array([0.1,0.9, 0.5,0.5, 0.8,0.2])
+        mExp=csr_matrix((data,(row,col)),shape=(4,3))
+        delta=abs(mExp-mat)
+        self.assertAlmostEqual(delta.sum(),0.,14)
+        #
+        trg=generateTrg(1e-14) # trg point 3 of trg cell 1 is closer enough to source edge #1 -> intercepted
+        rem=MEDCouplingRemapper()
+        rem.setIntersectionType(PointLocator)
+        self.assertEqual(rem.prepare(src,trg,"P1P1"),1)
+        mat=rem.getCrudeCSRMatrix()
+        row=array([2,2, 3,3, 0,0, 1,1]) # here ref to target point 3 
+        col=array([1,2, 1,2, 1,2, 1,2])
+        data=array([0.1,0.9, 0.3,0.7, 0.5,0.5, 0.8,0.2])
+        mExp2=csr_matrix((data,(row,col)),shape=(4,3))
+        delta2=abs(mExp2-mat)
+        self.assertAlmostEqual(delta2.sum(),0.,14)
+        pass
+
     def checkMatrix(self,mat1,mat2,nbCols,eps):
         self.assertEqual(len(mat1),len(mat2))
         for i in range(len(mat1)):