Changeset 14007

Timestamp:

11/27/12 10:07:53 (12 years ago)

Author:

jschierm

Message:

CHG: Remove extra (and ugly) conversions for python md.mesh.elementconnectivity.

File:

• issm/trunk-jpl/src/m/classes/model/model.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/model/model.py

@@ -2 +2 @@
 import numpy
 import copy
+import sys
 from mesh import mesh
 from mask import mask
@@ -648 +649 @@
                 #connectivity
                 md.mesh.elementconnectivity=numpy.tile(md.mesh.elementconnectivity,(numlayers-1,1))
-                md.mesh.elementconnectivity=md.mesh.elementconnectivity.astype(float)
-                md.mesh.elementconnectivity[numpy.nonzero(md.mesh.elementconnectivity==0)]=float('NaN')
+                md.mesh.elementconnectivity[numpy.nonzero(md.mesh.elementconnectivity==0)]=-sys.maxint-1
                 for i in xrange(1,numlayers-1):
                         md.mesh.elementconnectivity[i*md.mesh.numberofelements2d:(i+1)*md.mesh.numberofelements2d,:] \
                                 =md.mesh.elementconnectivity[i*md.mesh.numberofelements2d:(i+1)*md.mesh.numberofelements2d,:]+md.mesh.numberofelements2d
-                md.mesh.elementconnectivity[numpy.nonzero(numpy.isnan(md.mesh.elementconnectivity))]=0
-                md.mesh.elementconnectivity=md.mesh.elementconnectivity.astype(int)
+                md.mesh.elementconnectivity[numpy.nonzero(md.mesh.elementconnectivity<0)]=0
 
                 #materials