From 62fab9fed78d95c2b61e9fa309dc0c41dfb879a0 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Sat, 20 May 2017 10:00:28 +0200 Subject: [PATCH] ajustement parametres autotests --- .../examples/h010_normalCaseManualMesh.py | 4 +-- .../h011_normalCaseManualInterpolZ.py | 4 +-- .../examples/h013_caseDigueManualMesh.py | 33 +------------------ .../examples/h014_caseDigueManualInterpolZ.py | 2 +- .../examples/h015_normalCaseManualTelemac.py | 6 ++-- .../examples/h016_pilesPontManualMesh.py | 27 +++++---------- ...h019_normalCaseManualInterpolZStrickler.py | 4 +-- 7 files changed, 19 insertions(+), 61 deletions(-) diff --git a/doc/salome/examples/h010_normalCaseManualMesh.py b/doc/salome/examples/h010_normalCaseManualMesh.py index cbef78ed..ae8198a2 100644 --- a/doc/salome/examples/h010_normalCaseManualMesh.py +++ b/doc/salome/examples/h010_normalCaseManualMesh.py @@ -342,9 +342,9 @@ geompy.UnionIDs(amont, [9]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(SectionsGaronne, [7, 9]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [27, 30, 32, 33]) +geompy.UnionIDs(bordGaucheDomaine, [31, 34, 36, 38, 40, 41]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) +geompy.UnionIDs(bordDroiteDomaine, [14, 17, 19, 21, 23, 25, 26, 28]) # --- 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 b3ad4ff1..1e875129 100644 --- a/doc/salome/examples/h011_normalCaseManualInterpolZ.py +++ b/doc/salome/examples/h011_normalCaseManualInterpolZ.py @@ -342,9 +342,9 @@ geompy.UnionIDs(amont, [9]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(SectionsGaronne, [7, 9]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [27, 30, 32, 33]) +geompy.UnionIDs(bordGaucheDomaine, [31, 34, 36, 38, 40, 41]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) +geompy.UnionIDs(bordDroiteDomaine, [14, 17, 19, 21, 23, 25, 26, 28]) # --- publications dans l'étude geompy.addToStudyInFather( HYDRO_garonne_1, riveGauche, 'riveGauche' ) diff --git a/doc/salome/examples/h013_caseDigueManualMesh.py b/doc/salome/examples/h013_caseDigueManualMesh.py index 04289548..5b222ab3 100644 --- a/doc/salome/examples/h013_caseDigueManualMesh.py +++ b/doc/salome/examples/h013_caseDigueManualMesh.py @@ -418,23 +418,9 @@ geompy.UnionIDs(SectionsGaronne, [7, 9]) geompy.addToStudyInFather( HYDRO_garonne_2, SectionsGaronne, 'SectionsGaronne' ) SectionsDigue = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(SectionsDigue, [40, 35]) +geompy.UnionIDs(SectionsDigue, [43, 48]) geompy.addToStudyInFather( HYDRO_garonne_2, SectionsDigue, 'SectionsDigue' ) -# --- recreate subshapes already exported from HYDRO to get access from Python -#garonne_2_domaineEtendu_Outer = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"]) -#geompy.UnionIDs(garonne_2_domaineEtendu_Outer, [4, 11, 17, 24, 26, 28, 14, 19, 20, 22, 31, 39, 41, 33, 35, 37]) -#garonne_2_digue_Left_Bank = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"]) -#geompy.UnionIDs(garonne_2_digue_Left_Bank, [43]) -#garonne_2_digue_Outlet = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"]) -#geompy.UnionIDs(garonne_2_digue_Outlet, [46]) -#garonne_2_digue_Inlet = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"]) -#geompy.UnionIDs(garonne_2_digue_Inlet, [50]) -#garonne_2_litMineur_Outer = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"]) -#geompy.UnionIDs(garonne_2_litMineur_Outer, [7, 9]) -#garonne_2_digue_Right_Bank = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"]) -#geompy.UnionIDs(garonne_2_digue_Right_Bank, [48]) - controlGeomProps(geompy, riveGauche, 39490.835288, 35845737.590926) controlGeomProps(geompy, digue, 10341.466108, 103090.760662) controlGeomProps(geompy, litMineur, 30337.548492, 3488480.304388) @@ -496,12 +482,6 @@ isDone = garonne_2.SplitQuadObject( garonne_2, 1 ) isDone = garonne_2.ReorientObject( garonne_2 ) # --- geometrical groups of edges -#garonne_2_litMineur_Outer_1 = garonne_2.GroupOnGeom(garonne_2_litMineur_Outer,'garonne_2_litMineur_Outer',SMESH.EDGE) -#garonne_2_domaineEtendu_Outer_1 = garonne_2.GroupOnGeom(garonne_2_domaineEtendu_Outer,'garonne_2_domaineEtendu_Outer',SMESH.EDGE) -#aval_1 = garonne_2.GroupOnGeom(aval,'aval',SMESH.EDGE) -#amont_1 = garonne_2.GroupOnGeom(amont,'amont',SMESH.EDGE) -#bordGaucheDomaine_1 = garonne_2.GroupOnGeom(bordGaucheDomaine,'bordGaucheDomaine',SMESH.EDGE) -#bordDroiteDomaine_1 = garonne_2.GroupOnGeom(bordDroiteDomaine,'bordDroiteDomaine',SMESH.EDGE) SectionsGaronne_2 = garonne_2.GroupOnGeom(SectionsGaronne,'SectionsGaronne',SMESH.EDGE) SectionsDigue_2 = garonne_2.GroupOnGeom(SectionsDigue,'SectionsDigue',SMESH.EDGE) @@ -512,16 +492,10 @@ riveDroite_1 = garonne_2.GroupOnGeom(riveDroite,'riveDroite',SMESH.FACE) digue_1 = garonne_2.GroupOnGeom(digue,'digue',SMESH.FACE) # --- geometrical groups of nodes -#garonne_2_litMineur_Outer_2 = garonne_2.GroupOnGeom(garonne_2_litMineur_Outer,'garonne_2_litMineur_Outer',SMESH.NODE) -#garonne_2_domaineEtendu_Outer_2 = garonne_2.GroupOnGeom(garonne_2_domaineEtendu_Outer,'garonne_2_domaineEtendu_Outer',SMESH.NODE) riveGauche_2 = garonne_2.GroupOnGeom(riveGauche,'riveGauche',SMESH.NODE) litMineur_3 = garonne_2.GroupOnGeom(litMineur,'litMineur',SMESH.NODE) riveDroite_2 = garonne_2.GroupOnGeom(riveDroite,'riveDroite',SMESH.NODE) digue_2 = garonne_2.GroupOnGeom(digue,'digue',SMESH.NODE) -#aval_2 = garonne_2.GroupOnGeom(aval,'aval',SMESH.NODE) -#amont_2 = garonne_2.GroupOnGeom(amont,'amont',SMESH.NODE) -#bordGaucheDomaine_2 = garonne_2.GroupOnGeom(bordGaucheDomaine,'bordGaucheDomaine',SMESH.NODE) -#bordDroiteDomaine_2 = garonne_2.GroupOnGeom(bordDroiteDomaine,'bordDroiteDomaine',SMESH.NODE) SectionsGaronne_3 = garonne_2.GroupOnGeom(SectionsGaronne,'SectionsGaronne',SMESH.NODE) @@ -535,11 +509,6 @@ except OSError: garonne_2.SetAutoColor( 1 ) garonne_2.ExportMED( med_file, 0, SMESH.MED_V2_2, 1, None ,1) -#controlMeshStats(garonne_2, 5247, 717, 10075) -#controlSubMeshStats(litMineur_2, 2384) -#controlSubMeshStats(riveDroite_1, 2348) -#controlSubMeshStats(riveGauche_1, 5343) -#controlSubMeshStats(digue_1, 0) controlMeshStats(garonne_2, 6190, 691, 12201) controlSubMeshStats(litMineur_2, 2384) controlSubMeshStats(riveDroite_1, 2400) diff --git a/doc/salome/examples/h014_caseDigueManualInterpolZ.py b/doc/salome/examples/h014_caseDigueManualInterpolZ.py index a75330cc..b3780686 100644 --- a/doc/salome/examples/h014_caseDigueManualInterpolZ.py +++ b/doc/salome/examples/h014_caseDigueManualInterpolZ.py @@ -418,7 +418,7 @@ geompy.UnionIDs(SectionsGaronne, [7, 9]) geompy.addToStudyInFather( HYDRO_garonne_2, SectionsGaronne, 'SectionsGaronne' ) SectionsDigue = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(SectionsDigue, [40, 35]) +geompy.UnionIDs(SectionsDigue, [43, 48]) geompy.addToStudyInFather( HYDRO_garonne_2, SectionsDigue, 'SectionsDigue' ) controlGeomProps(geompy, riveGauche, 39490.835288, 35845737.590926) diff --git a/doc/salome/examples/h015_normalCaseManualTelemac.py b/doc/salome/examples/h015_normalCaseManualTelemac.py index 50f91365..ff061d34 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, [7, 9, 14, 16, 18, 20, 22, 24, 27, 30, 32, 33]) +geompy.UnionIDs(garonne_1_domaineEtendu_Outer, [7, 9, 14, 17, 18, 20, 22, 24, 26, 28, 31, 33, 35, 37, 39, 41]) aval = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(aval, [7]) @@ -342,9 +342,9 @@ geompy.UnionIDs(amont, [9]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(SectionsGaronne, [7, 9]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [27, 30, 32, 33]) +geompy.UnionIDs(bordGaucheDomaine, [31, 33, 35, 37, 39, 41]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) +geompy.UnionIDs(bordDroiteDomaine, [14, 17, 18, 20, 22, 24, 26, 28]) # --- publications dans l'étude geompy.addToStudyInFather( HYDRO_garonne_1, riveGauche, 'riveGauche' ) diff --git a/doc/salome/examples/h016_pilesPontManualMesh.py b/doc/salome/examples/h016_pilesPontManualMesh.py index d7f32c7e..94dffb39 100644 --- a/doc/salome/examples/h016_pilesPontManualMesh.py +++ b/doc/salome/examples/h016_pilesPontManualMesh.py @@ -1089,23 +1089,23 @@ geompy.UnionIDs(geomObj_8, [68, 70, 66, 63]) riveDroite = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["FACE"]) geompy.UnionIDs(riveDroite, [2]) riveGauche = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["FACE"]) -geompy.UnionIDs(riveGauche, [29]) +geompy.UnionIDs(riveGauche, [33]) litMineur_aval = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["FACE"]) -geompy.UnionIDs(litMineur_aval, [22]) +geompy.UnionIDs(litMineur_aval, [26]) litMineur_pont = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["FACE"]) -geompy.UnionIDs(litMineur_pont, [42]) +geompy.UnionIDs(litMineur_pont, [50]) litMineur_amont = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["FACE"]) -geompy.UnionIDs(litMineur_amont, [81]) +geompy.UnionIDs(litMineur_amont, [89]) sections = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(sections, [24, 28, 44, 83]) +geompy.UnionIDs(sections, [28, 32, 52, 91]) amont = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(amont, [83]) +geompy.UnionIDs(amont, [91]) aval = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(aval, [28]) bordDroit = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordDroit, [4, 7, 9, 11, 19, 21]) +geompy.UnionIDs(bordDroit, [4, 7, 9, 11, 13, 15, 23, 25]) bordGauche = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGauche, [31, 34, 36, 41]) +geompy.UnionIDs(bordGauche, [35, 41, 43, 45, 47, 49]) piles = geompy.CreateGroup(HYDRO_casGaronne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(piles, [73,58,71,49,55,67,46,80,53,76,78,62,69,60,51,64]) geompy.addToStudyInFather( HYDRO_casGaronne_1, casGaronne_1_pile3_Outer, 'casGaronne_1_pile3_Outer' ) @@ -1129,11 +1129,6 @@ geompy.addToStudyInFather( HYDRO_casGaronne_1, bordGauche, 'bordGauche' ) geompy.addToStudyInFather( HYDRO_casGaronne_1, piles, 'piles' ) # --- basic properties control: edges length, surfaces -#controlGeomProps(geompy, riveGauche, 29149.1353799, 35950762.8967) -#controlGeomProps(geompy, litMineur_aval, 7965.23431497, 938890.904721) -#controlGeomProps(geompy, litMineur_pont, 961.8255222, 19618.0787789) -#controlGeomProps(geompy, litMineur_amont, 22635.6212065, 2548509.17447) -#controlGeomProps(geompy, riveDroite, 32012.2241814, 26188706.2202) controlGeomProps(geompy, riveGauche, 29149.1353799, 35949580.6716) controlGeomProps(geompy, litMineur_aval, 7965.23431497, 935955.786347) controlGeomProps(geompy, litMineur_pont, 961.8255222, 19618.016847) @@ -1240,12 +1235,6 @@ except OSError: casGaronne_1.SetAutoColor( 1 ) casGaronne_1.ExportMED( med_file, 0, SMESH.MED_V2_2, 1, None ,1) -#controlMeshStats(casGaronne_1, 7040, 746, 13871) -#controlSubMeshStats(litMineur_pont_2, 204) -#controlSubMeshStats(litMineur_amont_2, 3000) -#controlSubMeshStats(litMineur_aval_2, 2000) -#controlSubMeshStats(riveDroite_1, 4040) -#controlSubMeshStats(riveGauche_1, 4627) controlMeshStats(casGaronne_1, 6985, 745, 13761) controlSubMeshStats(litMineur_pont_2, 202) controlSubMeshStats(litMineur_amont_2, 3000) diff --git a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py index d5e1f10f..5af2c60e 100644 --- a/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py +++ b/doc/salome/examples/h019_normalCaseManualInterpolZStrickler.py @@ -632,9 +632,9 @@ geompy.UnionIDs(amont, [9]) SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) geompy.UnionIDs(SectionsGaronne, [7, 9]) bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordGaucheDomaine, [27, 30, 32, 33]) +geompy.UnionIDs(bordGaucheDomaine, [31, 34, 36, 38, 40, 41]) bordDroiteDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"]) -geompy.UnionIDs(bordDroiteDomaine, [14, 16, 18, 20, 22, 24]) +geompy.UnionIDs(bordDroiteDomaine, [14, 17, 19, 21, 23, 25, 26, 28]) # --- publications dans l'étude geompy.addToStudyInFather( HYDRO_garonne_1, riveGauche, 'riveGauche' ) -- 2.39.2