adaptation des tests pour interpolZ sur les groupes de mailles

[modules/hydro.git] / doc / salome / examples / h017_interpolationLineaire.py

diff --git a/doc/salome/examples/h017_interpolationLineaire.py b/doc/salome/examples/h017_interpolationLineaire.py
index 63073d54b1f57a8cacfa7e818f338fa881f7200e..46e4e8f69ae9e49480760999192cf56a71227070 100644 (file)
--- a/doc/salome/examples/h017_interpolationLineaire.py
+++ b/doc/salome/examples/h017_interpolationLineaire.py
@@ -14,8 +14,8 @@ theStudy = salome.myStudy
 ###
 
 from HYDROPy import *
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt5.QtCore import *
+from PyQt5.QtGui import *
 
 hydro_doc = HYDROData_Document.Document( theStudy._get_StudyId() )
 
@@ -282,10 +282,6 @@ import SALOMEDS
 
 geompy = geomBuilder.New(theStudy)
 
-#geomObj_1 = geompy.CreateGroup(HYDRO_etude, geompy.ShapeType["EDGE"])
-#geompy.UnionIDs(geomObj_1, [7, 9])
-#geomObj_3 = geompy.CreateGroup(HYDRO_etude, geompy.ShapeType["EDGE"])
-#geompy.UnionIDs(geomObj_3, [4, 11, 17, 24, 26, 28, 14, 19, 20, 22, 31, 39, 41, 33, 35, 37])
 etude_domaine_Outer = geompy.CreateGroup(HYDRO_etude_1, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(etude_domaine_Outer, [3, 6, 8, 10])
 domaine = geompy.CreateGroup(HYDRO_etude_1, geompy.ShapeType["FACE"])
@@ -316,8 +312,17 @@ isDone = relief.Compute()
 domaine_1 = relief.GroupOnGeom(domaine,'domaine',SMESH.FACE)
 domaine_2 = relief.GroupOnGeom(domaine,'domaine',SMESH.NODE)
 smesh.SetName(relief, 'relief')
+
+med_file = r'/tmp/relief.med'
+
+try:
+  os.remove(med_file)
+except OSError:
+  pass
+
+
 try:
-  relief.ExportMED( r'/tmp/relief.med', 0, SMESH.MED_V2_2, 1, None ,1)
+  relief.ExportMED( med_file, 0, SMESH.MED_V2_2, 1, None ,1)
 except:
   print 'ExportToMEDX() failed. Invalid file name?'
 
@@ -344,7 +349,7 @@ from salome.hydrotools.controls import controlStatZ
 nomCas = 'etude'
 
 # --- fichier med 2D(x,y) du cas, produit par SMESH
-fichierMaillage = '/tmp/relief.med'
+fichierMaillage = med_file
 
 # --- dictionnaire: (clé = nom de groupe med, valeur= nom de région)
 dicoGroupeRegion= dict(domaine  = 'etude_Reg_1',
@@ -360,8 +365,9 @@ zUndef = 90
 
 # --- Z interpolation Z sur la bathymetrie/altimetrie aux noeuds du maillage
 statz = interpolZ(nomCas, fichierMaillage, dicoGroupeRegion, zUndef, interpolMethod)
-refstatz = {'domaine': (27.101, 168.257)}
+#print statz
+refstatz = {'domaine': (27.10, 168.28, 91.77, 46.047, 28.637, 161.17)}
 controlStatZ(statz, refstatz)
 
 # --- add a field on nodes of type double with z values, named "BOTTOM"
-createZfield2(fichierMaillage)
+#createZfield2(fichierMaillage)