From 7ea81b79050d0d673fff569f9ab80239e038903c Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Thu, 9 Feb 2017 16:37:19 +0100 Subject: [PATCH] correction test case H015 --- doc/salome/examples/h010_normalCaseManualMesh.py | 6 +++--- doc/salome/examples/h011_normalCaseManualInterpolZ.py | 6 +++--- doc/salome/examples/h015_normalCaseManualTelemac.py | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/salome/examples/h010_normalCaseManualMesh.py b/doc/salome/examples/h010_normalCaseManualMesh.py index ac617de4..bd429b0e 100644 --- a/doc/salome/examples/h010_normalCaseManualMesh.py +++ b/doc/salome/examples/h010_normalCaseManualMesh.py @@ -333,7 +333,7 @@ print "Geom shape name:", HYDRO_garonne_1.GetName() garonne_1_litMineur_Outer = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(garonne_1_litMineur_Outer, [7, 9]) garonne_1_domaineEtendu_Outer = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [4, 11, 17, 24, 26, 28, 14, 19, 20, 22, 31, 39, 41, 33, 35, 37]) +geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [4, 11, 14, 16, 18, 20, 22, 24, 27, 29, 31, 33]) aval = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(aval, [4]) @@ -342,9 +342,9 @@ geompy.UnionIDs(amont, [11]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(SectionsGaronne, [4, 11]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [14, 28, 20, 24, 19, 17, 26, 22]) +geompy.UnionIDs(bordGaucheDomaine, [27, 30, 31, 33]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordDroiteDomaine, [41, 35, 31, 33, 39, 37]) +geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) # --- publications dans l'étude geompy.addToStudyInFather( HYDRO_garonne_1, riveGauche, 'riveGauche' ) diff --git a/doc/salome/examples/h011_normalCaseManualInterpolZ.py b/doc/salome/examples/h011_normalCaseManualInterpolZ.py index a874b4d0..ec0a17ec 100644 --- a/doc/salome/examples/h011_normalCaseManualInterpolZ.py +++ b/doc/salome/examples/h011_normalCaseManualInterpolZ.py @@ -333,7 +333,7 @@ print "Geom shape name:", HYDRO_garonne_1.GetName() garonne_1_litMineur_Outer = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(garonne_1_litMineur_Outer, [7, 9]) garonne_1_domaineEtendu_Outer = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [4, 11, 17, 24, 26, 28, 14, 19, 20, 22, 31, 39, 41, 33, 35, 37]) +geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [4, 11, 14, 16, 18, 20, 22, 24, 27, 29, 31, 33]) aval = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(aval, [4]) @@ -342,9 +342,9 @@ geompy.UnionIDs(amont, [11]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(SectionsGaronne, [4, 11]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [14, 28, 20, 24, 19, 17, 26, 22]) +geompy.UnionIDs(bordGaucheDomaine, [127, 30, 31, 33]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordDroiteDomaine, [41, 35, 31, 33, 39, 37]) +geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) # --- publications dans l'étude geompy.addToStudyInFather( HYDRO_garonne_1, riveGauche, 'riveGauche' ) diff --git a/doc/salome/examples/h015_normalCaseManualTelemac.py b/doc/salome/examples/h015_normalCaseManualTelemac.py index 2b28ff3c..fb40ad44 100644 --- a/doc/salome/examples/h015_normalCaseManualTelemac.py +++ b/doc/salome/examples/h015_normalCaseManualTelemac.py @@ -333,7 +333,7 @@ print "Geom shape name:", HYDRO_garonne_1.GetName() garonne_1_litMineur_Outer = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(garonne_1_litMineur_Outer, [7, 9]) garonne_1_domaineEtendu_Outer = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [4, 11, 17, 24, 26, 28, 14, 19, 20, 22, 31, 39, 41, 33, 35, 37]) +geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [4, 11, 14, 16, 18, 20, 22, 24, 27, 29, 31, 33]) aval = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(aval, [4]) @@ -342,9 +342,9 @@ geompy.UnionIDs(amont, [11]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(SectionsGaronne, [4, 11]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [14, 28, 20, 24, 19, 17, 26, 22]) +geompy.UnionIDs(bordGaucheDomaine, [27, 30, 31, 33]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordDroiteDomaine, [41, 35, 31, 33, 39, 37]) +geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) # --- publications dans l'étude geompy.addToStudyInFather( HYDRO_garonne_1, riveGauche, 'riveGauche' ) @@ -475,7 +475,7 @@ zUndef = 80 # --- Z interpolation on the bathymety/altimetry on the mesh nodes statz = interpolZ(nomCas, fichierMaillage, dicoGroupeRegion, zUndef) -refstatz = {'riveDroite': (10.88, 32.47999954), 'riveGauche': (7.72, 71.38999939), 'litMineur': (2.06, 25.41)} +refstatz = {'riveDroite': (10.88, 32.61), 'riveGauche': (7.72, 71.86, 0.5), 'litMineur': (2.06, 25.41)} controlStatZ(statz, refstatz) # --- add a field on nodes of type double with z values, named "BOTTOM" -- 2.39.2