Merge from V6_main_20120808 08Aug12

[modules/med.git] / src / MEDMEM_SWIG / med_opsupp_test.py

diff --git a/src/MEDMEM_SWIG/med_opsupp_test.py b/src/MEDMEM_SWIG/med_opsupp_test.py
index 964ad16f4717141bf03df59e8980ae8ad9675eae..75cee619a1f0b3b2eedef916d3618a005b204cd2 100755 (executable)
--- a/src/MEDMEM_SWIG/med_opsupp_test.py
+++ b/src/MEDMEM_SWIG/med_opsupp_test.py
@@ -1,24 +1,26 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 #
-#  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 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.
+# 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
+# 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
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 ############################################################################
 # This Python script is testing the merge and the intersection of
 # several SUPPORTs
@@ -45,21 +47,13 @@ def print_ord(i):
     else:
         return `i`+'th'
 
-md = MED()
-
-mdDriver = MED_MED_RDONLY_DRIVER(medFile,md)
-
-mdDriver.open()
-mdDriver.readFileStruct()
-mdDriver.close()
-
+md = MEDFILEBROWSER(medFile)
 nbMeshes = md.getNumberOfMeshes()
 
 print "The med file", medFile, "contains", nbMeshes, "mesh(es)"
 
 mesh_name = md.getMeshName(0)
-mesh = md.getMesh(mesh_name)
-mesh.read()
+mesh = MESH(MED_DRIVER,medFile,mesh_name)
 spaceDim = mesh.getSpaceDimension()
 meshDim = mesh.getMeshDimension()
 nbNodes = mesh.getNumberOfNodes()
@@ -301,7 +295,9 @@ else:
 
 print "Let's now do an example of union and intersection of two supports with a non empty intersection"
 print ""
-support1 = SUPPORT(mesh,"Partial_Support_1",MED_CELL)
+support1 = SUPPORT()
+support1.setMesh(mesh)
+support1.setName("Partial_Support_1")
 support1Description = "Partial Support 1"
 support1NbOfTypes = 3
 support1TotNbElm = 8
@@ -334,7 +330,9 @@ else:
         print "    * Number",number[0:nbOfElmtsOfType]
     print ""
 
-support2 = SUPPORT(mesh,"Partial_Support_2",MED_CELL)
+support2 = SUPPORT()
+support2.setMesh(mesh)
+support2.setName("Partial_Support_2")
 support2Description = "Partial Support 2"
 support2NbOfTypes = 3
 support2TotNbElm = 8