From: Paul RASCLE <paul.rascle@edf.fr>
Date: Mon, 30 May 2016 12:25:07 +0000 (+0200)
Subject: calculation of areas was incorrect (lack of precision) with SALOME V7.7.1: bug mantis... 
X-Git-Tag: v1.6~111
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b720bfb60e3391cb13feca1a49c1eff3168f2bfb;p=modules%2Fhydro.git

calculation of areas was incorrect (lack of precision) with SALOME V7.7.1: bug mantis 23247 corrected in V7_8
---

diff --git a/doc/salome/examples/h008_simpleCase.py b/doc/salome/examples/h008_simpleCase.py
index c36b8180..3779bc97 100644
--- a/doc/salome/examples/h008_simpleCase.py
+++ b/doc/salome/examples/h008_simpleCase.py
@@ -83,7 +83,7 @@ Case_1_geom = salome.IDToObject( str( Case_1_entry ) )
 print "Geom shape:", Case_1_geom
 print "Geom shape name:", Case_1_geom.GetName()
 
-controlGeomProps(geompy, Case_1_geom, 1218.7373973, 49697.2117918)
+controlGeomProps(geompy, Case_1_geom, 1218.7373973, 49578.1516521)
    
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)
diff --git a/doc/salome/examples/h009_normalCaseManual.py b/doc/salome/examples/h009_normalCaseManual.py
index f15bf500..f44f63b2 100644
--- a/doc/salome/examples/h009_normalCaseManual.py
+++ b/doc/salome/examples/h009_normalCaseManual.py
@@ -325,9 +325,9 @@ geompy.addToStudyInFather( HYDRO_garonne_1, riveGauche, 'riveGauche' )
 geompy.addToStudyInFather( HYDRO_garonne_1, litMineur, 'litMineur' )
 geompy.addToStudyInFather( HYDRO_garonne_1, riveDroite, 'riveDroite' )
 
-controlGeomProps(geompy, riveGauche,  29149.36918,  35992556.454929)
-controlGeomProps(geompy, litMineur,   30337.548492,  3646827.749809)
-controlGeomProps(geompy, riveDroite,  32012.343241, 26177085.460092)
+controlGeomProps(geompy, riveGauche,  29149.36918,  35948828.352061)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)
diff --git a/doc/salome/examples/h010_normalCaseManualMesh.py b/doc/salome/examples/h010_normalCaseManualMesh.py
index d7f88d13..4b205db5 100644
--- a/doc/salome/examples/h010_normalCaseManualMesh.py
+++ b/doc/salome/examples/h010_normalCaseManualMesh.py
@@ -342,9 +342,9 @@ geompy.addToStudyInFather( HYDRO_garonne_1, bordGaucheDomaine, 'bordGaucheDomain
 geompy.addToStudyInFather( HYDRO_garonne_1, bordDroiteDomaine, 'bordDroiteDomaine' )
 
 # --- basic properties control: edges length, surfaces
-controlGeomProps(geompy, riveGauche,  29149.36918,  35992556.454929)
-controlGeomProps(geompy, litMineur,   30337.548492,  3646827.749809)
-controlGeomProps(geompy, riveDroite,  32012.343241, 26177085.460092)
+controlGeomProps(geompy, riveGauche,  29149.36918,  35948828.352061)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 
 #----------------------
 # --- Meshing 
diff --git a/doc/salome/examples/h011_normalCaseManualInterpolZ.py b/doc/salome/examples/h011_normalCaseManualInterpolZ.py
index cbd67350..071974fb 100644
--- a/doc/salome/examples/h011_normalCaseManualInterpolZ.py
+++ b/doc/salome/examples/h011_normalCaseManualInterpolZ.py
@@ -342,9 +342,9 @@ geompy.addToStudyInFather( HYDRO_garonne_1, bordGaucheDomaine, 'bordGaucheDomain
 geompy.addToStudyInFather( HYDRO_garonne_1, bordDroiteDomaine, 'bordDroiteDomaine' )
 
 # --- basic properties control: edges length, surfaces
-controlGeomProps(geompy, riveGauche,  29149.36918,  35992556.454929)
-controlGeomProps(geompy, litMineur,   30337.548492,  3646827.749809)
-controlGeomProps(geompy, riveDroite,  32012.343241, 26177085.460092)
+controlGeomProps(geompy, riveGauche,  29149.36918,  35948828.352061)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 
 #----------------------
 # --- Meshing 
diff --git a/doc/salome/examples/h012_caseDigueManual.py b/doc/salome/examples/h012_caseDigueManual.py
index 311cbaf7..7bb8be11 100644
--- a/doc/salome/examples/h012_caseDigueManual.py
+++ b/doc/salome/examples/h012_caseDigueManual.py
@@ -395,10 +395,10 @@ geompy.addToStudyInFather( HYDRO_garonne_2, digue, 'digue' )
 geompy.addToStudyInFather( HYDRO_garonne_2, litMineur, 'litMineur' )
 geompy.addToStudyInFather( HYDRO_garonne_2, riveDroite, 'riveDroite' )
 
-controlGeomProps(geompy, riveGauche,  39493.270103, 35885901.558025)
-controlGeomProps(geompy, digue,       10343.900923,   103893.397004)
-controlGeomProps(geompy, litMineur,   30337.548492,  3646827.749809)
-controlGeomProps(geompy, riveDroite,  32012.343241, 26177085.460092)
+controlGeomProps(geompy, riveGauche,  39493.270283, 35845790.613557)
+controlGeomProps(geompy, digue,       10343.901103,   103037.738504)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)
diff --git a/doc/salome/examples/h013_caseDigueManualMesh.py b/doc/salome/examples/h013_caseDigueManualMesh.py
index ab55e730..234958df 100644
--- a/doc/salome/examples/h013_caseDigueManualMesh.py
+++ b/doc/salome/examples/h013_caseDigueManualMesh.py
@@ -417,10 +417,10 @@ geompy.addToStudyInFather( HYDRO_garonne_2, SectionsDigue, 'SectionsDigue' )
 #garonne_2_digue_Right_Bank = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"])
 #geompy.UnionIDs(garonne_2_digue_Right_Bank, [48])
 
-controlGeomProps(geompy, riveGauche,  39493.270103, 35885901.558025)
-controlGeomProps(geompy, digue,       10343.900923,   103893.397004)
-controlGeomProps(geompy, litMineur,   30337.548492,  3646827.749809)
-controlGeomProps(geompy, riveDroite,  32012.343241, 26177085.460092)
+controlGeomProps(geompy, riveGauche,  39493.270283, 35845790.613557)
+controlGeomProps(geompy, digue,       10343.901103,   103037.738504)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 
 #----------------------
 # --- Meshing 
diff --git a/doc/salome/examples/h014_caseDigueManualInterpolZ.py b/doc/salome/examples/h014_caseDigueManualInterpolZ.py
index 501fd091..63604b15 100644
--- a/doc/salome/examples/h014_caseDigueManualInterpolZ.py
+++ b/doc/salome/examples/h014_caseDigueManualInterpolZ.py
@@ -417,10 +417,10 @@ geompy.addToStudyInFather( HYDRO_garonne_2, SectionsDigue, 'SectionsDigue' )
 #garonne_2_digue_Right_Bank = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"])
 #geompy.UnionIDs(garonne_2_digue_Right_Bank, [48])
 
-controlGeomProps(geompy, riveGauche,  39493.270103, 35885901.558025)
-controlGeomProps(geompy, digue,       10343.900923,   103893.397004)
-controlGeomProps(geompy, litMineur,   30337.548492,  3646827.749809)
-controlGeomProps(geompy, riveDroite,  32012.343241, 26177085.460092)
+controlGeomProps(geompy, riveGauche,  39493.270283, 35845790.613557)
+controlGeomProps(geompy, digue,       10343.901103,   103037.738504)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 
 #----------------------
 # --- Meshing 
diff --git a/doc/salome/examples/h015_normalCaseManualTelemac.py b/doc/salome/examples/h015_normalCaseManualTelemac.py
index 93600bf0..10d67570 100644
--- a/doc/salome/examples/h015_normalCaseManualTelemac.py
+++ b/doc/salome/examples/h015_normalCaseManualTelemac.py
@@ -342,9 +342,9 @@ geompy.addToStudyInFather( HYDRO_garonne_1, bordGaucheDomaine, 'bordGaucheDomain
 geompy.addToStudyInFather( HYDRO_garonne_1, bordDroiteDomaine, 'bordDroiteDomaine' )
 
 # --- basic properties control: edges length, surfaces
-controlGeomProps(geompy, riveGauche,  29149.36918,  35992556.454929)
-controlGeomProps(geompy, litMineur,   30337.548492,  3646827.749809)
-controlGeomProps(geompy, riveDroite,  32012.343241, 26177085.460092)
+controlGeomProps(geompy, riveGauche,  29149.36918,  35948828.352061)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 
 #----------------------
 # --- Meshing 
diff --git a/src/HYDROTools/controls.py b/src/HYDROTools/controls.py
index a69e6ec4..8f7f3c53 100644
--- a/src/HYDROTools/controls.py
+++ b/src/HYDROTools/controls.py
@@ -5,7 +5,7 @@
 def controlGeomProps(geompy, geomShape, refLength, refArea):
   """
   compare area and length of a geometric face with a reference,
-  with relative precision of 1.E-7 
+  with relative precision of 1.E-3 
   """
   props = geompy.BasicProperties(geomShape)
   print " Wires length: ", props[0]