Changeset 4955

Timestamp:

Jan 18, 2008, 11:23:32 AM (17 years ago)

Author:

steve

Message:

Fixed problems with entries of integer arrays not being integers, but
arrays. So needed to coerce to int in a couple of places.

Also mkstemp was being imported from the wrong module in test_system_tools

Location:

anuga_core/source/anuga

Files:

• alpha_shape/alpha_shape.py (modified) (1 diff)
• pmesh/mesh.py (modified) (1 diff)
• pmesh/test_mesh.py (modified) (1 diff)
• utilities/test_system_tools.py (modified) (1 diff)

anuga_core/source/anuga/alpha_shape/alpha_shape.py

@@ -362 +362 @@
         for t in range(len(self.deltri)):
             for j in self.deltri[t]:
-                vertexnbrs[j].append(t)
+                vertexnbrs[int(j)].append(t)
         for h in range(len(self.hulledges)):
             for j in self.hulledges[h]:
-                vertexnbrs[j].append(-1)
+                vertexnbrs[int(j)].append(-1)
         
         for i in range(nv):

anuga_core/source/anuga/pmesh/mesh.py

@@ -2329 +2329 @@
     stringlist = []
     for x in intlist:
-        stringlist.append(convertint2string[x])
+        stringlist.append(convertint2string[int(x)])
     return stringlist
 

anuga_core/source/anuga/pmesh/test_mesh.py

@@ -2199 +2199 @@
     #suite = unittest.makeSuite(meshTestCase,'test_asciiFile')
     #suite = unittest.makeSuite(meshTestCase,'test_mesh2IO')
+    #suite = unittest.makeSuite(meshTestCase,'testgenerateMesh')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)

anuga_core/source/anuga/utilities/test_system_tools.py

@@ -32 +32 @@
         # FIXME: Not Done Yet
 
-        from temp import mkstemp
+        from tempfile import mkstemp
 
         # Generate a text file
-        fd, pathname = mkstemp(['.tmp', '', '.', ''])
+        fd, pathname = mkstemp('.tmp', '', '.', '')