Merge remote-tracking branch 'origin/pre/V8_2_BR' into BR_PORTING_OCCT_7

[modules/hydro.git] / src / HYDROTools / interpolZ.py

diff --git a/src/HYDROTools/interpolZ.py b/src/HYDROTools/interpolZ.py
index 946ad23d477fd023ae2f4fe1c0555a49dac63fdc..bf6a48eedfea40fb08e4d407d76f44a3e94a0c42 100644 (file)
--- a/src/HYDROTools/interpolZ.py
+++ b/src/HYDROTools/interpolZ.py
@@ -36,6 +36,8 @@ salome.salome_init()
 theStudy = salome.myStudy
 theStudyId = salome.myStudyId
 
+import numpy as np
+
 # -----------------------------------------------------------------------------
 
 from med import medfile
@@ -225,9 +227,14 @@ def interpolZ(nomCas, fichierMaillage, dicoGroupeRegion, zUndef, interpolMethod
       vx.append(xyz[0])
       vy.append(xyz[1])
     vz = cas.GetAltitudesForPoints( vx, vy, region, interpolMethod )
-    minz = min(vz)
-    maxz = max(vz)
-    statz[grp.GetName()] = (minz, maxz)
+    minz = np.amin(vz)
+    maxz = np.amax(vz)
+    meanz = np.mean(vz)
+    stdz = np.std(vz)
+    v05z = np.percentile(vz,05)
+    v95z = np.percentile(vz,95)
+    
+    statz[grp.GetName()] = (minz, maxz, meanz, stdz, v05z, v95z)
 
 
     for i,nodeId in enumerate(nodesIds):