correct previous integration (Porting to Python 2.6)

[modules/smesh.git] / src / SMESH_SWIG / SMESH_mechanic_netgen.py

diff --git a/src/SMESH_SWIG/SMESH_mechanic_netgen.py b/src/SMESH_SWIG/SMESH_mechanic_netgen.py
index 719aa0e412cea87446d68a7ad1b320c7e30311ad..038e64e0b655c818e85d4f6eef542eed9679dbc9 100644 (file)
--- a/src/SMESH_SWIG/SMESH_mechanic_netgen.py
+++ b/src/SMESH_SWIG/SMESH_mechanic_netgen.py
@@ -1,4 +1,7 @@
-#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  -*- coding: iso-8859-1 -*-
+#  Copyright (C) 2007-2008  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
 #
 #  This library is free software; you can redistribute it and/or
@@ -15,21 +18,17 @@
 #  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/
-#
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 # Quadrangulation of the geometry generated by the Python script
 # SMESH_mechanic.py
 # The new Netgen algorithm is used that discretizes baoundaries itself
 #
-
 import salome
 import geompy
 
 geom  = geompy.geom
 
-import StdMeshers
-import NETGENPlugin
 import smesh
 
 # ---------------------------- GEOM --------------------------------------
@@ -109,13 +108,12 @@ print "number of Edges in mechanic : ",len(subEdgeList)
 print "-------------------------- create Mesh, algorithm, hypothesis"
 
 mesh = smesh.Mesh(mechanic, "Mesh_mechanic");
-netgen = mesh.Netgen(0)
-hyp = netgen.Parameters()
-hyp.SetMaxSize( 50 )
-#hyp.SetSecondOrder( 0 )
-hyp.SetFineness( 3 )
-hyp.SetQuadAllowed( 1 )
-#hyp.SetOptimize( 1 )
+netgen = mesh.Triangle(smesh.NETGEN)
+netgen.SetMaxSize( 50 )
+#netgen.SetSecondOrder( 0 )
+netgen.SetFineness( smesh.Fine )
+netgen.SetQuadAllowed( 1 )
+#netgen.SetOptimize( 1 )
 
 salome.sg.updateObjBrowser(1)
 
@@ -124,13 +122,13 @@ ret = mesh.Compute()
 print ret
 if ret != 0:
     print "Information about the MeshcompShel:"
-    print "Number of nodes        : ", mesh.GetMesh().NbNodes()
-    print "Number of edges        : ", mesh.GetMesh().NbEdges()
-    print "Number of faces        : ", mesh.GetMesh().NbFaces()
-    print "Number of triangles    : ", mesh.GetMesh().NbTriangles()
-    print "Number of quadrangles  : ", mesh.GetMesh().NbQuadrangles()
-    print "Number of volumes      : ", mesh.GetMesh().NbVolumes()
-    print "Number of tetrahedrons : ", mesh.GetMesh().NbTetras()
+    print "Number of nodes        : ", mesh.NbNodes()
+    print "Number of edges        : ", mesh.NbEdges()
+    print "Number of faces        : ", mesh.NbFaces()
+    print "Number of triangles    : ", mesh.NbTriangles()
+    print "Number of quadrangles  : ", mesh.NbQuadrangles()
+    print "Number of volumes      : ", mesh.NbVolumes()
+    print "Number of tetrahedrons : ", mesh.NbTetras()
     
 else:
     print "problem when computing the mesh"