Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/smesh
[modules/smesh.git]
/
src
/
SMESH_SWIG
/
SMESH_test.py
diff --git
a/src/SMESH_SWIG/SMESH_test.py
b/src/SMESH_SWIG/SMESH_test.py
index 83d1583ff91b48079b8a0c271b5c8e83b546fa9d..004996c2077bb71318fd82cca02bca38171c6d1b 100644
(file)
--- a/
src/SMESH_SWIG/SMESH_test.py
+++ b/
src/SMESH_SWIG/SMESH_test.py
@@
-1,5
+1,5
@@
# -*- coding: iso-8859-1 -*-
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-20
20
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
@@
-21,7
+21,7
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-# SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
al
sses
+# SMESH SMESH_I : idl implementation based on 'SMESH' unit's c
la
sses
# File : SMESH_test.py
# Module : SMESH
#
# File : SMESH_test.py
# Module : SMESH
#
@@
-29,11
+29,11
@@
import salome
salome.salome_init()
import GEOM
from salome.geom import geomBuilder
salome.salome_init()
import GEOM
from salome.geom import geomBuilder
-geompy = geomBuilder.New(
salome.myStudy
)
+geompy = geomBuilder.New()
import SMESH, SALOMEDS
from salome.smesh import smeshBuilder
import SMESH, SALOMEDS
from salome.smesh import smeshBuilder
-smesh = smeshBuilder.New(
salome.myStudy
)
+smesh = smeshBuilder.New()
# ---- define a box
# ---- define a box
@@
-63,49
+63,49
@@
ide = geompy.addToStudyInFather(face, edge, name)
# ---- SMESH
# ---- SMESH
-smesh.
SetCurrentStudy(salome.myStudy
)
+smesh.
UpdateStudy(
)
box = salome.IDToObject(idb)
mesh = smesh.Mesh(box, "Meshbox")
box = salome.IDToObject(idb)
mesh = smesh.Mesh(box, "Meshbox")
-print
"-------------------------- add hypothesis to box"
+print
("-------------------------- add hypothesis to box")
algo_1 = mesh.Segment(box)
hyp = algo_1.LocalLength(100)
algo_1 = mesh.Segment(box)
hyp = algo_1.LocalLength(100)
-print
hyp.GetName(
)
-print
hyp.GetId(
)
-print
hyp.GetLength(
)
+print
(hyp.GetName()
)
+print
(hyp.GetId()
)
+print
(hyp.GetLength()
)
algo_2 = mesh.Triangle(smeshBuilder.MEFISTO, box)
hyp = algo_2.MaxElementArea(5000)
algo_2 = mesh.Triangle(smeshBuilder.MEFISTO, box)
hyp = algo_2.MaxElementArea(5000)
-print
hyp.GetName(
)
-print
hyp.GetId(
)
-print
hyp.GetMaxElementArea(
)
+print
(hyp.GetName()
)
+print
(hyp.GetId()
)
+print
(hyp.GetMaxElementArea()
)
smesh.SetName(algo_2.GetSubMesh(), "SubMeshBox")
smesh.SetName(algo_2.GetSubMesh(), "SubMeshBox")
-print
"-------------------------- add hypothesis to edge"
+print
("-------------------------- add hypothesis to edge")
edge = salome.IDToObject(ide)
algo_3 = mesh.Segment(edge)
hyp = algo_3.LocalLength(100)
edge = salome.IDToObject(ide)
algo_3 = mesh.Segment(edge)
hyp = algo_3.LocalLength(100)
-print
hyp.GetName(
)
-print
hyp.GetId(
)
-print
hyp.GetLength(
)
+print
(hyp.GetName()
)
+print
(hyp.GetId()
)
+print
(hyp.GetLength()
)
smesh.SetName(algo_3.GetSubMesh(), "SubMeshEdge")
smesh.SetName(algo_3.GetSubMesh(), "SubMeshEdge")
-print
"-------------------------- compute face"
+print
("-------------------------- compute face")
face = salome.IDToObject(idf)
ret = mesh.Compute(face)
face = salome.IDToObject(idf)
ret = mesh.Compute(face)
-print
ret
-log = mesh.GetLog(0) # 0 - GetLog without ClearLog after, else if 1 - ClearLog after
+print
(ret)
+log =
[] #
mesh.GetLog(0) # 0 - GetLog without ClearLog after, else if 1 - ClearLog after
for a in log:
for a in log:
- print
"-------"
+ print
("-------")
ii = 0
ir = 0
comType = a.commandType
ii = 0
ir = 0
comType = a.commandType
@@
-119,7
+119,7
@@
for a in log:
ir = ir+1
r3 = a.coords[ir]
ir = ir+1
ir = ir+1
r3 = a.coords[ir]
ir = ir+1
- print
"AddNode %i - %g %g %g" % (ind, r1, r2, r3
)
+ print
("AddNode %i - %g %g %g" % (ind, r1, r2, r3)
)
elif comType == 1:
for i in range(a.number):
ind = a.indexes[ii]
elif comType == 1:
for i in range(a.number):
ind = a.indexes[ii]
@@
-128,23
+128,23
@@
for a in log:
ii = ii+1
i2 = a.indexes[ii]
ii = ii+1
ii = ii+1
i2 = a.indexes[ii]
ii = ii+1
- print
"AddEdge %i - %i %i" % (ind, i1, i2
)
+ print
("AddEdge %i - %i %i" % (ind, i1, i2)
)
elif comType == 2:
for i in range(a.number):
ind = a.indexes[ii]
elif comType == 2:
for i in range(a.number):
ind = a.indexes[ii]
- print ind
+ print(ind)
ii = ii+1
ii = ii+1
- print ii
+ print(ii)
i1 = a.indexes[ii]
ii = ii+1
i2 = a.indexes[ii]
i1 = a.indexes[ii]
ii = ii+1
i2 = a.indexes[ii]
- print i2
+ print(i2)
ii = ii+1
ii = ii+1
- print "ii", ii
+ print("ii", ii)
i3 = a.indexes[ii]
i3 = a.indexes[ii]
- print i3
+ print(i3)
#ii = ii+1
ii = ii+1
#ii = ii+1
ii = ii+1
- print
"AddTriangle %i - %i %i %i" % (ind, i1, i2, i3
)
+ print
("AddTriangle %i - %i %i %i" % (ind, i1, i2, i3)
)
-salome.sg.updateObjBrowser(
1
)
+salome.sg.updateObjBrowser()