Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/py3/classes/outputdefinition.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/py3/classes/outputdefinition.py (modified) (3 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/py3/classes/outputdefinition.py

@@ -4 +4 @@
 from checkfield import checkfield
 from WriteData import WriteData
-import numpy as npy
+import numpy as np
 
 class outputdefinition(object):
@@ -36 +36 @@
         def marshall(self,md,fid):    # {{{
                 
-                enums=npy.zeros(len(self.definitions),)
+                enums=np.zeros(len(self.definitions),)
                 
                 for i in range(len(self.definitions)):
@@ -44 +44 @@
                         enums[i]=StringToEnum(classdefinition)[0]
                 
-                enums=npy.unique(enums);
+                enums=np.unique(enums);
                 
                 WriteData(fid,'data',enums,'enum',OutputdefinitionListEnum(),'format','DoubleMat','mattype',1);