Non regression test for cases where field names and mesh names are common.

diff --git a/src/Plugins/MEDReader/Test/CMakeLists.txt b/src/Plugins/MEDReader/Test/CMakeLists.txt
index 44c5417e7efabee8415ca834870a5dd66cf5dd1e..bac570f67b269ce9cef5bcc6f9b82e3ab0a28292 100644 (file)
--- a/src/Plugins/MEDReader/Test/CMakeLists.txt
+++ b/src/Plugins/MEDReader/Test/CMakeLists.txt
@@ -48,3 +48,5 @@ ADD_TEST(testMEDReader13 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testME
 SET_TESTS_PROPERTIES(testMEDReader13 PROPERTIES ENVIRONMENT "${tests_env}")
 ADD_TEST(testMEDReader14 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader14.py)
 SET_TESTS_PROPERTIES(testMEDReader14 PROPERTIES ENVIRONMENT "${tests_env}")
+ADD_TEST(testMEDReader15 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/testMEDReader15.py)
+SET_TESTS_PROPERTIES(testMEDReader15 PROPERTIES ENVIRONMENT "${tests_env}")

diff --git a/src/Plugins/MEDReader/Test/testMEDReader15.py b/src/Plugins/MEDReader/Test/testMEDReader15.py
new file mode 100644 (file)
index 0000000..2dbab65
--- /dev/null
+++ b/src/Plugins/MEDReader/Test/testMEDReader15.py
@@ -0,0 +1,82 @@
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2014  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.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# Author : Anthony Geay (EDF R&D)
+
+from MEDLoader import *
+
+""" This test is a non regression test that checks the behaviour of MEDReader when a mesh has the same name than a field.
+"""
+
+fname="testMEDReader15.med"
+outImgName="testMEDReader15.png"
+
+zeName="zeName"
+c=DataArrayDouble([(0.,0.,0.),(1.,0.,0.),(0.,1.,0.)])
+m=MEDFileUMesh()
+m.setCoords(c)
+m.setName(zeName)
+m.write(fname,2)
+f=MEDCouplingFieldDouble(ON_NODES)
+f.setName(zeName)
+f.setArray(DataArrayDouble([(-1.,1.,0.),(0.,1.,0.),(1.,1.,0.)]))
+tmp=MEDCouplingUMesh.Build0DMeshFromCoords(m.getCoords()) ; tmp.setName(zeName)
+f.setMesh(tmp)
+MEDLoader.WriteFieldUsingAlreadyWrittenMesh(fname,f)
+#
+
+from paraview.simple import *
+
+paraview.simple._DisableFirstRenderCameraReset()
+reader=MEDReader(FileName=fname)
+ExpectedEntries=['TS0/zeName/ComSup0/zeName@@][@@P1','TS0/zeName/ComSup0/MESH@zeName@@][@@P1']
+assert(reader.GetProperty("FieldsTreeInfo")[::2]==ExpectedEntries)
+
+
+#
+glyph1=Glyph(Input=reader,GlyphType='Arrow',Scalars='FamilyIdNode',Vectors='zeName',GlyphMode='All Points',ScaleFactor=0.1,GlyphTransform='Transform2')
+
+renderView1=GetActiveViewOrCreate('RenderView')
+renderView1.InteractionMode='3D'
+zeNameLUT = GetColorTransferFunction('zeName')
+zeNameLUT.RGBPoints = [1.0, 0.231373, 0.298039, 0.752941, 1.2071067811865475, 0.865003, 0.865003, 0.865003, 1.4142135623730951, 0.705882, 0.0156863, 0.14902]
+zeNameLUT.ScalarRangeInitialized = 1.
+zeNameLUT.VectorMode = 'Component'
+
+glyph1Display=Show(glyph1,renderView1)
+glyph1Display.ColorArrayName = ['POINTS', 'FamilyIdNode']
+glyph1Display.LookupTable = zeNameLUT
+glyph1Display.OpacityArray = [None, '']
+glyph1Display.RadiusArray = [None, '']
+glyph1Display.RadiusRange = [-0.0707106813788414, 1.0099999904632568]
+glyph1Display.ConstantRadius = 1.0099999904632568
+glyph1Display.PointSpriteDefaultsInitialized = 1
+glyph1Display.SelectInputVectors = ['POINTS', 'GlyphVector']
+glyph1Display.WriteLog = ''
+# show color bar/color legend
+glyph1Display.SetScalarBarVisibility(renderView1, True)
+# set scalar coloring
+ColorBy(glyph1Display, ('POINTS', 'zeName'))
+# rescale color and/or opacity maps used to include current data range
+glyph1Display.RescaleTransferFunctionToDataRange(True)
+# show color bar/color legend
+glyph1Display.SetScalarBarVisibility(renderView1, True)
+#
+Render()
+WriteImage(outImgName)