Changeset 13992

Timestamp:

11/20/12 15:04:57 (12 years ago)

Author:

jschierm

Message:

FIX: Python submatrices must be copied before passing into modules.

Location:

issm/trunk-jpl/src/m

Files:

• classes/flowequation.py (modified) (1 diff)
• geometry/FlagElements.py (modified) (1 diff)

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

@@ -37 +37 @@
                 string='   flow equation parameters:'
 
-                string="%s\n\n%s"%(string,fielddisplay(self,'ismacayealpattyn','is the macayeal or pattyn approximation used ?'))
-                string="%s\n%s"%(string,fielddisplay(self,'ishutter','is the shallow ice approximation used ?'))
-                string="%s\n%s"%(string,fielddisplay(self,'isl1l2','are l1l2 equations used ?'))
-                string="%s\n%s"%(string,fielddisplay(self,'isstokes','are the Full-Stokes equations used ?'))
-                string="%s\n%s"%(string,fielddisplay(self,'vertex_equation','flow equation for each vertex'))
-                string="%s\n%s"%(string,fielddisplay(self,'element_equation','flow equation for each element'))
-                string="%s\n%s"%(string,fielddisplay(self,'bordermacayeal','vertices on MacAyeal''s border (for tiling)'))
-                string="%s\n%s"%(string,fielddisplay(self,'borderpattyn','vertices on Pattyn''s border (for tiling)'))
-                string="%s\n%s"%(string,fielddisplay(self,'borderstokes','vertices on Stokes'' border (for tiling)'))
+                string="%s\n\n%s"%(string,fielddisplay(self,'ismacayealpattyn',"is the macayeal or pattyn approximation used ?"))
+                string="%s\n%s"%(string,fielddisplay(self,'ishutter',"is the shallow ice approximation used ?"))
+                string="%s\n%s"%(string,fielddisplay(self,'isl1l2',"are l1l2 equations used ?"))
+                string="%s\n%s"%(string,fielddisplay(self,'isstokes',"are the Full-Stokes equations used ?"))
+                string="%s\n%s"%(string,fielddisplay(self,'vertex_equation',"flow equation for each vertex"))
+                string="%s\n%s"%(string,fielddisplay(self,'element_equation',"flow equation for each element"))
+                string="%s\n%s"%(string,fielddisplay(self,'bordermacayeal',"vertices on MacAyeal's border (for tiling)"))
+                string="%s\n%s"%(string,fielddisplay(self,'borderpattyn',"vertices on Pattyn's border (for tiling)"))
+                string="%s\n%s"%(string,fielddisplay(self,'borderstokes',"vertices on Stokes' border (for tiling)"))
                 return string
                 #}}}

issm/trunk-jpl/src/m/geometry/FlagElements.py

@@ -44 +44 @@
                                 xlim,ylim=basinzoom('basin',region)
                                 flag_nodes=numpy.logical_and(numpy.logical_and(md.mesh.x<xlim[1],md.mesh.x>xlim[0]),numpy.logical_and(md.mesh.y<ylim[1],md.mesh.y>ylim[0]))
-                                flag=numpy.prod(flag_nodes[md.mesh.elements].astype(float),axis=1).astype(bool)
+                                flag=numpy.prod(flag_nodes[md.mesh.elements],axis=1).astype(bool)
                         else:
                                 #ok, flag elements
-                                [flag,dum]=ContourToMesh(md.mesh.elements[:,0:3],md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),region,'element',1)
+                                [flag,dum]=ContourToMesh(md.mesh.elements[:,0:3].copy(),md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),region,'element',1)
                                 flag=flag.astype(bool)