Changeset 6553 for branches/numpy/anuga/abstract_2d_finite_volumes/quantity.py

Timestamp:

Mar 19, 2009, 1:43:34 PM (15 years ago)

Author:

rwilson

Message:

Merged trunk into numpy, all tests and validations work.

File:

• branches/numpy/anuga/abstract_2d_finite_volumes/quantity.py (modified) (3 diffs)

branches/numpy/anuga/abstract_2d_finite_volumes/quantity.py

@@ -883 +883 @@
 
             
-        # FIXME(Ole): I noticed a couple of examples where this caused
-        # a crash in fittng, so disabled it until I can investigate further
-        # Sorry. 23 Jan 2009. Logged as ticket:314
-        if False:
+        if True:
             # Use mesh as defined by domain
             # This used to cause problems for caching due to quantities
             # changing, but it now works using the appropriate Mesh object.
-            # This should close ticket:242
+            # This addressed ticket:242 and was made to work when bug
+            # in ticket:314 was fixed 18 March 2009.
             vertex_attributes = fit_to_mesh(filename,
                                             mesh=self.domain.mesh,
@@ -901 +899 @@
             # This variant will cause Mesh object to be recreated
             # in fit_to_mesh thus doubling up on the neighbour structure
-            # FIXME(Ole): This is now obsolete 19 Jan 2009.
+            # FIXME(Ole): This is now obsolete 19 Jan 2009 except for bug 
+            # (ticket:314) which was fixed 18 March 2009.
             nodes = self.domain.get_nodes(absolute=True)
             triangles = self.domain.get_triangles()
@@ -1187 +1186 @@
         import types
 
-        assert type(indices) in [types.ListType, types.NoneType,
-                                 num.ndarray], \
-                   'Indices must be a list or None'     #??#
+        msg = 'Indices must be a list or None'
+        assert indices is None or isinstance(indices, (list, num.ndarray)), msg
+#        assert type(indices) in [types.ListType, types.NoneType,
+#                                 num.ndarray], \
+#                   'Indices must be a list or None'     #??#
 
         if location == 'centroids':