Ignore:
Timestamp:
Nov 6, 2008, 12:17:15 PM (16 years ago)
Author:
ole
Message:

Reverted numpy changes to the trunk that should have been made to the branch.
The command was svn merge -r 5895:5890 .

File:
1 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/abstract_2d_finite_volumes/region.py

    r5892 r5897  
    88# FIXME (DSG-DSG) add better comments
    99
    10 import numpy
    11 
    12 
     10from Numeric import average
    1311class Region:
    1412    """Base class for modifying quantities based on a region.
     
    103101                values = Q.get_values(indices=self.build_indices(elements, domain),
    104102                                      location=self.location)
    105                 av = numpy.average(values)
     103                av = average(values)
    106104                if self.location == "vertices":
    107                     av = numpy.average(av)
     105                    av = average(av)
    108106                new_values = av + self.X   
    109107            else:
Note: See TracChangeset for help on using the changeset viewer.