Merge 'master' branch into 'V9_dev' branch.

[modules/paravis.git] / src / Plugins / MEDReader / Test / testMEDReader14.py

diff --git a/src/Plugins/MEDReader/Test/testMEDReader14.py b/src/Plugins/MEDReader/Test/testMEDReader14.py
index 38f9646b3034a7d47d3d1b4d012c51449cadbf64..b9f2aaafa5d0d3ffb7922af3cacee60df3f13355 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader14.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader14.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2017  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
@@ -43,13 +43,13 @@ m1.allocateCells()
 for i in [[28,21],[21,14],[14,7],[7,0]]:
     m1.insertNextCell(i)
     pass
-for i in xrange(6):
+for i in range(6):
     m1.insertNextCell([i,i+1])
     pass
 for i in [[6,13],[13,20],[20,27],[27,34]]:
     m1.insertNextCell(i)
     pass
-for i in xrange(6,0,-1):
+for i in range(6,0,-1):
     m1.insertNextCell([28+i,28+i-1])
     pass
 #
@@ -69,7 +69,7 @@ fieldName2="zeField2"
 fs0=MEDFileFieldMultiTS()
 fs1=MEDFileFieldMultiTS()
 fs2=MEDFileFieldMultiTS()
-for i in xrange(5):
+for i in range(5):
     f=MEDFileField1TS()
     zePfl0=DataArrayInt.Aggregate(DataArrayInt.Range(0,12,1),pfl3,0) ; zePfl0.setName("PFL")
     fNode=MEDCouplingFieldDouble(ON_GAUSS_PT) ; fNode.setTime(float(i),i,0)
@@ -78,7 +78,7 @@ for i in xrange(5):
     fNode.setGaussLocalizationOnCells(DataArrayInt.Range(0,12,1),[0.,0.,1.,0.,0.,1.],[0.1,0.1,0.8,0.1,0.1,0.8],3*[0.16666666666666666])
     fNode.setGaussLocalizationOnCells(DataArrayInt.Range(12,24,1),[-1.,-1.,1.,-1.,1.,1.,-1.,1.],[-0.577350,-0.577350,0.577350,-0.577350,0.577350,0.577350,-0.577350,0.577350],4*[1.])
     arr=DataArrayDouble(2*(12*3+12*4)) ; arr.iota(0+1000*i) ; arr.rearrange(2)
-    fNode.setArray(arr) ; arr.setInfoOnComponents(["Comp1_2 [m]","Com2_2 [s^2]"]) ; fNode.checkCoherency()
+    fNode.setArray(arr) ; arr.setInfoOnComponents(["Comp1_2 [m]","Com2_2 [s^2]"]) ; fNode.checkConsistencyLight()
     fNode.setName(fieldName0)
     f.setFieldProfile(fNode,mm,0,zePfl0)
     #
@@ -91,7 +91,7 @@ for i in xrange(5):
     fNode.setGaussLocalizationOnCells(DataArrayInt.Range(4,10,1),[-1.,1.],[-0.5,0.,0.5],[1.,1.,1.])
     fNode.setGaussLocalizationOnCells(DataArrayInt.Range(10,14,1),[-1.,1.],[-0.6,-0.2,0.2,0.6],[1.,1.,1.,1.])
     arr=DataArrayDouble(2*(4*2+6*3+4*4)) ; arr.iota(100+1000*i) ; arr.rearrange(2)
-    fNode.setArray(arr) ; arr.setInfoOnComponents(["Comp1_2 [m]","Com2_2 [s^2]"]) ; fNode.checkCoherency()
+    fNode.setArray(arr) ; arr.setInfoOnComponents(["Comp1_2 [m]","Com2_2 [s^2]"]) ; fNode.checkConsistencyLight()
     fNode.setName(fieldName0)
     f.setFieldProfile(fNode,mm,-1,zePfl1)
     fs0.pushBackTimeStep(f)
@@ -104,7 +104,7 @@ for i in xrange(5):
     fNode.setGaussLocalizationOnCells(DataArrayInt.Range(0,4,1),[-1.,1.],[-0.6,-0.2,0.2,0.6],[1.,1.,1.,1.])
     fNode.setGaussLocalizationOnCells(DataArrayInt.Range(4,10,1),[-1.,1.],[-0.6666666666666667,-0.33333333333333337,0.,0.33333333333333337,0.6666666666666667],[1.,1.,1.,1.,1.])
     arr=DataArrayDouble(2*(4*4+6*5)) ; arr.iota(500+1000*i) ; arr.rearrange(2)
-    fNode.setArray(arr) ; arr.setInfoOnComponents(["C1 [m]","C2 [s^2]"]) ; fNode.checkCoherency()
+    fNode.setArray(arr) ; arr.setInfoOnComponents(["C1 [m]","C2 [s^2]"]) ; fNode.checkConsistencyLight()
     f.setFieldProfile(fNode,mm,-1,zePfl2)
     fs1.pushBackTimeStep(f)
     #
@@ -133,7 +133,7 @@ renderView1=GetActiveViewOrCreate('RenderView')
 for entry in [[ExpectedEntries[0]],[ExpectedEntries[1]],[ExpectedEntries[2],ExpectedEntries[3]],[ExpectedEntries[4]]]:
     reader=MEDReader(FileName=fname)
     reader.AllArrays=entry
-    gaussPoints=GaussPoints(Input=reader)
+    gaussPoints=ELGAfieldToPointSprite(Input=reader)
     gaussPoints.SelectSourceArray="ELGA@0"
     Show(gaussPoints,renderView1)
     pass
@@ -154,6 +154,23 @@ renderView1.InteractionMode = '2D'
 renderView1.CameraPosition = [3.0, 2.0, 10000.0]
 renderView1.CameraFocalPoint = [3.0, 2.0, 0.0]
 renderView1.ViewSize =[300,300]
+renderView1.GetRenderWindow().DoubleBufferOff()
 #
+
 Render()
-WriteImage(outImgName)
+
+# compare with baseline image
+import os
+import sys
+try:
+  baselineIndex = sys.argv.index('-B')+1
+  baselinePath = sys.argv[baselineIndex]
+except:
+  print("Could not get baseline directory. Test failed.")
+  exit(1)
+baseline_file = os.path.join(baselinePath, "testMEDReader14.png")
+import vtk.test.Testing
+vtk.test.Testing.VTK_TEMP_DIR = vtk.util.misc.vtkGetTempDir()
+vtk.test.Testing.compareImage(renderView1.GetRenderWindow(), baseline_file,
+                                                            threshold=1)
+vtk.test.Testing.interact()