X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=doc%2Fsalome%2Fexamples%2Fh011_normalCaseManualInterpolZ.py;h=6f71f1a47f6ae78afc048fb1fb65b26aa3e45f41;hb=ef44f612e7baa53c452b3ceb2b7202b8330eb234;hp=a91bff698e70dc8286c5820ab3fcadab9d6428c8;hpb=e8d04707748cf853f78492aba72adb6b6789d8ba;p=modules%2Fhydro.git

diff --git a/doc/salome/examples/h011_normalCaseManualInterpolZ.py b/doc/salome/examples/h011_normalCaseManualInterpolZ.py
index a91bff69..6f71f1a4 100644
--- a/doc/salome/examples/h011_normalCaseManualInterpolZ.py
+++ b/doc/salome/examples/h011_normalCaseManualInterpolZ.py
@@ -479,7 +479,7 @@ if salome.sg.hasDesktop():
 # --- Z interpolation with HYDRO
 #----------------------
 
-from salome.hydrotools.interpolZ import interpolZ, createZfield2
+from salome.hydrotools.interpolZ import interpolZ
 from salome.hydrotools.controls import controlStatZ
 
 # --- case name in HYDRO
@@ -488,22 +488,26 @@ nomCas = 'garonne_1'
 # --- med file 2D(x,y) of the case produced by SMESH
 
 # --- dictionary [med group name] = region name
-dicoGroupeRegion= dict(garonne_1_litMineur  = 'garonne_1_litMineur',
-                       garonne_1_riveDroite = 'garonne_1_riveDroite',
-                       garonne_1_riveGauche = 'garonne_1_riveGauche',
+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)
 zUndef = 90
+# --- interpolation Method: 0 = nearest point on bathymetry (default), 1 = linear interpolation
+interpolMethod = 0
+# --- produce a 3D mesh (Z set to its value instead of 0
+m3d = True
 
 # --- Z interpolation on the bathymety/altimetry on the mesh nodes
-statz = interpolZ(nomCas, fichierMaillage, dicoGroupeRegion, zUndef)
+statz = interpolZ(nomCas, fichierMaillage, dicoGroupeRegion, zUndef, interpolMethod, m3d)
 #print statz
-refstatz = {'garonne_1_riveDroite': (10.88, 32.61, 24.17, 5.12, 17.57, 31.33, 0.25),
-            'garonne_1_riveGauche': (7.72, 71.86, 24.51, 12.18, 12.90, 60.36, 0.25),
-            'garonne_1_litMineur': (2.06, 25.41, 13.93, 4.33, 8.47, 21.78)}
+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),
+            'litMineur': (2.06, 25.41, 13.93, 4.33, 8.47, 21.78)}
 controlStatZ(statz, refstatz)
 
 # --- add a field on nodes of type double with z values, named "BOTTOM"
-createZfield2(fichierMaillage)
+#createZfield2(fichierMaillage)