Changeset 7276 for anuga_core/source/anuga/utilities/quad.py

Timestamp:

Jun 30, 2009, 2:07:41 PM (15 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

• anuga_core/source/anuga/utilities/quad.py (modified) (1 diff)

anuga_core/source/anuga/utilities/quad.py

@@ -184 +184 @@
                     #y = self.mesh.coordinates[point][1]
                     node = self.mesh.get_node(point, absolute=True)
-                    print "node", node
-                    print "(" + str(node[0]) + "," + str(node[1]) + ")"
-                    raise 'point not in region: %s' %str(point)
+                    msg = ('point not in region: %s\nnode=%s'
+                           % (str(point), str(node)))
+                    raise Exception, msg