Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/m/archive/arch.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/archive/arch.py (modified) (4 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/m/archive/arch.py

@@ -1 @@
-import numpy
+import numpy as np
 import math
 import struct
@@ -150 +150 @@
 def write_vector(fid,data): # {{{
         """
-        Procedure to write a numpy array to an arch file
+        Procedure to write a np.array to an arch file
         """
         # Make sure our vector is the correct shape.
         # Reshape it into a row vector if it is not correct.
         if isinstance(data,(bool,int,long,float)):
-                data=numpy.array([data])
+                data=np.array([data])
         elif isinstance(data,(list,tuple)):
-                data=numpy.array(data).reshape(-1,1)
-        
-        if numpy.ndim(data) == 1:
-                if numpy.size(data):
-                        data=data.reshape(numpy.size(data),1)
+                data=np.array(data).reshape(-1,)
+        
+        if np.ndim(data) == 1:
+                if np.size(data):
+                        data=data.reshape(np.size(data),)
                 else:
                         data=data.reshape(0,0)
@@ -216 +216 @@
                         rows=struct.unpack('>i',fid.read(struct.calcsize('>i')))[0]
                         cols=struct.unpack('>i',fid.read(struct.calcsize('>i')))[0]
-                        raw_data=numpy.zeros(shape=(rows,cols),dtype=float)
+                        raw_data=np.zeros(shape=(rows,cols),dtype=float)
                         for i in xrange(rows):
                                 raw_data[i,:]=struct.unpack('>%dd' % cols,fid.read(cols*struct.calcsize('>d')))
@@ -259 +259 @@
         elif format.shape[0] == 1 and format.shape[1] == 1:
                 code=2
-        elif isinstance(format,(list,tuple,numpy.ndarray)):
+        elif isinstance(format,(list,tuple,np.ndarray)):
                 code=3
         else: