Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/m/exp/expcoarsen.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/m/exp/expcoarsen.py (modified) (4 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/m/exp/expcoarsen.py

@@ -1 +1 @@
 import os.path
-import numpy as npy
+import numpy as  np
 from collections import OrderedDict
 from expread import expread
@@ -34 +34 @@
         for contour in  contours:
                 
-                numpoints=npy.size(contour['x'])
+                numpoints=np.size(contour['x'])
 
                 j=0
@@ -44 +44 @@
 
                         #see whether we keep this point or not
-                        distance=npy.sqrt((x[j]-x[j+1])**2+(y[j]-y[j+1])**2)
+                        distance=np.sqrt((x[j]-x[j+1])**2+(y[j]-y[j+1])**2)
                         if distance<resolution and j<numpoints-2:   #do not remove last point
-                                x=npy.delete(x,j+1,0)
-                                y=npy.delete(y,j+1,0)
+                                x=np.delete(x,j+1,0)
+                                y=np.delete(y,j+1,0)
                                 numpoints=numpoints-1
                         else:
-                                division=int(npy.floor(distance/resolution)+1)
+                                division=int(np.floor(distance/resolution)+1)
                                 if division>=2:
-                                        xi=npy.linspace(x[j],x[j+1],division)
-                                        yi=npy.linspace(y[j],y[j+1],division)
+                                        xi=np.linspace(x[j],x[j+1],division)
+                                        yi=np.linspace(y[j],y[j+1],division)
                                         
-                                        x=npy.hstack((x[0:j+1],xi[1:-1],x[j+1:]))
-                                        y=npy.hstack((y[0:j+1],yi[1:-1],y[j+1:]))
+                                        x=np.hstack((x[0:j+1],xi[1:-1],x[j+1:]))
+                                        y=np.hstack((y[0:j+1],yi[1:-1],y[j+1:]))
 
                                         #update current point
@@ -65 +65 @@
                                         j=j+1
                 
-                if npy.size(x)>1:
+                if np.size(x)>1:
                         #keep the (x,y) contour arond
                         newcontour=OrderedDict()
-                        newcontour['nods']=npy.size(x)
+                        newcontour['nods']=np.size(x)
                         newcontour['density']=contour['density']
                         newcontour['x']=x