X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_SWIG%2FsmeshDC.py;h=db8a34ccd929a4e40eed1366d45a9464810d2fe8;hp=4b6ab7036490b82d2d7c28935ffbea1abd8d123d;hb=b6f1b3a4311f24679ba3c2898d99f5920776ee34;hpb=1f2f2d5fa51c897fd2c867ebe18876695a2e02b4 diff --git a/src/SMESH_SWIG/smeshDC.py b/src/SMESH_SWIG/smeshDC.py index 4b6ab7036..db8a34ccd 100644 --- a/src/SMESH_SWIG/smeshDC.py +++ b/src/SMESH_SWIG/smeshDC.py @@ -1,4 +1,6 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# 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 @@ -20,7 +22,7 @@ # File : smesh.py # Author : Francis KLOSS, OCC # Module : SMESH - +# """ \namespace smesh \brief Module smesh @@ -126,6 +128,7 @@ NETGEN_FULL = FULL_NETGEN Hexa = 8 Hexotic = 9 BLSURF = 10 +GHS3DPRL = 11 # MirrorType enumeration POINT = SMESH_MeshEditor.POINT @@ -330,10 +333,10 @@ class smeshDC(SMESH._objref_SMESH_Gen): # @ingroup l1_auxiliary def SetCurrentStudy( self, theStudy, geompyD = None ): #self.SetCurrentStudy(theStudy) - if not geompyD: - import geompy - geompyD = geompy.geom - pass + if not geompyD: + import geompy + geompyD = geompy.geom + pass self.geompyD=geompyD self.SetGeomEngine(geompyD) SMESH._objref_SMESH_Gen.SetCurrentStudy(self,theStudy) @@ -775,7 +778,7 @@ class Mesh: # The parameter \a algo permits to choose the algorithm: NETGEN or GHS3D # If the optional \a geom parameter is not set, this algorithm is global. # \n Otherwise, this algorithm defines a submesh based on \a geom subshape. - # @param algo values are: smesh.NETGEN, smesh.GHS3D, smesh.FULL_NETGEN + # @param algo values are: smesh.NETGEN, smesh.GHS3D, smesh.GHS3DPRL, smesh.FULL_NETGEN # @param geom If defined, the subshape to be meshed (GEOM_Object) # @return an instance of Mesh_Tetrahedron algorithm # @ingroup l3_algos_basic @@ -3120,7 +3123,7 @@ class Mesh_Segment(Mesh_Algorithm): # -------------------------- ## Defines a segment 1D algorithm for discretization -# +# # @ingroup l3_algos_basic class Mesh_CompositeSegment(Mesh_Segment): @@ -3515,6 +3518,11 @@ class Mesh_Tetrahedron(Mesh_Algorithm): self.Create(mesh, geom, "GHS3D_3D" , "libGHS3DEngine.so") pass + elif algoType == GHS3DPRL: + import GHS3DPRLPlugin + self.Create(mesh, geom, "GHS3DPRL_3D" , "libGHS3DPRLEngine.so") + pass + self.algoType = algoType ## Defines "MaxElementVolume" hypothesis to give the maximun volume of each tetrahedron @@ -3542,6 +3550,7 @@ class Mesh_Tetrahedron(Mesh_Algorithm): def Parameters(self, which=SOLE): if self.params: return self.params + if self.algoType == FULL_NETGEN: if which == SIMPLE: self.params = self.Hypothesis("NETGEN_SimpleParameters_3D", [], @@ -3550,11 +3559,17 @@ class Mesh_Tetrahedron(Mesh_Algorithm): self.params = self.Hypothesis("NETGEN_Parameters", [], "libNETGENEngine.so", UseExisting=0) return self.params + if self.algoType == GHS3D: self.params = self.Hypothesis("GHS3D_Parameters", [], "libGHS3DEngine.so", UseExisting=0) return self.params - + + if self.algoType == GHS3DPRL: + self.params = self.Hypothesis("GHS3DPRL_Parameters", [], + "libGHS3DPRLEngine.so", UseExisting=0) + return self.params + print "Algo supports no multi-parameter hypothesis" return None @@ -3671,7 +3686,7 @@ class Mesh_Tetrahedron(Mesh_Algorithm): ## To keep working files or remove them. Log file remains in case of errors anyway. # @ingroup l3_hypos_ghs3dh def SetKeepFiles(self, toKeep): - # Advanced parameter of GHS3D + # Advanced parameter of GHS3D and GHS3DPRL self.Parameters().SetKeepFiles(toKeep) ## To set verbose level [0-10].