Changeset 8120

Timestamp:

Feb 6, 2011, 12:59:20 PM (12 years ago)

Author:

steve

Message:

Found a problem with NetCDFFile. Previous version 2.9 allowed 'rl' as a mode,
but 2.9.1 produces an argument error. Chenged to 'r'. By the way, 'wl' works
fine in 2.9.1

Location:

trunk/anuga_core/source

Files:

• anuga/file_conversion/sts2sww_mesh.py (modified) (1 diff)
• anuga/fit_interpolate/test_search_functions.py (modified) (1 diff)
• anuga/load_mesh/test_loadASCII.py (modified) (1 diff)
• anuga_parallel/pymetis/pymetis/setup.py (modified) (1 diff)

trunk/anuga_core/source/anuga/file_conversion/sts2sww_mesh.py

@@ -29 +29 @@
 
     if verbose: print "Reading sts NetCDF file: %s" %stsname
-    infile = NetCDFFile(stsname, 'rl')
+    infile = NetCDFFile(stsname, 'r')
     cellsize = infile.cellsize
     ncols = infile.ncols

trunk/anuga_core/source/anuga/fit_interpolate/test_search_functions.py

@@ -3 +3 @@
 
 import unittest
-from mesh_quadtree import MeshQuadtree
+from anuga.pmesh.mesh_quadtree import MeshQuadtree
 
 from anuga.abstract_2d_finite_volumes.neighbour_mesh import Mesh

trunk/anuga_core/source/anuga/load_mesh/test_loadASCII.py

@@ -423 +423 @@
 
         try:
-            assert num.allclose(num.array(dict['vertex_attribute_titles']),
+            assert num.alltrue(num.array(dict['vertex_attribute_titles'])==
                                 num.array(loaded_dict['vertex_attribute_titles']))
         except IndexError:

trunk/anuga_core/source/anuga_parallel/pymetis/pymetis/setup.py

@@ -1 +1 @@
 from distutils.core import setup, Extension;
+from numpy.distutils.misc_util import get_numpy_include_dirs;
 import os;
 
 metis = Extension('metis',
                   sources = ['metis.c', 'metis_bridge.c'],
-                  include_dirs = ['..' + os.sep + os.environ['METIS_DIR'] + os.sep + 'Lib' ,  '/usr/local/lib/python2.5/site-packages/numpy/core/include' ],
+                  include_dirs = ['..' + os.sep + os.environ['METIS_DIR'] + os.sep + 'Lib' ] + get_numpy_include_dirs(),
                   libraries = ['metis', 'm'],
                   library_dirs = ['..' + os.sep + os.environ['METIS_DIR']]);