Changeset 2455 for trunk

Timestamp:

01/16/2008 11:32:27 AM (12 months ago)

Author:

wd15

Message:

updating fipy for numpy 1.0.4

Location:

trunk/fipy

Files:

• meshes/numMesh/mesh.py (modified) (1 diff)
• tools/numerix.py (modified) (2 diffs)

trunk/fipy/meshes/numMesh/mesh.py

@@ -218 +218 @@
         for i in range(otherNumFaces):
 ##          Seems to be overwriting other.faceVertexIDs with new numpy
-##            currFace = other.faceVertexIDs[i] 
-            currFace = other.faceVertexIDs[...,i].copy()
+##            currFace = other.faceVertexIDs[i]
+##            currFace = other.faceVertexIDs[...,i].copy()
+##          Changed this again as numpy 1.0.4 seems to have no copy method for
+##          masked arrays.
+            try:
+                currFace = other.faceVertexIDs[...,i].copy()
+            except:
+                currFace = MA.array(other.faceVertexIDs[...,i], mask=MA.getmask(other.faceVertexIDs[...,i]))
+
             keepGoing = 1
             currIndex = 0 

trunk/fipy/tools/numerix.py

@@ -283 +283 @@
                                     separator=separator)
     elif isFloat(arr):
-        from numpy.core.arrayprint import _floatFormat, _formatFloat
-##      _floatFormat seems to be broken
-##         if isinstance(arr, NUMERIX.ndarray):
-##             format, length = _floatFormat(arr, precision=precision, 
-##                                           suppress_small=suppress_small)
-##         else:
-##             format, length = _floatFormat(NUMERIX.array(arr), 
-##                                           precision=precision, suppress_small=suppress_small)
-        return _formatFloat(arr, format='%%1.%df' % precision)
+        try:
+            ## this is for numpy 1.0.4 and above
+            ## why has the interface changed again?
+            from numpy.core.arrayprint import FloatFormat
+            return FloatFormat(NUMERIX.array((arr,)), precision, suppress_small)(arr).strip()       
+        except:
+            from numpy.core.arrayprint import _floatFormat, _formatFloat
+            return _formatFloat(arr, format='%%1.%df' % precision)
+
     elif isInt(arr):
         from numpy.core.arrayprint import _formatInteger
@@ -568 +568 @@
 
         >>> print tostring(cos(2*pi/6), precision=3)
-        0.5  
+        0.5
         >>> print tostring(cos(array((0,2*pi/6,pi/2))), precision=3, suppress_small=1)
         [ 1.   0.5  0. ]