mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-11-11 16:19:16 +05:00
Ménage dans les imports
This commit is contained in:
parent
430da9254a
commit
6cdcd4fb15
@ -22,10 +22,6 @@
|
|||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import GEOM
|
|
||||||
import SALOMEDS
|
|
||||||
import SMESH
|
|
||||||
|
|
||||||
from .geomsmesh import geompy, smesh
|
from .geomsmesh import geompy, smesh
|
||||||
from .geomsmesh import geomPublish
|
from .geomsmesh import geomPublish
|
||||||
from .geomsmesh import geomPublishInFather
|
from .geomsmesh import geomPublishInFather
|
||||||
|
@ -20,9 +20,6 @@
|
|||||||
"""Construit les arêtes débouchantes"""
|
"""Construit les arêtes débouchantes"""
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import GEOM
|
|
||||||
|
|
||||||
from . import initLog
|
|
||||||
|
|
||||||
from .construitEdgesRadialesDebouchantes_a import construitEdgesRadialesDebouchantes_a
|
from .construitEdgesRadialesDebouchantes_a import construitEdgesRadialesDebouchantes_a
|
||||||
from .construitEdgesRadialesDebouchantes_b import construitEdgesRadialesDebouchantes_b
|
from .construitEdgesRadialesDebouchantes_b import construitEdgesRadialesDebouchantes_b
|
||||||
|
@ -20,11 +20,11 @@
|
|||||||
"""Mise en correspondance avec les indices des faces disque débouchantes (facesPipePeau)"""
|
"""Mise en correspondance avec les indices des faces disque débouchantes (facesPipePeau)"""
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import GEOM
|
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
from .geomsmesh import geomPublish
|
#from .geomsmesh import geomPublish
|
||||||
from . import initLog
|
|
||||||
|
#from . import initLog
|
||||||
|
|
||||||
def construitEdgesRadialesDebouchantes_b(facesPipePeau, facesDebouchantes, listNappes):
|
def construitEdgesRadialesDebouchantes_b(facesPipePeau, facesDebouchantes, listNappes):
|
||||||
"""Mise en correspondance avec les indices des faces disque débouchantes (facesPipePeau)"""
|
"""Mise en correspondance avec les indices des faces disque débouchantes (facesPipePeau)"""
|
||||||
|
@ -20,11 +20,12 @@
|
|||||||
"""Construction des listes d'edges radiales sur chaque extrémité débouchante"""
|
"""Construction des listes d'edges radiales sur chaque extrémité débouchante"""
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import GEOM
|
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
from .geomsmesh import geomPublish
|
from .geomsmesh import geomPublish
|
||||||
|
|
||||||
from . import initLog
|
from . import initLog
|
||||||
|
|
||||||
from .sortEdges import sortEdges
|
from .sortEdges import sortEdges
|
||||||
|
|
||||||
def construitEdgesRadialesDebouchantes_c(facesPipePeau, edgeRadFacePipePeau, \
|
def construitEdgesRadialesDebouchantes_c(facesPipePeau, edgeRadFacePipePeau, \
|
||||||
|
@ -25,8 +25,6 @@ from . import initLog
|
|||||||
|
|
||||||
import salome
|
import salome
|
||||||
from salome.smesh import smeshBuilder
|
from salome.smesh import smeshBuilder
|
||||||
import GEOM
|
|
||||||
import SMESH
|
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
from .geomsmesh import geomPublishInFather
|
from .geomsmesh import geomPublishInFather
|
||||||
|
@ -23,13 +23,10 @@ import os
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import salome
|
|
||||||
from salome.smesh import smeshBuilder
|
from salome.smesh import smeshBuilder
|
||||||
import GEOM
|
|
||||||
import SMESH
|
import SMESH
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
from .geomsmesh import smesh
|
|
||||||
|
|
||||||
from .putName import putName
|
from .putName import putName
|
||||||
from .enleveDefaut import enleveDefaut
|
from .enleveDefaut import enleveDefaut
|
||||||
|
@ -19,8 +19,6 @@
|
|||||||
#
|
#
|
||||||
"""Les points"""
|
"""Les points"""
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
|
|
||||||
def construitMaillagePipe_a(idisk, \
|
def construitMaillagePipe_a(idisk, \
|
||||||
|
@ -19,8 +19,6 @@
|
|||||||
#
|
#
|
||||||
"""Les groupes des edges des cercles débouchants"""
|
"""Les groupes des edges des cercles débouchants"""
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
def construitMaillagePipe_b(idisk, \
|
def construitMaillagePipe_b(idisk, \
|
||||||
idisklim, nbsegCercle, \
|
idisklim, nbsegCercle, \
|
||||||
meshPipe, mptdsk, \
|
meshPipe, mptdsk, \
|
||||||
|
@ -19,8 +19,6 @@
|
|||||||
#
|
#
|
||||||
"""Les groupes des faces débouchantes"""
|
"""Les groupes des faces débouchantes"""
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
def construitMaillagePipe_c(idisk, \
|
def construitMaillagePipe_c(idisk, \
|
||||||
idisklim, nbsegCercle, \
|
idisklim, nbsegCercle, \
|
||||||
meshPipe, mptdsk, nbsegRad, \
|
meshPipe, mptdsk, nbsegRad, \
|
||||||
|
@ -19,10 +19,6 @@
|
|||||||
#
|
#
|
||||||
"""Mailles volumiques, groupes noeuds et edges de fond de fissure, groupe de face de fissure"""
|
"""Mailles volumiques, groupes noeuds et edges de fond de fissure, groupe de face de fissure"""
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
import SMESH
|
|
||||||
|
|
||||||
def construitMaillagePipe_d(idisk, \
|
def construitMaillagePipe_d(idisk, \
|
||||||
idisklim, nbsegCercle, nbsegRad, \
|
idisklim, nbsegCercle, nbsegRad, \
|
||||||
meshPipe, mptdsk, oldmpts, \
|
meshPipe, mptdsk, oldmpts, \
|
||||||
|
@ -22,8 +22,6 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import SMESH
|
|
||||||
import SALOMEDS
|
|
||||||
|
|
||||||
from .geomsmesh import smesh
|
from .geomsmesh import smesh
|
||||||
|
|
||||||
|
@ -23,6 +23,8 @@ import logging
|
|||||||
|
|
||||||
from . import initLog
|
from . import initLog
|
||||||
|
|
||||||
|
import GEOM
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
from .geomsmesh import geomPublishInFather
|
from .geomsmesh import geomPublishInFather
|
||||||
|
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from . import initLog
|
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
|
|
||||||
from .findWireVertices import findWireVertices
|
from .findWireVertices import findWireVertices
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from . import initLog
|
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
|
|
||||||
from .findWireVertices import findWireVertices
|
from .findWireVertices import findWireVertices
|
||||||
|
@ -24,7 +24,6 @@ import os
|
|||||||
import logging
|
import logging
|
||||||
import math
|
import math
|
||||||
import GEOM
|
import GEOM
|
||||||
import SALOMEDS
|
|
||||||
import SMESH
|
import SMESH
|
||||||
|
|
||||||
from . import initLog
|
from . import initLog
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
import SMESH
|
|
||||||
|
|
||||||
|
|
||||||
def getStatsMaillageFissure(maillage, referencesMaillageFissure, maillageFissureParams):
|
def getStatsMaillageFissure(maillage, referencesMaillageFissure, maillageFissureParams):
|
||||||
""""Statistiques maillage"""
|
""""Statistiques maillage"""
|
||||||
|
@ -19,8 +19,6 @@
|
|||||||
#
|
#
|
||||||
"""Création d'une nouvelle étude"""
|
"""Création d'une nouvelle étude"""
|
||||||
|
|
||||||
import logging
|
|
||||||
|
|
||||||
def initEtude():
|
def initEtude():
|
||||||
"""Création nouvelle etude salome"""
|
"""Création nouvelle etude salome"""
|
||||||
from . import geomsmesh
|
from . import geomsmesh
|
||||||
|
@ -24,7 +24,6 @@ import os
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
import salome
|
import salome
|
||||||
import SMESH
|
|
||||||
|
|
||||||
from .partitionBlocDefaut import partitionBlocDefaut
|
from .partitionBlocDefaut import partitionBlocDefaut
|
||||||
from .facesVolumesToriques import facesVolumesToriques
|
from .facesVolumesToriques import facesVolumesToriques
|
||||||
@ -39,9 +38,6 @@ from .enleveDefaut import enleveDefaut
|
|||||||
from .regroupeSainEtDefaut import RegroupeSainEtDefaut
|
from .regroupeSainEtDefaut import RegroupeSainEtDefaut
|
||||||
from .putName import putName
|
from .putName import putName
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------
|
|
||||||
# --- procedure complete fissure elliptique
|
|
||||||
|
|
||||||
def insereFissureElliptique(geometriesSaines, maillagesSains, \
|
def insereFissureElliptique(geometriesSaines, maillagesSains, \
|
||||||
shapesFissure, shapeFissureParams, \
|
shapesFissure, shapeFissureParams, \
|
||||||
maillageFissureParams, elementsDefaut, step=-1):
|
maillageFissureParams, elementsDefaut, step=-1):
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import salome
|
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
from .geomsmesh import geomPublish
|
from .geomsmesh import geomPublish
|
||||||
from .geomsmesh import geomPublishInFather
|
from .geomsmesh import geomPublishInFather
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import salome
|
|
||||||
from salome.smesh import smeshBuilder
|
|
||||||
import SMESH
|
import SMESH
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
|
@ -22,7 +22,6 @@
|
|||||||
import logging
|
import logging
|
||||||
import math
|
import math
|
||||||
|
|
||||||
import salome
|
|
||||||
from salome.smesh import smeshBuilder
|
from salome.smesh import smeshBuilder
|
||||||
import SMESH
|
import SMESH
|
||||||
|
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import salome
|
|
||||||
from salome.smesh import smeshBuilder
|
from salome.smesh import smeshBuilder
|
||||||
import SMESH
|
import SMESH
|
||||||
|
|
||||||
|
@ -24,7 +24,6 @@ import math
|
|||||||
|
|
||||||
import SMESH
|
import SMESH
|
||||||
from salome.smesh import smeshBuilder
|
from salome.smesh import smeshBuilder
|
||||||
import salome
|
|
||||||
|
|
||||||
from .geomsmesh import smesh
|
from .geomsmesh import smesh
|
||||||
|
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import salome
|
|
||||||
from salome.smesh import smeshBuilder
|
from salome.smesh import smeshBuilder
|
||||||
import SMESH
|
import SMESH
|
||||||
|
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
import salome
|
|
||||||
import SMESH
|
import SMESH
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
|
@ -138,7 +138,7 @@ def mailleFacesPeau(partitionsPeauFissFond, idFillingFromBout, facesDefaut, \
|
|||||||
texte = "i_aux = {}".format(i_aux)
|
texte = "i_aux = {}".format(i_aux)
|
||||||
logging.info(texte)
|
logging.info(texte)
|
||||||
if edgeCirc is not None:
|
if edgeCirc is not None:
|
||||||
logging.info("UseExisting1DElements depuis edgeCirc ='%s'", edgeCirc.GetName())
|
logging.info("UseExisting1DElements depuis edgeCirc = '%s'", edgeCirc.GetName())
|
||||||
algo1d = meshFacePeau.UseExisting1DElements(geom=edgeCirc) # addToStudy() failed ?
|
algo1d = meshFacePeau.UseExisting1DElements(geom=edgeCirc) # addToStudy() failed ?
|
||||||
if boutFromIfil[ifil] is None:
|
if boutFromIfil[ifil] is None:
|
||||||
hypo1d = algo1d.SourceEdges([ edgesCircPipeGroup[i_aux] ],0,0)
|
hypo1d = algo1d.SourceEdges([ edgesCircPipeGroup[i_aux] ],0,0)
|
||||||
|
@ -21,6 +21,8 @@
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
import GEOM
|
||||||
|
|
||||||
from .geomsmesh import geompy
|
from .geomsmesh import geompy
|
||||||
from .geomsmesh import geomPublish
|
from .geomsmesh import geomPublish
|
||||||
from .geomsmesh import geomPublishInFather
|
from .geomsmesh import geomPublishInFather
|
||||||
|
Loading…
Reference in New Issue
Block a user