Merge branch 'ticket539' into develop

usnistgov · Mar 20, 2013 · 0c8a5a6 · 0c8a5a6
2 parents 8c51478 + 9ae4801
commit 0c8a5a6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/fipy/meshes/gmshMesh.py b/fipy/meshes/gmshMesh.py
@@ -856,7 +856,8 @@ def read(self):
 
         # convert lists of cell vertices to a properly oriented masked array
         maxVerts = max([len(v) for v in cellsToVertIDs])
-        cellsToVertIDs = [nx.concatenate((v, [-1] * (maxVerts-len(v)))) for v in cellsToVertIDs]
+        # ticket:539 - NumPy 1.7 casts to array before concatenation and empty array defaults to float
+        cellsToVertIDs = [nx.concatenate((v, nx.array([-1] * (maxVerts-len(v)), dtype=int))) for v in cellsToVertIDs]
         cellsToVertIDs = nx.MA.masked_equal(cellsToVertIDs, value=-1).swapaxes(0,1)
 
         parprint("Done with cells and faces.")