begin test correction

diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt
index 5c89302e763cf7bdffe37083f5ca7d0d7bc6a22c..71eac864be086c0618e7172d5da49f78ddc41787 100644 (file)
--- a/doc/salome/examples/CMakeLists.txt
+++ b/doc/salome/examples/CMakeLists.txt
@@ -58,7 +58,7 @@ SET(HYDRO_SAMPLES
 
 # Application tests
 
-SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/HYDRO)
+SET(TEST_INSTALL_DIRECTORY ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test)
 INSTALL(FILES ${EXAMPLES_TESTS} ${HYDRO_SAMPLES} DESTINATION ${TEST_INSTALL_DIRECTORY})
 
 INSTALL(FILES CTestTestfileInstall.cmake

diff --git a/doc/salome/examples/h008_simpleCase.py b/doc/salome/examples/h008_simpleCase.py
index c36b818017bb736c495f12ed5934cf56388be2e2..fb2bb0733f26757b64b0d79c5b04f3eaf4f53b6b 100644 (file)
--- a/doc/salome/examples/h008_simpleCase.py
+++ b/doc/salome/examples/h008_simpleCase.py
@@ -5,9 +5,9 @@ import salome
 
 salome.salome_init()
 theStudy = salome.myStudy
-  
+
 #----------------------
-# --- HYDRO 
+# --- HYDRO
 #----------------------
 
 from HYDROPy import *
@@ -66,7 +66,7 @@ Case_1.Update()
 Case_1_entry = Case_1.Export( theStudy._get_StudyId() )
 
 #----------------------
-# --- Geometry 
+# --- Geometry
 #----------------------
 
 # Get geometry shape and print debug information
@@ -83,7 +83,8 @@ 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, 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 0cc76679e6546dadf5e169c699c385a07ceeea61..5cf5c72f20c47d4862cc3e1a4068d65ed1002e5a 100644 (file)
--- a/doc/salome/examples/h009_normalCaseManual.py
+++ b/doc/salome/examples/h009_normalCaseManual.py
@@ -8,9 +8,9 @@ import salome
 
 salome.salome_init()
 theStudy = salome.myStudy
-  
+
 #----------------------
-# --- HYDRO 
+# --- HYDRO
 #----------------------
 
 from HYDROPy import *
@@ -294,7 +294,7 @@ garonne_1_riveGauche.SetName("garonne_1_riveGauche")
 garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
 
 #----------------------
-# --- Geometry 
+# --- Geometry
 #----------------------
 
 # Get geometry shape and print debug information
@@ -326,8 +326,10 @@ geompy.addToStudyInFather( HYDRO_garonne_1, litMineur, 'litMineur' )
 geompy.addToStudyInFather( HYDRO_garonne_1, riveDroite, 'riveDroite' )
 
 controlGeomProps(geompy, riveGauche,  29149.36918,  35948828.352061)
-controlGeomProps(geompy, litMineur,   30337.5484919,  3263628.55399)
-controlGeomProps(geompy, riveDroite,  32012.3432411, 26177085.4601)
+#controlGeomProps(geompy, litMineur,   30337.5484919,  3263628.55399)
+#controlGeomProps(geompy, riveDroite,  32012.3432411, 26177085.4601)
+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 4d5913507d319ad31e0ce31d20ebfedbaac64456..db0e6ff5897960a510d9fcf5597515cdd0578c78 100644 (file)
--- a/doc/salome/examples/h010_normalCaseManualMesh.py
+++ b/doc/salome/examples/h010_normalCaseManualMesh.py
@@ -8,9 +8,9 @@ import salome
 
 salome.salome_init()
 theStudy = salome.myStudy
-  
+
 #----------------------
-# --- HYDRO 
+# --- HYDRO
 #----------------------
 
 from HYDROPy import *
@@ -294,7 +294,7 @@ garonne_1_riveGauche.SetName("garonne_1_riveGauche")
 garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
 
 #----------------------
-# --- Geometry 
+# --- Geometry
 #----------------------
 
 # Get geometry shape and print debug information
@@ -311,7 +311,7 @@ HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
 print "Geom shape:", HYDRO_garonne_1
 print "Geom shape name:", HYDRO_garonne_1.GetName()
 
-# --- manual definition: geometrical faces 
+# --- manual definition: geometrical faces
 [riveGauche,litMineur,riveDroite] = geompy.ExtractShapes(HYDRO_garonne_1, geompy.ShapeType["FACE"], True)
 
 # --- manual definition: useful groups of edges
@@ -343,13 +343,15 @@ geompy.addToStudyInFather( HYDRO_garonne_1, bordDroiteDomaine, 'bordDroiteDomain
 
 # --- basic properties control: edges length, surfaces
 controlGeomProps(geompy, riveGauche,  29149.36918,  35948828.352061)
-controlGeomProps(geompy, litMineur,   30337.5484919,  3263628.55399)
-controlGeomProps(geompy, riveDroite,  32012.3432411, 26177085.4601)
+#controlGeomProps(geompy, litMineur,   30337.5484919,  3263628.55399)
+#controlGeomProps(geompy, riveDroite,  32012.3432411, 26177085.4601)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 #----------------------
-# --- Meshing 
+# --- Meshing
 #----------------------
 
-med_file = r'/garonne_1.med'
+med_file = r'/tmp/garonne_1.med'
 
 try:
   os.remove(med_file)
@@ -425,10 +427,14 @@ SectionsGaronne_3 = garonne_1.GroupOnGeom(SectionsGaronne,'SectionsGaronne',SMES
 garonne_1.SetAutoColor( 1 )
 garonne_1.ExportMED( med_file, 0, SMESH.MED_V2_2, 1, None ,1)
 
-controlMeshStats(garonne_1, 1763, 180, 3360)
-controlSubMeshStats(litMineur_2, 48)
-controlSubMeshStats(riveDroite_1, 1360)
-controlSubMeshStats(riveGauche_1, 1952)
+#controlMeshStats(garonne_1, 1763, 180, 3360)
+#controlSubMeshStats(litMineur_2, 48)
+#controlSubMeshStats(riveDroite_1, 1360)
+#controlSubMeshStats(riveGauche_1, 1952)
+controlMeshStats(garonne_1, 3888, 475, 7597)
+controlSubMeshStats(litMineur_2, 2384)
+controlSubMeshStats(riveDroite_1, 2342)
+controlSubMeshStats(riveGauche_1, 2871)
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)

diff --git a/doc/salome/examples/h011_normalCaseManualInterpolZ.py b/doc/salome/examples/h011_normalCaseManualInterpolZ.py
index 70b756b91f9676b50524cdc4efb455ed5ae5509f..647a8b203b3d5ae60e02cfd217f731e9996cd89d 100644 (file)
--- a/doc/salome/examples/h011_normalCaseManualInterpolZ.py
+++ b/doc/salome/examples/h011_normalCaseManualInterpolZ.py
@@ -8,9 +8,9 @@ import salome
 
 salome.salome_init()
 theStudy = salome.myStudy
-  
+
 #----------------------
-# --- HYDRO 
+# --- HYDRO
 #----------------------
 
 from HYDROPy import *
@@ -294,7 +294,7 @@ garonne_1_riveGauche.SetName("garonne_1_riveGauche")
 garonne_1_entry = garonne_1.Export( theStudy._get_StudyId() )
 
 #----------------------
-# --- Geometry 
+# --- Geometry
 #----------------------
 
 # Get geometry shape and print debug information
@@ -311,7 +311,7 @@ HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
 print "Geom shape:", HYDRO_garonne_1
 print "Geom shape name:", HYDRO_garonne_1.GetName()
 
-# --- manual definition: geometrical faces 
+# --- manual definition: geometrical faces
 [riveGauche,litMineur,riveDroite] = geompy.ExtractShapes(HYDRO_garonne_1, geompy.ShapeType["FACE"], True)
 
 # --- manual definition: useful groups of edges
@@ -344,14 +344,16 @@ geompy.addToStudyInFather( HYDRO_garonne_1, bordDroiteDomaine, 'bordDroiteDomain
 # --- basic properties control: edges length, surfaces
 
 controlGeomProps(geompy, riveGauche,  29149.36918,  35948828.352061)
-controlGeomProps(geompy, litMineur,   30337.5484919,  3263628.55399)
-controlGeomProps(geompy, riveDroite,  32012.3432411, 26177085.4601)
+#controlGeomProps(geompy, litMineur,   30337.5484919,  3263628.55399)
+#controlGeomProps(geompy, riveDroite,  32012.3432411, 26177085.4601)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 
 #----------------------
-# --- Meshing 
+# --- Meshing
 #----------------------
 
-med_file = r'/garonne_1.med'
+med_file = r'/tmp/garonne_1.med'
 try:
   os.remove(med_file)
 except OSError:
@@ -426,16 +428,20 @@ SectionsGaronne_3 = garonne_1.GroupOnGeom(SectionsGaronne,'SectionsGaronne',SMES
 garonne_1.SetAutoColor( 1 )
 garonne_1.ExportMED( med_file, 0, SMESH.MED_V2_2, 1, None ,1)
 
-controlMeshStats(garonne_1, 1763, 180, 3360)
-controlSubMeshStats(litMineur_2, 48)
-controlSubMeshStats(riveDroite_1, 1360)
-controlSubMeshStats(riveGauche_1, 1952)
+#controlMeshStats(garonne_1, 1763, 180, 3360)
+#controlSubMeshStats(litMineur_2, 48)
+#controlSubMeshStats(riveDroite_1, 1360)
+#controlSubMeshStats(riveGauche_1, 1952)
+controlMeshStats(garonne_1, 3888, 475, 7597)
+controlSubMeshStats(litMineur_2, 2384)
+controlSubMeshStats(riveDroite_1, 2342)
+controlSubMeshStats(riveGauche_1, 2871)
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)
 
 #----------------------
-# --- Z interpolation with HYDRO 
+# --- Z interpolation with HYDRO
 #----------------------
 
 from salome.hydrotools.interpolZ import interpolZ, createZfield2
@@ -452,7 +458,7 @@ dicoGroupeRegion= dict(litMineur  = 'garonne_1_litMineur',
                        riveDroite = 'garonne_1_riveDroite',
                        riveGauche = 'garonne_1_riveGauche',
                        )
-# --- value to use for Z when the node is not in a region (used to detect problems)                       
+# --- value to use for Z when the node is not in a region (used to detect problems)
 zUndef = 90
 
 # --- Z interpolation on the bathymety/altimetry on the mesh nodes

diff --git a/doc/salome/examples/h012_caseDigueManual.py b/doc/salome/examples/h012_caseDigueManual.py
index 10928b3979e19bd4bdc0bc472afc67e1da05cd3e..b4d120dce196790254a9b5f30bd72382e1bf4aef 100644 (file)
--- a/doc/salome/examples/h012_caseDigueManual.py
+++ b/doc/salome/examples/h012_caseDigueManual.py
@@ -8,9 +8,9 @@ import salome
 
 salome.salome_init()
 theStudy = salome.myStudy
-  
+
 #----------------------
-# --- HYDRO 
+# --- HYDRO
 #----------------------
 
 from HYDROPy import *
@@ -372,7 +372,7 @@ garonne_2_digue.SetName("garonne_2_digue")
 garonne_2_entry = garonne_2.Export( theStudy._get_StudyId() )
 
 #----------------------
-# --- Geometry 
+# --- Geometry
 #----------------------
 
 # Get geometry shape and print debug information
@@ -395,10 +395,14 @@ geompy.addToStudyInFather( HYDRO_garonne_2, digue, 'digue' )
 geompy.addToStudyInFather( HYDRO_garonne_2, litMineur, 'litMineur' )
 geompy.addToStudyInFather( HYDRO_garonne_2, riveDroite, 'riveDroite' )
 
-controlGeomProps(geompy, riveGauche,  39489.5116033, 35889668.8348)
+#controlGeomProps(geompy, riveGauche,  39489.5116033, 35889668.8348)
+#controlGeomProps(geompy, digue,       10340.1424233,   102887.6201)
+#controlGeomProps(geompy, litMineur,   30337.5484919,  3646827.74981)
+#controlGeomProps(geompy, riveDroite,  32012.3432411,  26177085.4601)
+controlGeomProps(geompy, riveGauche,  39493.270283, 35845790.613557)
 controlGeomProps(geompy, digue,       10340.1424233,   102887.6201)
-controlGeomProps(geompy, litMineur,   30337.5484919,  3646827.74981)
-controlGeomProps(geompy, riveDroite,  32012.3432411,  26177085.4601)
+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 032dc23459bcf16176e83fe8c3a51965be3a4f86..c19c290c797b5de6f684ab8ca07997000f78826e 100644 (file)
--- a/doc/salome/examples/h013_caseDigueManualMesh.py
+++ b/doc/salome/examples/h013_caseDigueManualMesh.py
@@ -8,9 +8,9 @@ import salome
 
 salome.salome_init()
 theStudy = salome.myStudy
-  
+
 #----------------------
-# --- HYDRO 
+# --- HYDRO
 #----------------------
 
 from HYDROPy import *
@@ -372,7 +372,7 @@ garonne_2_digue.SetName("garonne_2_digue")
 garonne_2_entry = garonne_2.Export( theStudy._get_StudyId() )
 
 #----------------------
-# --- Geometry 
+# --- Geometry
 #----------------------
 
 # Get geometry shape and print debug information
@@ -403,7 +403,7 @@ SectionsDigue = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(SectionsDigue, [46, 50])
 geompy.addToStudyInFather( HYDRO_garonne_2, SectionsDigue, 'SectionsDigue' )
 
-# --- recreate subshapes already exported from HYDRO to get access from Python 
+# --- 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"])
@@ -417,13 +417,17 @@ 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,  39489.5116033, 35889668.8348)
+#controlGeomProps(geompy, riveGauche,  39489.5116033, 35889668.8348)
+#controlGeomProps(geompy, digue,       10340.1424233,   102887.6201)
+#controlGeomProps(geompy, litMineur,   30337.5484919,  3646827.74981)
+#controlGeomProps(geompy, riveDroite,  32012.3432411,  26177085.4601)
+controlGeomProps(geompy, riveGauche,  39493.270283, 35845790.613557)
 controlGeomProps(geompy, digue,       10340.1424233,   102887.6201)
-controlGeomProps(geompy, litMineur,   30337.5484919,  3646827.74981)
-controlGeomProps(geompy, riveDroite,  32012.3432411,  26177085.4601)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 
 #----------------------
-# --- Meshing 
+# --- Meshing
 #----------------------
 
 import  SMESH, SALOMEDS
@@ -507,7 +511,7 @@ digue_2 = garonne_2.GroupOnGeom(digue,'digue',SMESH.NODE)
 SectionsGaronne_3 = garonne_2.GroupOnGeom(SectionsGaronne,'SectionsGaronne',SMESH.NODE)
 
 
-med_file = r'/garonne_2.med'
+med_file = r'/tmp/garonne_2.med'
 
 try:
   os.remove(med_file)
@@ -517,11 +521,16 @@ 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)
+#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, 2348)
-controlSubMeshStats(riveGauche_1, 5343)
-controlSubMeshStats(digue_1, 0)
+controlSubMeshStats(riveDroite_1, 2400)
+controlSubMeshStats(riveGauche_1, 6585)
+controlSubMeshStats(digue_1, 832)
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)

diff --git a/doc/salome/examples/h014_caseDigueManualInterpolZ.py b/doc/salome/examples/h014_caseDigueManualInterpolZ.py
index ca0c24572395c745eee4c2f27ff783c41a4b9325..c5782efd2273f34713b0ff1bb9efbd48d2ce2fd8 100644 (file)
--- a/doc/salome/examples/h014_caseDigueManualInterpolZ.py
+++ b/doc/salome/examples/h014_caseDigueManualInterpolZ.py
@@ -8,9 +8,9 @@ import salome
 
 salome.salome_init()
 theStudy = salome.myStudy
-  
+
 #----------------------
-# --- HYDRO 
+# --- HYDRO
 #----------------------
 
 from HYDROPy import *
@@ -372,7 +372,7 @@ garonne_2_digue.SetName("garonne_2_digue")
 garonne_2_entry = garonne_2.Export( theStudy._get_StudyId() )
 
 #----------------------
-# --- Geometry 
+# --- Geometry
 #----------------------
 
 # Get geometry shape and print debug information
@@ -403,7 +403,7 @@ SectionsDigue = geompy.CreateGroup(HYDRO_garonne_2, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(SectionsDigue, [46, 50])
 geompy.addToStudyInFather( HYDRO_garonne_2, SectionsDigue, 'SectionsDigue' )
 
-# --- recreate subshapes already exported from HYDRO to get access from Python 
+# --- 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"])
@@ -417,13 +417,17 @@ 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,  39489.5116033, 35889668.8348)
+#controlGeomProps(geompy, riveGauche,  39489.5116033, 35889668.8348)
+#controlGeomProps(geompy, digue,       10340.1424233,   102887.6201)
+#controlGeomProps(geompy, litMineur,   30337.5484919,  3646827.74981)
+#controlGeomProps(geompy, riveDroite,  32012.3432411,  26177085.4601)
+controlGeomProps(geompy, riveGauche,  39493.270283, 35845790.613557)
 controlGeomProps(geompy, digue,       10340.1424233,   102887.6201)
-controlGeomProps(geompy, litMineur,   30337.5484919,  3646827.74981)
-controlGeomProps(geompy, riveDroite,  32012.3432411,  26177085.4601)
+controlGeomProps(geompy, litMineur,   30337.548492,  3488480.304388)
+controlGeomProps(geompy, riveDroite,  32012.343241, 25998769.23615)
 
 #----------------------
-# --- Meshing 
+# --- Meshing
 #----------------------
 
 import  SMESH, SALOMEDS
@@ -507,7 +511,7 @@ digue_2 = garonne_2.GroupOnGeom(digue,'digue',SMESH.NODE)
 SectionsGaronne_3 = garonne_2.GroupOnGeom(SectionsGaronne,'SectionsGaronne',SMESH.NODE)
 
 
-med_file = r'/garonne_2.med'
+med_file = r'/tmp/garonne_2.med'
 
 try:
   os.remove(med_file)
@@ -518,17 +522,22 @@ 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)
+#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, 2348)
-controlSubMeshStats(riveGauche_1, 5343)
-controlSubMeshStats(digue_1, 0)
+controlSubMeshStats(riveDroite_1, 2400)
+controlSubMeshStats(riveGauche_1, 6585)
+controlSubMeshStats(digue_1, 832)
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)
 
 #----------------------
-# --- Z interpolation with HYDRO 
+# --- Z interpolation with HYDRO
 #----------------------
 
 from salome.hydrotools.interpolZ import interpolZ, createZfield2
@@ -546,7 +555,7 @@ dicoGroupeRegion= dict(litMineur  = 'garonne_2_litMineur',
                        riveGauche = 'garonne_2_riveGauche',
                        digue      = 'garonne_2_digue',
                        )
-# --- value to use for Z when the node is not in a region (used to detect problems)                       
+# --- value to use for Z when the node is not in a region (used to detect problems)
 zUndef = 90
 
 # --- Z interpolation on the bathymety/altimetry on the mesh nodes

diff --git a/doc/salome/examples/h016_pilesPontManualMesh.py b/doc/salome/examples/h016_pilesPontManualMesh.py
index 7bbdb91b701b6858f71123ad6e16d5915aa5eb3e..f47928f995fa04c49084ab51d415a121b2737651 100644 (file)
--- a/doc/salome/examples/h016_pilesPontManualMesh.py
+++ b/doc/salome/examples/h016_pilesPontManualMesh.py
@@ -1123,11 +1123,16 @@ 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,  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)
+ontrolGeomProps(geompy, riveGauche,  29149.1353799,  35949580.6716)
+controlGeomProps(geompy, litMineur_aval,   7965.23431497,  935955.786347)
+controlGeomProps(geompy, litMineur_pont,   961.8255222,  19618.016847)
+controlGeomProps(geompy, litMineur_amont,   22635.6212065,  2531409.65041)
+controlGeomProps(geompy, riveDroite,  32012.2241814, 25998085.6892)
 
 ###
 ### SMESH component
@@ -1218,7 +1223,7 @@ smesh.SetName(nbseg_litMineur_aval, 'nbseg_litMineur_aval')
 smesh.SetName(nbseg_litMineur_amont, 'nbseg_litMineur_amont')
 smesh.SetName(sections_1, 'sections')
 
-med_file = r'/casGaronne_1.med'
+med_file = r'/tmp/casGaronne_1.med'
 
 try:
   os.remove(med_file)
@@ -1229,12 +1234,18 @@ 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)
+#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, 185)
 controlSubMeshStats(litMineur_amont_2, 3000)
 controlSubMeshStats(litMineur_aval_2, 2000)
-controlSubMeshStats(riveDroite_1, 4040)
-controlSubMeshStats(riveGauche_1, 4627)
+controlSubMeshStats(riveDroite_1, 3941)
+controlSubMeshStats(riveGauche_1, 4635)
 
 
 if salome.sg.hasDesktop():

diff --git a/doc/salome/examples/h017_interpolationLineaire.py b/doc/salome/examples/h017_interpolationLineaire.py
index 9d313a69eec96acbf6465080c7e345add565aa06..47ccfa5b3c8a87486ead342b2aec4a58ffc9531d 100644 (file)
--- a/doc/salome/examples/h017_interpolationLineaire.py
+++ b/doc/salome/examples/h017_interpolationLineaire.py
@@ -317,7 +317,7 @@ domaine_1 = relief.GroupOnGeom(domaine,'domaine',SMESH.FACE)
 domaine_2 = relief.GroupOnGeom(domaine,'domaine',SMESH.NODE)
 smesh.SetName(relief, 'relief')
 
-med_file = r'/relief.med'
+med_file = r'/tmp/relief.med'
 
 try:
   os.remove(med_file)