From 1fc781b11cbb7fc6fc044821f2bedafad61b3200 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Mon, 24 Apr 2017 12:46:18 +0200 Subject: [PATCH] adaptation cas tests --- doc/salome/examples/h010_normalCaseManualMesh.py | 10 +++++----- .../examples/h011_normalCaseManualInterpolZ.py | 14 +++++++------- .../examples/h015_normalCaseManualTelemac.py | 14 +++++++------- .../h019_normalCaseManualInterpolZStrickler.py | 14 +++++++------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/doc/salome/examples/h010_normalCaseManualMesh.py b/doc/salome/examples/h010_normalCaseManualMesh.py index bd429b0e..cbef78ed 100644 --- a/doc/salome/examples/h010_normalCaseManualMesh.py +++ b/doc/salome/examples/h010_normalCaseManualMesh.py @@ -333,16 +333,16 @@ 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, 14, 16, 18, 20, 22, 24, 27, 29, 31, 33]) +geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [7, 9, 14, 16, 18, 20, 22, 24, 27, 30, 32, 33]) aval = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(aval, [4]) +geompy.UnionIDs(aval, [7]) amont = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(amont, [11]) +geompy.UnionIDs(amont, [9]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(SectionsGaronne, [4, 11]) +geompy.UnionIDs(SectionsGaronne, [7, 9]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [27, 30, 31, 33]) +geompy.UnionIDs(bordGaucheDomaine, [27, 30, 32, 33]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) diff --git a/doc/salome/examples/h011_normalCaseManualInterpolZ.py b/doc/salome/examples/h011_normalCaseManualInterpolZ.py index 74231688..b3ad4ff1 100644 --- a/doc/salome/examples/h011_normalCaseManualInterpolZ.py +++ b/doc/salome/examples/h011_normalCaseManualInterpolZ.py @@ -333,16 +333,16 @@ 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, 14, 16, 18, 20, 22, 24, 27, 29, 31, 33]) +geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [7, 9, 14, 16, 18, 20, 22, 24, 27, 30, 32, 33]) aval = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(aval, [4]) +geompy.UnionIDs(aval, [7]) amont = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(amont, [11]) +geompy.UnionIDs(amont, [9]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(SectionsGaronne, [4, 11]) +geompy.UnionIDs(SectionsGaronne, [7, 9]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [127, 30, 31, 33]) +geompy.UnionIDs(bordGaucheDomaine, [27, 30, 32, 33]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) @@ -473,8 +473,8 @@ zUndef = 90 # --- Z interpolation on the bathymety/altimetry on the mesh nodes statz = interpolZ(nomCas, fichierMaillage, dicoGroupeRegion, zUndef) #print statz -refstatz = {'riveDroite': (10.88, 32.61, 24.17, 5.12, 17.57, 31.33, 0.2), - 'riveGauche': (7.72, 71.86, 24.51, 12.18, 12.90, 60.36, 0.2), +refstatz = {'riveDroite': (10.88, 32.61, 24.17, 5.12, 17.57, 31.33, 0.25), + 'riveGauche': (7.72, 71.86, 24.51, 12.18, 12.90, 60.36, 0.25), 'litMineur': (2.06, 25.41, 13.93, 4.33, 8.47, 21.78)} controlStatZ(statz, refstatz) diff --git a/doc/salome/examples/h015_normalCaseManualTelemac.py b/doc/salome/examples/h015_normalCaseManualTelemac.py index a7bb594e..50f91365 100644 --- a/doc/salome/examples/h015_normalCaseManualTelemac.py +++ b/doc/salome/examples/h015_normalCaseManualTelemac.py @@ -333,16 +333,16 @@ 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, 14, 16, 18, 20, 22, 24, 27, 29, 31, 33]) +geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [7, 9, 14, 16, 18, 20, 22, 24, 27, 30, 32, 33]) aval = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(aval, [4]) +geompy.UnionIDs(aval, [7]) amont = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(amont, [11]) +geompy.UnionIDs(amont, [9]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(SectionsGaronne, [4, 11]) +geompy.UnionIDs(SectionsGaronne, [7, 9]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [27, 30, 31, 33]) +geompy.UnionIDs(bordGaucheDomaine, [27, 30, 32, 33]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) @@ -476,8 +476,8 @@ zUndef = 80 # --- Z interpolation on the bathymety/altimetry on the mesh nodes statz = interpolZ(nomCas, fichierMaillage, dicoGroupeRegion, zUndef) #print statz -refstatz = {'riveDroite': (10.88, 32.61, 24.17, 5.12, 17.57, 31.33, 0.2), - 'riveGauche': (7.72, 71.86, 24.51, 12.18, 12.90, 60.36, 0.2), +refstatz = {'riveDroite': (10.88, 32.61, 24.17, 5.12, 17.57, 31.33, 0.25), + 'riveGauche': (7.72, 71.86, 24.51, 12.18, 12.90, 60.36, 0.25), 'litMineur': (2.06, 25.41, 13.93, 4.33, 8.47, 21.78)} controlStatZ(statz, refstatz) diff --git a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py index 38bada13..d5e1f10f 100644 --- a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py +++ b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py @@ -623,16 +623,16 @@ 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, 14, 16, 18, 20, 22, 24, 27, 29, 31, 33]) +geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [7, 9, 14, 16, 18, 20, 22, 24, 27, 30, 32, 33]) aval = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(aval, [4]) +geompy.UnionIDs(aval, [7]) amont = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(amont, [11]) +geompy.UnionIDs(amont, [9]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(SectionsGaronne, [4, 11]) +geompy.UnionIDs(SectionsGaronne, [7, 9]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [127, 30, 31, 33]) +geompy.UnionIDs(bordGaucheDomaine, [27, 30, 32, 33]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) @@ -763,8 +763,8 @@ zUndef = 90 # --- Z interpolation on the bathymety/altimetry on the mesh nodes statz = interpolZ(nomCas, fichierMaillage, dicoGroupeRegion, zUndef) #print statz -refstatz = {'riveDroite': (10.88, 32.61, 24.17, 5.12, 17.57, 31.33, 0.2), - 'riveGauche': (7.72, 71.86, 24.51, 12.18, 12.90, 60.36, 0.2), +refstatz = {'riveDroite': (10.88, 32.61, 24.17, 5.12, 17.57, 31.33, 0.25), + 'riveGauche': (7.72, 71.86, 24.51, 12.18, 12.90, 60.36, 0.25), 'litMineur': (2.06, 25.41, 13.93, 4.33, 8.47, 21.78)} controlStatZ(statz, refstatz) -- 2.39.2