calculation of areas was incorrect (lack of precision) with SALOME V7.7.1: bug mantis...

diff --git a/doc/salome/examples/h008_simpleCase.py b/doc/salome/examples/h008_simpleCase.py
index c36b818017bb736c495f12ed5934cf56388be2e2..3779bc9701920ff345e63a4dee323f09ae560cb8 100644 (file)
--- 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 f15bf5005dff36783d46a8bc03d3318298454b02..f44f63b25d364511e96bad0fa8e6ab135c2536b4 100644 (file)
--- 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 d7f88d138046bdb0dba7cb3d9e2d00253ee14564..4b205db5bfbbfef11eada01366c71157b65d67ee 100644 (file)
--- 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 cbd67350549415e3fde5d13e41ea7cd00fcb9f1b..071974fb54a9c415b9bb4d6cef4651de4a4ff97f 100644 (file)
--- 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 311cbaf7f1d361438577af43e1bafe323dc73e28..7bb8be11243da51e62a1a21f4e7966d5aa8585a8 100644 (file)
--- 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 ab55e7301edfb78e219ab035d68b6e3ce339e8f8..234958df88c038db6ac318db550b8c7368a2ceb9 100644 (file)
--- 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 501fd09179bccf3f852bb0c9a7c3f5b740c7782d..63604b15c1f5ae80a583052fccf958d282ed5dfc 100644 (file)
--- 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 93600bf087bbfb193447d5ca45098fa51da02517..10d67570bc25772ba61525fe08b1acab7acdd06d 100644 (file)
--- 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 a69e6ec4104e331dbebcf9ea75ab3dcc9115276d..8f7f3c531475fc4e74b8fd599f3e009403923fa8 100644 (file)
--- 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]