corrections to pass tests

diff --git a/doc/salome/examples/g022_extensionSimpleComplete.py b/doc/salome/examples/g022_extensionSimpleComplete.py
index 6b163c6aadc5a512a3e9ab4ad2e0a5523a6d8576..ca0df6210ee5b9ec9210c510df7c7658d058a3a2 100644 (file)
--- a/doc/salome/examples/g022_extensionSimpleComplete.py
+++ b/doc/salome/examples/g022_extensionSimpleComplete.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 

diff --git a/doc/salome/examples/g027_domaineAmont.py b/doc/salome/examples/g027_domaineAmont.py
index f473d80c407f4edf5ea742ff96f41389fe4ff819..a5ce5502803add33209deb6c53f961dc3c3d871a 100644 (file)
--- a/doc/salome/examples/g027_domaineAmont.py
+++ b/doc/salome/examples/g027_domaineAmont.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 

diff --git a/doc/salome/examples/g028_domaineAmontChevauchant.py b/doc/salome/examples/g028_domaineAmontChevauchant.py
index 9dc6fd5385da3c82f82469cfadf21dcb6614725e..e1228428a01d7f77c668bdae2e73417ef3c590e5 100644 (file)
--- a/doc/salome/examples/g028_domaineAmontChevauchant.py
+++ b/doc/salome/examples/g028_domaineAmontChevauchant.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 

diff --git a/doc/salome/examples/h021_meshChangeBathy.py b/doc/salome/examples/h021_meshChangeBathy.py
index b18a67e7bc08eadb49146e04f374a6157285289d..4ecc30e8319896297190f4a04752db0077c2c73d 100644 (file)
--- a/doc/salome/examples/h021_meshChangeBathy.py
+++ b/doc/salome/examples/h021_meshChangeBathy.py
@@ -376,7 +376,7 @@ m3d = True
 statz = interpolZ(nomCas, fichierMaillage, dicoGroupeRegion, zUndef, interpolMethod, m3d)
 #print statz
 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),
+            'riveGauche': (7.72, 71.86, 24.51, 12.18, 12.90, 60.36, 0.4),
             'litMineur': (2.06, 25.41, 13.93, 4.33, 8.47, 21.78)}
 controlStatZ(statz, refstatz)
 

diff --git a/doc/salome/examples/h022_extensionSimpleComplete.py b/doc/salome/examples/h022_extensionSimpleComplete.py
index 2fecd70bc7cddac8b1abb09fa624faf050f4dcc3..c03b19523f66f8be4fac626704e813597ca7c4de 100644 (file)
--- a/doc/salome/examples/h022_extensionSimpleComplete.py
+++ b/doc/salome/examples/h022_extensionSimpleComplete.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 tmpdir = tempfile.mkdtemp()
@@ -41,7 +41,7 @@ from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetr
 
 hydro_doc = HYDROData_Document.Document()
 hydro_doc.SetLocalCS( offsetX, offsetY )
-    
+
 limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders.shp"), 'garonne_2_brd_FreeBorders', True, 4)
 limites_domaine  = importPolylines(hydro_doc, os.path.join(HYDRO_SAMPLES, "extension_1_1.shp"), 'extension_1_1_PolyXY', False, 2)
 

diff --git a/doc/salome/examples/h023_extensionSimpleAmont.py b/doc/salome/examples/h023_extensionSimpleAmont.py
index 4587dc31448420e3d77e6ba0f1912cd1e2ff6d66..d7b78f2bf1836448ec5e59f23335eba7ce3d78d1 100644 (file)
--- a/doc/salome/examples/h023_extensionSimpleAmont.py
+++ b/doc/salome/examples/h023_extensionSimpleAmont.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 tmpdir = tempfile.mkdtemp()
@@ -45,7 +45,7 @@ from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetr
 
 hydro_doc = HYDROData_Document.Document()
 hydro_doc.SetLocalCS( offsetX, offsetY )
-    
+
 limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders', True, 4)
 limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_1_2_adj.shp"), 'extension_1_2', False, 2)
 

diff --git a/doc/salome/examples/h024_extensionSimpleAval.py b/doc/salome/examples/h024_extensionSimpleAval.py
index 6f3766feb95ea715da154143bc1a37e3c8cdee5b..48f0c028c39026d34e50e68a787f600f90688d15 100644 (file)
--- a/doc/salome/examples/h024_extensionSimpleAval.py
+++ b/doc/salome/examples/h024_extensionSimpleAval.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 tmpdir = tempfile.mkdtemp()
@@ -45,7 +45,7 @@ from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetr
 
 hydro_doc = HYDROData_Document.Document()
 hydro_doc.SetLocalCS( offsetX, offsetY )
-    
+
 limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders', True, 4)
 limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_1_3_adj.shp"), 'extension_1_3', False, 2)
 

diff --git a/doc/salome/examples/h025_extensionSimpleRiveDroite.py b/doc/salome/examples/h025_extensionSimpleRiveDroite.py
index 4f4372b24507786016e5adc7575f3b6ad4cb5858..43f1fb0c272fa707a93ecd225fa25c3da00c30d7 100644 (file)
--- a/doc/salome/examples/h025_extensionSimpleRiveDroite.py
+++ b/doc/salome/examples/h025_extensionSimpleRiveDroite.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 tmpdir = tempfile.mkdtemp()
@@ -45,7 +45,7 @@ from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetr
 
 hydro_doc = HYDROData_Document.Document()
 hydro_doc.SetLocalCS( offsetX, offsetY )
-    
+
 limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders', True, 4)
 limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_3_1_adj.shp"), 'extension_3_1', False, 2)
 

diff --git a/doc/salome/examples/h026_extensionSimpleRiveGauche.py b/doc/salome/examples/h026_extensionSimpleRiveGauche.py
index d70d8fe9d4b4b977ff4f3be119524adf2614a614..7d057101f4683e7ca19d3702be3a6af5c13d8285 100644 (file)
--- a/doc/salome/examples/h026_extensionSimpleRiveGauche.py
+++ b/doc/salome/examples/h026_extensionSimpleRiveGauche.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 tmpdir = tempfile.mkdtemp()
@@ -45,7 +45,7 @@ from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetr
 
 hydro_doc = HYDROData_Document.Document()
 hydro_doc.SetLocalCS( offsetX, offsetY )
-    
+
 limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders', True, 4)
 limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_3_2_adj.shp"), 'extension_3_2', False, 2)
 

diff --git a/doc/salome/examples/h027_regroupMeshes.py b/doc/salome/examples/h027_regroupMeshes.py
index 1bc853e5cc3d086b2002e935f33fcd92d98a68c1..4b925b30221982bda3840f91356f6bcdb914db20 100644 (file)
--- a/doc/salome/examples/h027_regroupMeshes.py
+++ b/doc/salome/examples/h027_regroupMeshes.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 tmpdir = tempfile.mkdtemp()

diff --git a/doc/salome/examples/h028_regroupOverlappingMeshes.py b/doc/salome/examples/h028_regroupOverlappingMeshes.py
index 65de8bc3f352c2518f19f49a948749efc8379b87..ed7fff866872f471b59ba03b4bd6de190ddb023b 100644 (file)
--- a/doc/salome/examples/h028_regroupOverlappingMeshes.py
+++ b/doc/salome/examples/h028_regroupOverlappingMeshes.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 tmpdir = tempfile.mkdtemp()

diff --git a/doc/salome/examples/h029_regroupMeshesNonEnglobant.py b/doc/salome/examples/h029_regroupMeshesNonEnglobant.py
index 50d2ed46fa02d5db942e73645cbc015d1a7fa510..ddb49c24c1bc26ac3ed55dbead2d9ec4dc952528 100644 (file)
--- a/doc/salome/examples/h029_regroupMeshesNonEnglobant.py
+++ b/doc/salome/examples/h029_regroupMeshesNonEnglobant.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 tmpdir = tempfile.mkdtemp()
@@ -60,7 +60,7 @@ fitShapePointsToMesh(os.path.join(tmpdir, "garonneAmont_brd_FreeBorders.shp"),
                      os.path.join(tmpdir, 'raccord_4_1_adj.shp'),
                      tmpdir, False, False)
 
-    
+
 # TODO: if limites_amont imported as spline, problem on mesh with 2D triangle algorithm
 #limites_amont = importPolylines(hydro_doc, os.path.join(tmpdir, "garonneAmont_brd_FreeBorders.shp"), 'garonneAmont_brd_FreeBorders', True, 5)
 limites_amont = importPolylines(hydro_doc, os.path.join(tmpdir, "garonneAmont_brd_FreeBorders.shp"), 'garonneAmont_brd_FreeBorders', False, 5)

diff --git a/doc/salome/examples/h030_editNonHydroMesh.py b/doc/salome/examples/h030_editNonHydroMesh.py
index 3d611e7ea7e8027015c5d26976a2d217fc2cb13d..1acfb9ab90bab6028b400f7f04291ae3f1f4c8a4 100644 (file)
--- a/doc/salome/examples/h030_editNonHydroMesh.py
+++ b/doc/salome/examples/h030_editNonHydroMesh.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 
 import tempfile
 tmpdir = tempfile.mkdtemp()

diff --git a/doc/salome/examples/h032_completeCaseNoRegions.py b/doc/salome/examples/h032_completeCaseNoRegions.py
index 5e5257d0ae4ad23b70d9c2048aedeed2631ef023..5b4858c57ffbe8b8ce6d5db6bef2017741eae1f2 100644 (file)
--- a/doc/salome/examples/h032_completeCaseNoRegions.py
+++ b/doc/salome/examples/h032_completeCaseNoRegions.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)
 

diff --git a/doc/salome/examples/h033_completeCaseModifiedRegions.py b/doc/salome/examples/h033_completeCaseModifiedRegions.py
index 651f9cb4bcb48b5dfa374fb5f658fe7c3d5bc4d9..8908397514cdb701937ece7d4dffce85d8ad6900 100644 (file)
--- a/doc/salome/examples/h033_completeCaseModifiedRegions.py
+++ b/doc/salome/examples/h033_completeCaseModifiedRegions.py
@@ -2,7 +2,7 @@
 
 import os
 HYDRO_SAMPLES = os.path.join( os.environ["HYDRO_ROOT_DIR"], "bin/salome/test/HYDRO")
-HYDRO_TEST_RESOURCES = "/home/paul/testsHydro" #os.environ("HYDRO_TEST_RESOURCES")
+HYDRO_TEST_RESOURCES = os.path.join(os.environ["HYDRO_DIR"], "bin", "salome", "test", "tmp_test")
 if not os.path.isdir(HYDRO_TEST_RESOURCES):
     os.mkdir(HYDRO_TEST_RESOURCES)