From 24792d78f65fc60ab9a6b7e80eb7be68a5160e60 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Thu, 28 Aug 2014 10:06:35 +0200 Subject: [PATCH] oubli de commit --- .../blocFissure/CasTests/execution_Cas.py | 23 +++++++++++++++---- src/Tools/blocFissure/exemple.py | 2 +- src/Tools/blocFissure/exemple2.py | 2 +- .../blocFissure/gmu/insereFissureGenerale.py | 2 +- .../blocFissure/lanceurCasTestCoinTriple.py | 8 +++---- .../lanceurCasTestCoinTripleMilieu.py | 8 +++---- .../lanceurCasTestCoinTripleTransverse.py | 6 ++--- 7 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/Tools/blocFissure/CasTests/execution_Cas.py b/src/Tools/blocFissure/CasTests/execution_Cas.py index 2d7b80dbe..138aebf21 100644 --- a/src/Tools/blocFissure/CasTests/execution_Cas.py +++ b/src/Tools/blocFissure/CasTests/execution_Cas.py @@ -7,7 +7,7 @@ from blocFissure.gmu import initLog initLog.setVerbose() from blocFissure.gmu import geomsmesh -from blocFissure.casStandard import casStandard +from blocFissure.gmu.casStandard import casStandard problemes = [] @@ -111,12 +111,25 @@ cas=24 from blocFissure.CasTests.vis_1 import vis_1 problemes.append(vis_1(cas)) +cas=25 +from blocFissure.CasTests import cubeCoin +problemes.append(casStandard(cubeCoin.dicoParams, cubeCoin.referencesMaillageFissure, cas)) + +cas=26 +from blocFissure.CasTests import cubeMilieu +problemes.append(casStandard(cubeMilieu.dicoParams, cubeMilieu.referencesMaillageFissure, cas)) + +cas=27 +from blocFissure.CasTests import cubeTransverse +problemes.append(casStandard(cubeTransverse.dicoParams, cubeTransverse.referencesMaillageFissure, cas)) + + # ---tous les cas en sequence, ou les cas selectionnés ... -runall = True +runall = False if runall: - torun = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,] -else: #prob 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24 - torun = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,] + torun = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,] +else: #prob 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27 + torun = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1,] for i in range(len(problemes)): if torun[i]: diff --git a/src/Tools/blocFissure/exemple.py b/src/Tools/blocFissure/exemple.py index f351d59c9..d43618f9c 100644 --- a/src/Tools/blocFissure/exemple.py +++ b/src/Tools/blocFissure/exemple.py @@ -6,7 +6,7 @@ from blocFissure.gmu import initLog initLog.setDebug() #initLog.setVerbose() -from blocFissure.casStandard import casStandard +from blocFissure.gmu.casStandard import casStandard dicoParams = dict(nomCas = 'angleCube', maillageSain = os.path.join(gmu.pathBloc, 'materielCasTests/CubeAngle.med'), diff --git a/src/Tools/blocFissure/exemple2.py b/src/Tools/blocFissure/exemple2.py index e2f80738c..e7320f55b 100644 --- a/src/Tools/blocFissure/exemple2.py +++ b/src/Tools/blocFissure/exemple2.py @@ -74,7 +74,7 @@ from blocFissure.gmu import initLog #initLog.setDebug() initLog.setVerbose() -from blocFissure.casStandard import casStandard +from blocFissure.gmu.casStandard import casStandard dicoParams = dict(nomCas = 'angleCube2', maillageSain = 'boite.med', diff --git a/src/Tools/blocFissure/gmu/insereFissureGenerale.py b/src/Tools/blocFissure/gmu/insereFissureGenerale.py index 2611fa616..e3f0d0837 100644 --- a/src/Tools/blocFissure/gmu/insereFissureGenerale.py +++ b/src/Tools/blocFissure/gmu/insereFissureGenerale.py @@ -1179,7 +1179,7 @@ def insereFissureGenerale(maillagesSains, aretesVivesC = geompy.MakeCompound(aretesVivesCoupees) meshAretesVives = smesh.Mesh(aretesVivesC) algo1d = meshAretesVives.Segment() - hypo1d = algo1d.LocalLength(dmoyen/3.0,[],1e-07) + hypo1d = algo1d.LocalLength(dmoyen,[],1e-07) putName(algo1d.GetSubMesh(), "aretesVives") putName(algo1d, "algo1d_aretesVives") putName(hypo1d, "hypo1d_aretesVives") diff --git a/src/Tools/blocFissure/lanceurCasTestCoinTriple.py b/src/Tools/blocFissure/lanceurCasTestCoinTriple.py index 48836a4d8..ba11c013c 100644 --- a/src/Tools/blocFissure/lanceurCasTestCoinTriple.py +++ b/src/Tools/blocFissure/lanceurCasTestCoinTriple.py @@ -11,9 +11,9 @@ initLog.setVerbose() from blocFissure.casStandard import casStandard -dicoParams = dict(nomCas = 'casTestCoinTripleOlivier', - maillageSain = '/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med', - brepFaceFissure = "/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/fissureTestCoinTriple.brep", +dicoParams = dict(nomCas = 'casTestCoinTriple', + maillageSain = '/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med', + brepFaceFissure = "/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/fissureTestCoinTriple.brep", edgeFissIds = [4], lgInfluence = 50, meshBrep = (5,10), @@ -21,7 +21,7 @@ dicoParams = dict(nomCas = 'casTestCoinTripleOlivier', lenSegPipe = 7, nbSegRad = 5, nbSegCercle = 10, - areteFaceFissure = 10) + areteFaceFissure = 20) execInstance = casStandard(dicoParams) diff --git a/src/Tools/blocFissure/lanceurCasTestCoinTripleMilieu.py b/src/Tools/blocFissure/lanceurCasTestCoinTripleMilieu.py index ff1e295b4..f41774c9e 100644 --- a/src/Tools/blocFissure/lanceurCasTestCoinTripleMilieu.py +++ b/src/Tools/blocFissure/lanceurCasTestCoinTripleMilieu.py @@ -1,4 +1,4 @@ -# -*- coding: iso-8859-1 -*- +# -*- coding: utf-8 -*- import sys import salome @@ -11,9 +11,9 @@ initLog.setVerbose() from blocFissure.casStandard import casStandard -dicoParams = dict(nomCas = 'casTestCoinTriple', - maillageSain = '/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med', - brepFaceFissure = "/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/fissureMilieuTestCoinTriple.brep", +dicoParams = dict(nomCas = 'casTestCoinTripleMilieu', + maillageSain = '/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med', + brepFaceFissure = "/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/fissureMilieuTestCoinTriple.brep", edgeFissIds = [4], lgInfluence = 50, meshBrep = (5,10), diff --git a/src/Tools/blocFissure/lanceurCasTestCoinTripleTransverse.py b/src/Tools/blocFissure/lanceurCasTestCoinTripleTransverse.py index 365628818..134eba131 100644 --- a/src/Tools/blocFissure/lanceurCasTestCoinTripleTransverse.py +++ b/src/Tools/blocFissure/lanceurCasTestCoinTripleTransverse.py @@ -1,4 +1,4 @@ -# -*- coding: iso-8859-1 -*- +# -*- coding: utf-8 -*- import sys import salome @@ -12,8 +12,8 @@ initLog.setVerbose() from blocFissure.casStandard import casStandard dicoParams = dict(nomCas = 'casTestCoinTriple', - maillageSain = '/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med', - brepFaceFissure = "/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/fissureTransverseTestCoinTriple.brep", + maillageSain = '/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med', + brepFaceFissure = "/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/fissureTransverseTestCoinTriple.brep", edgeFissIds = [6], lgInfluence = 50, meshBrep = (5,10),