Ignore:
Timestamp:
Jun 17, 2009, 4:12:11 PM (14 years ago)
Author:
rwilson
Message:

Back-merge from Numeric trunk. Final one?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/numpy/anuga/shallow_water/tsunami_okada.py

    r6472 r7207  
    215215            yrec=x
    216216            for i in range(0,len(zrec[0])):
    217                 if (num.any(zrec[0][i]==yrec) and num.any(zrec[1][i]==xrec)):
     217                if (num.all(zrec[0][i]==yrec) and num.all(zrec[1][i]==xrec)):
    218218                    Z=zrec[2][i]
    219219                    Z=0.001*Z
Note: See TracChangeset for help on using the changeset viewer.