X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FMEDReader%2FTest%2FtestMEDReader16.py;h=db2357c1e34e88722d01b7ab0ba251422e57a7ba;hb=b6acef3249a295f4fb9683766afb6a4dfbceeef6;hp=13ded9e4cd782fe46de1b32d1aa74e343751f4ba;hpb=c03e57bad6594c44faf7a96c955ba3f9249ed490;p=modules%2Fparavis.git

diff --git a/src/Plugins/MEDReader/Test/testMEDReader16.py b/src/Plugins/MEDReader/Test/testMEDReader16.py
index 13ded9e4..db2357c1 100644
--- a/src/Plugins/MEDReader/Test/testMEDReader16.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader16.py
@@ -1,10 +1,10 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 
 from MEDLoader import *
 
-""" This test is a non regression test of EDF8662 : This bug revealed that ELNOMesh and ELNOPoints do not behave correctly after the call of ExtractGroup"""
+""" This test is a non regression test of EDF8662 : This bug revealed that ELNOfieldToSurface and ELNOfieldToPointSprite do not behave correctly after the call of ExtractGroup"""
 
 fname="testMEDReader16.med"
 
@@ -35,9 +35,9 @@ grp3=DataArrayInt([0,1,2,3]) ; grp3.setName("grp3")
 mm.setGroupsAtLevel(0,[grp0,grp1,grp2,grp3])
 f=MEDCouplingFieldDouble(ON_GAUSS_NE) ; f.setMesh(m) ; f.setName("MyField") ; f.setTime(0.,0,0)
 arr2=DataArrayDouble(4*4*2) ; arr2.iota() ; arr2.rearrange(2) ; arr2.setInfoOnComponents(["aa","bbb"])
-f.setArray(arr2) ; arr2+=0.1 ; f.checkCoherency()
+f.setArray(arr2) ; arr2+=0.1 ; f.checkConsistencyLight()
 mm.write(fname,2)
-MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f)
+WriteFieldUsingAlreadyWrittenMesh(fname,f)
 #
 from paraview.simple import *
 from paraview import servermanager
@@ -50,11 +50,11 @@ reader.AllArrays=['TS0/Mesh/ComSup0/MyField@@][@@GSSNE']
 ExtractGroup1 = ExtractGroup(Input=reader)
 ExtractGroup1.UpdatePipelineInformation()
 ExtractGroup1.AllGroups=["GRP_grp1"]
-ELNOMesh1=ELNOMesh(Input=ExtractGroup1)
-ELNOPoints1=ELNOPoints(Input=ExtractGroup1)
-ELNOPoints1.SelectSourceArray=['ELNO@MyField']
-for elt in [ELNOMesh1,ELNOPoints1]:
-    elnoMesh=servermanager.Fetch(ELNOPoints1,0)
+ELNOfieldToSurface1=ELNOfieldToSurface(Input=ExtractGroup1)
+ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=ExtractGroup1)
+ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField']
+for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
+    elnoMesh=servermanager.Fetch(ELNOfieldToPointSprite1,0)
     vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField")
     assert(vtkArrToTest.GetNumberOfTuples()==8)
     assert(vtkArrToTest.GetNumberOfComponents()==2)
@@ -65,8 +65,8 @@ for elt in [ELNOMesh1,ELNOPoints1]:
     pass
 #
 ExtractGroup1.AllGroups=["GRP_grp2"]
-for elt in [ELNOMesh1,ELNOPoints1]:
-    elnoMesh=servermanager.Fetch(ELNOMesh1)
+for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
+    elnoMesh=servermanager.Fetch(ELNOfieldToSurface1)
     vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField")
     assert(vtkArrToTest.GetNumberOfTuples()==8)
     assert(vtkArrToTest.GetNumberOfComponents()==2)
@@ -77,8 +77,8 @@ for elt in [ELNOMesh1,ELNOPoints1]:
     pass
 # important to check that if all the field is present that it is OK (check of the optimization)
 ExtractGroup1.AllGroups=["GRP_grp3"]
-for elt in [ELNOMesh1,ELNOPoints1]:
-    elnoMesh=servermanager.Fetch(ELNOMesh1)
+for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
+    elnoMesh=servermanager.Fetch(ELNOfieldToSurface1)
     vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField")
     assert(vtkArrToTest.GetNumberOfTuples()==16)
     assert(vtkArrToTest.GetNumberOfComponents()==2)
@@ -87,11 +87,11 @@ for elt in [ELNOMesh1,ELNOPoints1]:
     vals=[vtkArrToTest.GetValue(i) for i in xrange(32)]
     assert(arr2.isEqualWithoutConsideringStr(DataArrayDouble(vals,16,2),1e-12))
     pass
-ELNOMesh1=ELNOMesh(Input=reader)
-ELNOPoints1=ELNOPoints(Input=reader)
-ELNOPoints1.SelectSourceArray=['ELNO@MyField']
-for elt in [ELNOMesh1,ELNOPoints1]:
-    elnoMesh=servermanager.Fetch(ELNOMesh1)
+ELNOfieldToSurface1=ELNOfieldToSurface(Input=reader)
+ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=reader)
+ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField']
+for elt in [ELNOfieldToSurface1,ELNOfieldToPointSprite1]:
+    elnoMesh=servermanager.Fetch(ELNOfieldToSurface1)
     vtkArrToTest=elnoMesh.GetBlock(0).GetPointData().GetArray("MyField")
     assert(vtkArrToTest.GetNumberOfTuples()==16)
     assert(vtkArrToTest.GetNumberOfComponents()==2)