Changeset 6441 for branches/numpy/anuga/shallow_water/shallow_water_domain.py

Timestamp:

Mar 4, 2009, 8:26:22 AM (16 years ago)

Author:

rwilson

Message:

After changes to get_absolute, ensure_numeric, etc.

File:

• branches/numpy/anuga/shallow_water/shallow_water_domain.py (modified) (3 diffs)

branches/numpy/anuga/shallow_water/shallow_water_domain.py

@@ -1613 +1613 @@
 
         # Is this really what we want?
-        msg = 'Function %s must return vector' % str(f)
+        # info is "(func name, filename, defining line)"
+        func_info = (f.func_name, f.func_code.co_filename,
+                     f.func_code.co_firstlineno)
+        msg = ('Function %s() must return vector (defined in %s, line %d)'
+               % func_info)
         assert hasattr(q, 'len'), msg
 
-        msg = ('Return vector from function %s must have same '
-               'length as input vectors' % f)
+        msg = ('Return vector from function %s() must have same '
+               'length as input vectors\nq=%s' % (f.func_name, str(q)))
         assert len(q) == N, msg
     else:
@@ -1623 +1627 @@
             f = float(f)
         except:
-            msg = ('Force field %s must be either a vector function or a '
-                   'scalar value (coercible to float).' % str(f))
+            msg = ('Force field %s must be a scalar value coercible to float.'
+                   % str(f))
             raise Exception, msg
 
@@ -1926 +1930 @@
         if self.polygon is not None:
             # Inlet is polygon
-            inlet_region = 'polygon=%s, area=%f m^2' % (self.polygon,
-                                                        self.exchange_area)
+            inlet_region = ('polygon=\n%s, area=%f m^2' %
+                            (self.polygon, self.exchange_area))
 
             self.exchange_indices = inside_polygon(points, self.polygon)