Changeset 14095

Timestamp:

12/04/12 10:53:24 (12 years ago)

Author:

jschierm

Message:

CHG: Updates for python tests 1401 and 1402.

Location:

issm/trunk-jpl/src/m

Files:

• mesh/ComputeMetric.py (modified) (1 diff)
• mesh/squaremesh.py (modified) (3 diffs)
• miscellaneous/MatlabFuncs.py (modified) (1 diff)

issm/trunk-jpl/src/m/mesh/ComputeMetric.py

@@ -54 +54 @@
         #take care of NaNs if any (use Numpy eig in a loop)
         pos=numpy.nonzero(numpy.isnan(metric))[0]
-        if pos:
+        if numpy.size(pos):
                 print(" %i NaN found in the metric. Use Numpy routine..." % numpy.size(pos))
                 for posi in pos:

issm/trunk-jpl/src/m/mesh/squaremesh.py

@@ -22 +22 @@
         #initialization
         index=numpy.zeros((nel,3),int)
-        x=numpy.zeros((nx*ny,1))
-        y=numpy.zeros((nx*ny,1))
+        x=numpy.zeros((nx*ny))
+        y=numpy.zeros((nx*ny))
 
         #create coordinates
@@ -59 +59 @@
         md.mesh.x=x
         md.mesh.y=y
-        md.mesh.z=numpy.zeros((nods,1))
+        md.mesh.z=numpy.zeros((nods))
         md.mesh.numberofvertices=nods
-        md.mesh.vertexonboundary=numpy.zeros((nods,1),bool)
+        md.mesh.vertexonboundary=numpy.zeros((nods),bool)
         md.mesh.vertexonboundary[segments[:,0:2]-1]=True
-        md.mesh.vertexonbed=numpy.ones((nods,1),bool)
-        md.mesh.vertexonsurface=numpy.ones((nods,1),bool)
+        md.mesh.vertexonbed=numpy.ones((nods),bool)
+        md.mesh.vertexonsurface=numpy.ones((nods),bool)
 
         #plug elements
@@ -70 +70 @@
         md.mesh.segments=segments
         md.mesh.numberofelements=nel
-        md.mesh.elementonbed=numpy.ones((nel,1),bool)
-        md.mesh.elementonsurface=numpy.ones((nel,1),bool)
+        md.mesh.elementonbed=numpy.ones((nel),bool)
+        md.mesh.elementonsurface=numpy.ones((nel),bool)
 
         #Now, build the connectivity tables for this mesh.

issm/trunk-jpl/src/m/miscellaneous/MatlabFuncs.py

@@ -8 +8 @@
 
         if 'Windows' in platform.system():
+                return True
+        else:
+                return False
+
+def ismac():
+        import platform
+
+        if 'Darwin' in platform.system():
                 return True
         else: