oubli de commit

This commit is contained in:
Paul RASCLE 2014-08-28 10:06:35 +02:00
parent dc7608eb1f
commit 24792d78f6
7 changed files with 32 additions and 19 deletions

View File

@ -7,7 +7,7 @@ from blocFissure.gmu import initLog
initLog.setVerbose() initLog.setVerbose()
from blocFissure.gmu import geomsmesh from blocFissure.gmu import geomsmesh
from blocFissure.casStandard import casStandard from blocFissure.gmu.casStandard import casStandard
problemes = [] problemes = []
@ -111,12 +111,25 @@ cas=24
from blocFissure.CasTests.vis_1 import vis_1 from blocFissure.CasTests.vis_1 import vis_1
problemes.append(vis_1(cas)) 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 ... # ---tous les cas en sequence, ou les cas selectionnés ...
runall = True runall = False
if runall: 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,] 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 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, 0, 0, 0, 0, 0, 0, 0,] 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)): for i in range(len(problemes)):
if torun[i]: if torun[i]:

View File

@ -6,7 +6,7 @@ from blocFissure.gmu import initLog
initLog.setDebug() initLog.setDebug()
#initLog.setVerbose() #initLog.setVerbose()
from blocFissure.casStandard import casStandard from blocFissure.gmu.casStandard import casStandard
dicoParams = dict(nomCas = 'angleCube', dicoParams = dict(nomCas = 'angleCube',
maillageSain = os.path.join(gmu.pathBloc, 'materielCasTests/CubeAngle.med'), maillageSain = os.path.join(gmu.pathBloc, 'materielCasTests/CubeAngle.med'),

View File

@ -74,7 +74,7 @@ from blocFissure.gmu import initLog
#initLog.setDebug() #initLog.setDebug()
initLog.setVerbose() initLog.setVerbose()
from blocFissure.casStandard import casStandard from blocFissure.gmu.casStandard import casStandard
dicoParams = dict(nomCas = 'angleCube2', dicoParams = dict(nomCas = 'angleCube2',
maillageSain = 'boite.med', maillageSain = 'boite.med',

View File

@ -1179,7 +1179,7 @@ def insereFissureGenerale(maillagesSains,
aretesVivesC = geompy.MakeCompound(aretesVivesCoupees) aretesVivesC = geompy.MakeCompound(aretesVivesCoupees)
meshAretesVives = smesh.Mesh(aretesVivesC) meshAretesVives = smesh.Mesh(aretesVivesC)
algo1d = meshAretesVives.Segment() algo1d = meshAretesVives.Segment()
hypo1d = algo1d.LocalLength(dmoyen/3.0,[],1e-07) hypo1d = algo1d.LocalLength(dmoyen,[],1e-07)
putName(algo1d.GetSubMesh(), "aretesVives") putName(algo1d.GetSubMesh(), "aretesVives")
putName(algo1d, "algo1d_aretesVives") putName(algo1d, "algo1d_aretesVives")
putName(hypo1d, "hypo1d_aretesVives") putName(hypo1d, "hypo1d_aretesVives")

View File

@ -11,9 +11,9 @@ initLog.setVerbose()
from blocFissure.casStandard import casStandard from blocFissure.casStandard import casStandard
dicoParams = dict(nomCas = 'casTestCoinTripleOlivier', dicoParams = dict(nomCas = 'casTestCoinTriple',
maillageSain = '/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med', maillageSain = '/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med',
brepFaceFissure = "/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/fissureTestCoinTriple.brep", brepFaceFissure = "/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/fissureTestCoinTriple.brep",
edgeFissIds = [4], edgeFissIds = [4],
lgInfluence = 50, lgInfluence = 50,
meshBrep = (5,10), meshBrep = (5,10),
@ -21,7 +21,7 @@ dicoParams = dict(nomCas = 'casTestCoinTripleOlivier',
lenSegPipe = 7, lenSegPipe = 7,
nbSegRad = 5, nbSegRad = 5,
nbSegCercle = 10, nbSegCercle = 10,
areteFaceFissure = 10) areteFaceFissure = 20)
execInstance = casStandard(dicoParams) execInstance = casStandard(dicoParams)

View File

@ -1,4 +1,4 @@
# -*- coding: iso-8859-1 -*- # -*- coding: utf-8 -*-
import sys import sys
import salome import salome
@ -11,9 +11,9 @@ initLog.setVerbose()
from blocFissure.casStandard import casStandard from blocFissure.casStandard import casStandard
dicoParams = dict(nomCas = 'casTestCoinTriple', dicoParams = dict(nomCas = 'casTestCoinTripleMilieu',
maillageSain = '/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med', maillageSain = '/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med',
brepFaceFissure = "/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/fissureMilieuTestCoinTriple.brep", brepFaceFissure = "/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/fissureMilieuTestCoinTriple.brep",
edgeFissIds = [4], edgeFissIds = [4],
lgInfluence = 50, lgInfluence = 50,
meshBrep = (5,10), meshBrep = (5,10),

View File

@ -1,4 +1,4 @@
# -*- coding: iso-8859-1 -*- # -*- coding: utf-8 -*-
import sys import sys
import salome import salome
@ -12,8 +12,8 @@ initLog.setVerbose()
from blocFissure.casStandard import casStandard from blocFissure.casStandard import casStandard
dicoParams = dict(nomCas = 'casTestCoinTriple', dicoParams = dict(nomCas = 'casTestCoinTriple',
maillageSain = '/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med', maillageSain = '/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/cubeTestCoinTriple.med',
brepFaceFissure = "/local00/home/I48174/Documents/tubulure_simple/blocFissure/materielCoinSymetrie/fissureTransverseTestCoinTriple.brep", brepFaceFissure = "/local00/home/B27118/projets/blocFissure/blocFissure/materielCoinSymetrie/fissureTransverseTestCoinTriple.brep",
edgeFissIds = [6], edgeFissIds = [6],
lgInfluence = 50, lgInfluence = 50,
meshBrep = (5,10), meshBrep = (5,10),