Renaming validated by C. Bourcier and A. Geay

diff --git a/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml b/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml
index 23a46a39447401712a0715d64b800c017edbcbb3..314ece421359c819fabc699ee71b491933af596e 100644 (file)
--- a/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml
+++ b/src/Plugins/MEDReader/ParaViewPlugin/Resources/MEDReaderServer.xml
@@ -241,7 +241,7 @@
       </IntVectorProperty>
     </SourceProxy>
 
-    <SourceProxy name="ELNOMesh" class="vtkELNOMeshFilter" label="ELNO Mesh">
+    <SourceProxy name="ELNOMesh" class="vtkELNOMeshFilter" label="ELNO field To Surface">
       <Documentation
           long_help="Create a Mesh with ELNO values mapped at each vertex."
           short_help="Create a Mesh with ELNO values mapped at each vertex.">
@@ -273,7 +273,7 @@
       </Hints>
     </SourceProxy>
 
-    <SourceProxy name="ELNOSurface" class="vtkELNOSurfaceFilter" label="ELNO Surface">
+    <SourceProxy name="ELNOSurface" class="vtkELNOSurfaceFilter" label="ELNO field To Surface (skin only)">
       <Documentation
         long_help="Extract the surface of a dataset with ELNO values."
         short_help="Extract the surface of a dataset with ELNO values.">
@@ -318,7 +318,7 @@
       </Hints>
     </SourceProxy>
 
-    <SourceProxy name="GaussPoints" class="vtkMEDQuadraturePointsGenerator" label="Gauss Points">
+    <SourceProxy name="GaussPoints" class="vtkMEDQuadraturePointsGenerator" label="ELGA field To Point Sprite">
       <Documentation
         long_help="Create a point set with data at Gauss points."
         short_help="Create a point set with data at Gauss points.">
@@ -380,7 +380,7 @@
 
     </SourceProxy>
 
-    <SourceProxy name="ELNOPoints" class="vtkELNOFilter" label="ELNO Points">
+    <SourceProxy name="ELNOPoints" class="vtkELNOFilter" label="ELNO field To Point Sprite">
       <Documentation
         long_help="Create a point set with data at ELNO points. Cells are shrinked by a given factor towards the cell center."
         short_help="Create a point set with data at ELNO points. Cells are shrinked by a given factor towards the cell center.">

diff --git a/src/Plugins/MEDReader/Test/testMEDReader0.py b/src/Plugins/MEDReader/Test/testMEDReader0.py
index d6c59d5b43e66c633d9deb4a568a41decf36c471..98636d79f7b7008121a0bc16fd85dc2f594cd45b 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader0.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader0.py
@@ -86,8 +86,8 @@ arr_name_with_dis=[elt.split("/")[-1] for elt in keys]
 arr_name=[elt.split(myMedReader.GetProperty("Separator").GetData())[0] for elt in arr_name_with_dis]
 myMedReader.AllArrays=keys
 RenderView1 = GetRenderView()
-ELNOMesh1=ELNOMesh(Input=myMedReader)
-ExtractGroup1=ExtractGroup(Input=ELNOMesh1)
+ELNOfieldToSurface1=ELNOfieldToSurface(Input=myMedReader)
+ExtractGroup1=ExtractGroup(Input=ELNOfieldToSurface1)
 ExtractGroup1.UpdatePipelineInformation()
 ExtractGroup1.AllGroups=['GRP_ba2','GRP_to1','GRP_web']
 assert(isinstance(ExtractGroup1.GetProperty("MeshName")[0],str))
@@ -105,8 +105,8 @@ DataRepresentation3.ColorArrayName = 'SolutionSIEQ_ELNO'
 DataRepresentation3.LookupTable = a2_SolutionSIEQ_ELNO_PVLookupTable
 DataRepresentation3.Visibility = 1
 #
-GaussPoints1=GaussPoints(Input=ELNOMesh1)
-GaussPoints1.SelectSourceArray=['CELLS','ELGA@0']
+ELGAfieldToPointSprite1=ELGAfieldToPointSprite(Input=ELNOfieldToSurface1)
+ELGAfieldToPointSprite1.SelectSourceArray=['CELLS','ELGA@0']
 DataRepresentation4 = Show()
 DataRepresentation4.ScaleFactor = 0.008999999705702066
 DataRepresentation4.EdgeColor = [0.0, 0.0, 0.5000076295109483]

diff --git a/src/Plugins/MEDReader/Test/testMEDReader13.py b/src/Plugins/MEDReader/Test/testMEDReader13.py
index d19a774df4956081a7b8e2adfc74dbc5669ccd7c..8ec827f5e9870b2c0bf3af1060ff4758ba1d08a1 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader13.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader13.py
@@ -51,7 +51,7 @@ RenderView1.CameraPosition = [1.0, 0.5, 10000.0]
 
 RenderView1.CameraPosition = [1.0, 0.5, 4.319751617610021]
 
-ELNOMesh3 = ELNOMesh(Input=testMEDReader13_med)
+ELNOfieldToSurface3 = ELNOfieldToSurface(Input=testMEDReader13_med)
 
 DataRepresentation2 = Show()
 #DataRepresentation2.ConstantRadius = 1.9999333620071411

diff --git a/src/Plugins/MEDReader/Test/testMEDReader14.py b/src/Plugins/MEDReader/Test/testMEDReader14.py
index 6412f05994f8942e3fa79d18d44a2125353e3d24..7cab54a480509b4b3a77ffd9929f03c2ac9535fc 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader14.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader14.py
@@ -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

diff --git a/src/Plugins/MEDReader/Test/testMEDReader16.py b/src/Plugins/MEDReader/Test/testMEDReader16.py
index 0252cb994272c4a3907192d89129f6d79dbc673f..db2357c1e34e88722d01b7ab0ba251422e57a7ba 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader16.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader16.py
@@ -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"
 
@@ -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)

diff --git a/src/Plugins/MEDReader/Test/testMEDReader17.py b/src/Plugins/MEDReader/Test/testMEDReader17.py
index e1564ba5b6594981ebc258638ac4b9653bc52131..0cef24239ebca67393509dc10e8b342e0b8f977b 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader17.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader17.py
@@ -50,12 +50,12 @@ reader.AllArrays=['TS0/Mesh/ComSup0/MyField@@][@@GSSNE']
 ExtractGroup1 = ExtractGroup(Input=reader)
 ExtractGroup1.UpdatePipelineInformation()
 ExtractGroup1.AllGroups=["GRP_grp1"]
-ELNOPoints1=ELNOPoints(Input=ExtractGroup1)
-ELNOPoints1.SelectSourceArray=['ELNO@MyField']
+ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=ExtractGroup1)
+ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField']
 #
-ELNOPoints1=ELNOPoints(Input=reader)
-ELNOPoints1.SelectSourceArray=['ELNO@MyField']
-ExtractGroup1 = ExtractGroup(Input=ELNOPoints1)
+ELNOfieldToPointSprite1=ELNOfieldToPointSprite(Input=reader)
+ELNOfieldToPointSprite1.SelectSourceArray=['ELNO@MyField']
+ExtractGroup1 = ExtractGroup(Input=ELNOfieldToPointSprite1)
 ExtractGroup1.UpdatePipelineInformation()
 ExtractGroup1.AllGroups=["GRP_grp1"]
 ExtractGroup1.UpdatePipeline()

diff --git a/src/Plugins/MEDReader/Test/testMEDReader21.py b/src/Plugins/MEDReader/Test/testMEDReader21.py
index 1d9aa0b79b447fbb0ea224c003551d93b0115b19..3b1ef16ed2e88eaa107e5d0b1dd88d7acda2d0d7 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader21.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader21.py
@@ -77,7 +77,7 @@ vtkBlockColorsLUT = GetColorTransferFunction('vtkBlockColors')
 vtkBlockColorsPWF = GetOpacityTransferFunction('vtkBlockColors')
 
 # create a new 'ELNO Mesh'
-eLNOMesh1 = ELNOMesh(Input=testTotomed)
+eLNOMesh1 = ELNOfieldToSurface(Input=testTotomed)
 
 # Properties modified on eLNOMesh1
 eLNOMesh1.ShrinkFactor = 0.5 # <- test is here !!!!!!!!

diff --git a/src/Plugins/MEDReader/Test/testMEDReader6.py b/src/Plugins/MEDReader/Test/testMEDReader6.py
index 9b73ce292546594a96e2b3f42f7babc1a45fc6c9..35869ae446cacd72b405321c25c19180224cc061 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader6.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader6.py
@@ -22,7 +22,7 @@
 from MEDLoader import *
 
 """ This test generate a GaussPoint field on a mesh with groups.
-The aim of this test is to check that the ExtractGroup works well for GaussPoints
+The aim of this test is to check that the ExtractGroup works well for ELGAfieldToPointSprite
 """
 
 fname="testMEDReader6.med"
@@ -65,10 +65,10 @@ ExtractGroup1 = ExtractGroup(Input=myMedReader)
 ExtractGroup1.UpdatePipelineInformation()
 ExtractGroup1.AllGroups = ['GRP_grp0']
 
-GaussPoints1 = GaussPoints(Input=ExtractGroup1)
-GaussPoints1.SelectSourceArray = ['CELLS','ELGA@0']
+ELGAfieldToPointSprite1 = ELGAfieldToPointSprite(Input=ExtractGroup1)
+ELGAfieldToPointSprite1.SelectSourceArray = ['CELLS','ELGA@0']
 
-Glyph1 = Glyph( Input=GaussPoints1, GlyphType="Sphere", GlyphTransform="Transform2" )
+Glyph1 = Glyph( Input=ELGAfieldToPointSprite1, GlyphType="Sphere", GlyphTransform="Transform2" )
 Glyph1.GlyphType = "Sphere"
 Glyph1.Vectors = ['POINTS', '']
 Glyph1.ScaleFactor = 0.29