Changeset 17868

Timestamp:

04/29/14 07:45:36 (11 years ago)

Author:

cborstad

Message:

CHG: levelsets should only need to be rank-1 arrays

File:

• issm/trunk-jpl/src/m/parameterization/setmask.py (modified) (2 diffs)

issm/trunk-jpl/src/m/parameterization/setmask.py

@@ -55 +55 @@
 
         #level sets
-        md.mask.groundedice_levelset = -1.*numpy.ones((md.mesh.numberofvertices,1))
+        md.mask.groundedice_levelset = -1.*numpy.ones(md.mesh.numberofvertices)
         md.mask.groundedice_levelset[md.mesh.elements[numpy.nonzero(elementongroundedice),:]-1]=1.
 
         if(len(args)):
-                md.mask.ice_levelset = 1.*numpy.ones((md.mesh.numberofvertices,1))
+                md.mask.ice_levelset = 1.*numpy.ones(md.mesh.numberofvertices)
                 icedomainfile = options.getfieldvalue('icedomain','none')
                 if not os.path.exists(icedomainfile):
@@ -67 +67 @@
                 md.mask.ice_levelset[numpy.nonzero(vertexinsideicedomain)[0]] = -1.
         else:
-                md.mask.ice_levelset = -1.*numpy.ones((md.mesh.numberofvertices,1))
+                md.mask.ice_levelset = -1.*numpy.ones(md.mesh.numberofvertices)
 
         return md