oubli de commit

diff --git a/src/Tools/blocFissure/CasTests/execution_Cas.py b/src/Tools/blocFissure/CasTests/execution_Cas.py
index 2d7b80dbe428499d89d1a03e89af720c66166086..138aebf21b53d56d161f86a33a683c1a8b852067 100644 (file)
--- 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 f351d59c94d1882d8dce025acd8cc4f94691b123..d43618f9c6dd5b6a473e3237ecac2ba4538bee15 100644 (file)
--- 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 e2f80738c49d681bd4530cba27321dc1fa0a0999..e7320f55b8391890230c7114d344bdfbf7ba1e61 100644 (file)
--- 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 2611fa616d5c30b2fa8ea42dc28f7ccdbb0c9cfa..e3f0d0837aacae79f035b4519b0798ddce69665b 100644 (file)
--- 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 48836a4d8326aa419780a5f5dc556f49b70ebe62..ba11c013c9ddd3dd46139d9d072a3cf9eafa12bc 100644 (file)
--- 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 ff1e295b41c7c3750fbb831f36dfff59fa3d6d04..f41774c9e2cc9097d4bcd0840c81ee22e0983974 100644 (file)
--- 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 365628818dca8a94f6156d3dfc9c8ba21b4c601f..134eba131955f82fe133f0d890ad5f3be2a16de1 100644 (file)
--- 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),