X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FTools%2FblocFissure%2FCasTests%2FfaceGauche.py;h=c0a7164f1e4c21bcf13ca54f5cbe363f98caa307;hb=403a6925d3258b5d5aa5ed723c334256b883ef24;hp=844ba861d3acae5ddd88e858770132cd79e55985;hpb=f79e964b7592c63818f892516f3b4936d7704397;p=modules%2Fsmesh.git diff --git a/src/Tools/blocFissure/CasTests/faceGauche.py b/src/Tools/blocFissure/CasTests/faceGauche.py index 844ba861d..c0a7164f1 100644 --- a/src/Tools/blocFissure/CasTests/faceGauche.py +++ b/src/Tools/blocFissure/CasTests/faceGauche.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2014-2020 EDF R&D +# Copyright (C) 2014-2021 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -27,9 +27,7 @@ import math import GEOM import SALOMEDS import SMESH -#import StdMeshers -#import GHS3DPlugin -#import NETGENPlugin + import logging from blocFissure.gmu.fissureGenerique import fissureGenerique @@ -54,7 +52,7 @@ class faceGauche(fissureGenerique): logging.info("genereMaillageSain %s", self.nomCas) ([objetSain], _) = smesh.CreateMeshesFromMED(os.path.join(gmu.pathBloc, "materielCasTests", "faceGaucheSain.med")) - smesh.SetName(objetSain.GetMesh(), 'objetSain') + smesh.SetName(objetSain.GetMesh(), "{}_objetSain".format(self.nomProbleme)) return [objetSain, True] # True : maillage hexa @@ -85,7 +83,7 @@ class faceGauche(fissureGenerique): geompy.addToStudyInFather( shellFiss, fondFiss, 'fondFiss' ) mailleur = self.mailleur2d3d() - coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,50, mailleur) + coordsNoeudsFissure = genereMeshCalculZoneDefaut(shellFiss, 5 ,50, mailleur, self.numeroCas) centre = None return [shellFiss, centre, lgInfluence, coordsNoeudsFissure, fondFiss] @@ -111,10 +109,9 @@ class faceGauche(fissureGenerique): mailleur="MeshGems"): mailleur = self.mailleur2d3d() - maillageFissure = construitFissureGenerale(maillagesSains, - shapesFissure, shapeFissureParams, - maillageFissureParams, elementsDefaut, step, \ - mailleur) + maillageFissure = construitFissureGenerale(shapesFissure, shapeFissureParams, \ + maillageFissureParams, elementsDefaut, \ + step, mailleur, self.numeroCas) return maillageFissure # ---------------------------------------------------------------------------