+ Field::cellToNode implementation

[tools/medcoupling.git] / src / MEDCoupling_Swig / MEDCouplingRemapperTest.py

diff --git a/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py b/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py
index 3b9dc6b52f693640da05bb863e03094de0cc71f4..9d4b26947123841f430bb00aecff93a7ca60bfcd 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingRemapperTest.py
@@ -587,11 +587,11 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertAlmostEqual(0.3521445110626687 ,m[6][170],12)
         pass
 
-    @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
+    @unittest.skipUnless(MEDCouplingHasNumPyBindings() and MEDCouplingHasSciPyBindings(),"requires numpy AND scipy")
     def testGetCrudeCSRMatrix1(self):
         """ testing CSR matrix output using numpy/scipy.
         """
-        from scipy.sparse import diags
+        from scipy.sparse import spdiags #diags
         import scipy
         from numpy import array
         arr=DataArrayDouble(3) ; arr.iota()
@@ -620,7 +620,8 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(diff.getnnz(),0)
         # IntegralGlobConstraint (division by sum of cols)
         colSum=m.sum(axis=0)
-        m_0=m*diags(array(1/colSum),[0])
+        # version 0.12.0 # m_0=m*diags(array(1/colSum),[0])
+        m_0=m*spdiags(array(1/colSum),[0],colSum.shape[1],colSum.shape[1])
         del colSum
         self.assertAlmostEqual(m_0[0,0],0.625,12)
         self.assertAlmostEqual(m_0[1,0],0.25,12)
@@ -632,7 +633,8 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(m_0.getnnz(),7)
         # ConservativeVolumic (division by sum of rows)
         rowSum=m.sum(axis=1)
-        m_1=diags(array(1/rowSum.transpose()),[0])*m
+        # version 0.12.0 # m_1=diags(array(1/rowSum.transpose()),[0])*m
+        m_1=spdiags(array(1/rowSum.transpose()),[0],rowSum.shape[0],rowSum.shape[0])*m
         del rowSum
         self.assertAlmostEqual(m_1[0,0],1.,12)
         self.assertAlmostEqual(m_1[1,0],0.4,12)
@@ -644,7 +646,7 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(m_1.getnnz(),7)
         pass
     
-    @unittest.skipUnless(MEDCouplingHasNumPyBindings(),"requires numpy")
+    @unittest.skipUnless(MEDCouplingHasNumPyBindings() and MEDCouplingHasSciPyBindings(),"requires numpy AND scipy")
     def testP0P1Bary_1(self):
         a=MEDCouplingUMesh("a",2)
         a.allocateCells()