Changeset 7208


Ignore:
Timestamp:
Jun 17, 2009, 4:52:03 PM (15 years ago)
Author:
rwilson
Message:

Fixed problems with back-merge.

Location:
branches/numpy/anuga
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/numpy/anuga/geospatial_data/test_geospatial_data.py

    r7207 r7208  
    17211721
    17221722            P = G1.get_data_points(absolute=False)
    1723             expected = [[982420., 28233.]]
     1723            expected = [[425835., 137518.]]
    17241724            msg = 'expected=%s, but\nP=%s' % (str(expected), str(P))
    17251725            assert num.allclose(P, expected), msg
  • branches/numpy/anuga/shallow_water/tsunami_okada.py

    r7207 r7208  
    215215            yrec=x
    216216            for i in range(0,len(zrec[0])):
    217                 if (num.all(zrec[0][i]==yrec) and num.all(zrec[1][i]==xrec)):
     217                if (num.any(zrec[0][i]==yrec) and num.any(zrec[1][i]==xrec)):
    218218                    Z=zrec[2][i]
    219219                    Z=0.001*Z
  • branches/numpy/anuga/utilities/interp.py

    r7207 r7208  
    138138    """
    139139    import arrayfns
    140     import numpy.ma as MA
     140    import numpy.ma MA
    141141    import numpy as N
    142142    from where_close import where_close
Note: See TracChangeset for help on using the changeset viewer.