Changeset 17732

Timestamp:

04/14/14 20:54:53 (11 years ago)

Author:

cborstad

Message:

BUG: wrong handle for numpy

File:

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

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

@@ -329 +329 @@
                 #Edges
                 if m.strcmp(md.mesh.domaintype(),'2Dhorizontal'):
-                        if numpy.ndim(md2.mesh.edges)>1 and numpy.size(md2.mesh.edges,axis=1)>1:    #do not use ~isnan because there are some npy.nans...
+                        if numpy.ndim(md2.mesh.edges)>1 and numpy.size(md2.mesh.edges,axis=1)>1:    #do not use ~isnan because there are some numpy.nans...
                                 #renumber first two columns
                                 pos=numpy.nonzero(md2.mesh.edges[:,3]!=-1)[0]
@@ -395 +395 @@
                                 md2.stressbalance.spcvy[nodestoflag2]=md2.inversion.vy_obs[nodestoflag2]
                         else:
-                                md2.stressbalance.spcvx[nodestoflag2]=npy.nan
-                                md2.stressbalance.spcvy[nodestoflag2]=npy.nan
+                                md2.stressbalance.spcvx[nodestoflag2]=numpy.nan
+                                md2.stressbalance.spcvy[nodestoflag2]=numpy.nan
                                 print "\n!! extract warning: spc values should be checked !!\n\n"
                         #put 0 for vz