Merge from V6_main_20120808 08Aug12

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

diff --git a/src/MEDMEM_SWIG/test_porflow.py b/src/MEDMEM_SWIG/test_porflow.py
index a6f51cc3df5e8d574410ce8d6a0a143899b03101..b6a029541b4703b65d955552f51abd28370e15ae 100644 (file)
--- a/src/MEDMEM_SWIG/test_porflow.py
+++ b/src/MEDMEM_SWIG/test_porflow.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
 #
+
 ###################################################################################
 ###################################################################################
 #
@@ -88,7 +90,7 @@ if (nbTypesCell>0):
         type = types[k]
         nbElemType = mesh.getNumberOfElements(MED_CELL,type)
         print "For the type:",type,"there is(are)",nbElemType,"elemnt(s)"
-        connectivity = mesh.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,type)
+        connectivity = mesh.getConnectivity(MED_NODAL,MED_CELL,type)
         nbNodesPerCell = type%100
         for j in range(nbElemType):
             print "Element",(j+1)," ",connectivity[j*nbNodesPerCell:(j+1)*nbNodesPerCell]
@@ -105,9 +107,9 @@ for j in range(nbNodes):
 
 print ""
 print "Show the Descending Connectivity:"
-mesh.calculateConnectivity(MED_FULL_INTERLACE,MED_DESCENDING,MED_CELL)
+mesh.calculateConnectivity(MED_DESCENDING,MED_CELL)
 nbElemts = mesh.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS)
-Connectivity = mesh.getConnectivity(MED_FULL_INTERLACE,MED_DESCENDING,MED_CELL,MED_ALL_ELEMENTS)
+Connectivity = mesh.getConnectivity(MED_DESCENDING,MED_CELL,MED_ALL_ELEMENTS)
 ConnectivityIndex = mesh.getConnectivityIndex(MED_DESCENDING,MED_CELL)
 print ""
 for j in range(nbElemts):
@@ -267,7 +269,7 @@ if (nbTypesCell>0):
         type = types[k]
         nbElemType = mesh1.getNumberOfElements(MED_CELL,type)
         print "For the type:",type,"there is(are)",nbElemType,"elemnt(s)"
-        connectivity = mesh1.getConnectivity(MED_FULL_INTERLACE,MED_NODAL,MED_CELL,type)
+        connectivity = mesh1.getConnectivity(MED_NODAL,MED_CELL,type)
         nbNodesPerCell = type%100
         for j in range(nbElemType):
             print "Element",(j+1)," ",connectivity[j*nbNodesPerCell:(j+1)*nbNodesPerCell]
@@ -284,9 +286,9 @@ for j in range(nbNodes):
 
 print ""
 print "Show the Descending Connectivity:"
-mesh1.calculateConnectivity(MED_FULL_INTERLACE,MED_DESCENDING,MED_CELL)
+mesh1.calculateConnectivity(MED_DESCENDING,MED_CELL)
 nbElemts = mesh1.getNumberOfElements(MED_CELL,MED_ALL_ELEMENTS)
-Connectivity = mesh1.getConnectivity(MED_FULL_INTERLACE,MED_DESCENDING,MED_CELL,MED_ALL_ELEMENTS)
+Connectivity = mesh1.getConnectivity(MED_DESCENDING,MED_CELL,MED_ALL_ELEMENTS)
 ConnectivityIndex = mesh1.getConnectivityIndex(MED_DESCENDING,MED_CELL)
 print ""
 for j in range(nbElemts):