Changeset 7193 for branches/numpy/anuga


Ignore:
Timestamp:
Jun 12, 2009, 10:28:57 AM (16 years ago)
Author:
rwilson
Message:

Back-merge from Numeric trunk.

Location:
branches/numpy/anuga
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/numpy/anuga/config.py

    r7176 r7193  
    44import os
    55import sys
    6 import numpy as num
    76
    87
  • branches/numpy/anuga/coordinate_transforms/geo_reference.py

    r7176 r7193  
    232232    # @note If 'points' is a list then a changed list is returned.
    233233    def change_points_geo_ref(self, points, points_geo_ref=None):
    234         """Change the geo reference of a list or Numeric array of points to
     234        """Change the geo reference of a list or numeric array of points to
    235235        be this reference.(The reference used for this object)
    236236        If the points do not have a geo ref, assume 'absolute' values
  • branches/numpy/anuga/culvert_flows/test_culvert_routines_pipe_1pct.py

    r7177 r7193  
    88from anuga.utilities.system_tools import get_pathname_from_package
    99from anuga.culvert_flows.culvert_routines import boyd_generalised_culvert_model
    10 import Numeric as num
     10import numpy as num
    1111
    1212
  • branches/numpy/anuga/mesh_engine/test_generate_mesh.py

    r7176 r7193  
    412412                        'Failed!')
    413413       
    414         correct = num.array(segattlist, num.Int)
     414        correct = num.array(segattlist, num.int)
    415415        self.failUnless(num.allclose(data['generatedsegmentmarkerlist'].flat,
    416416                                     correct.flat),
  • branches/numpy/anuga/shallow_water/shallow_water_domain.py

    r7176 r7193  
    18011801    """
    18021802
    1803     import Numeric as num
     1803    import numpy as num
    18041804   
    18051805    # Create a temp array to store updated depth dependent friction for wet elements
    18061806    # EHR this is outwardly inneficient but not obvious how to avoid recreating each call??????
    18071807    N=len(domain)
    1808     wet_friction    = num.zeros(N, num.Float)
     1808    wet_friction    = num.zeros(N, num.float)
    18091809    wet_friction[:] = default_n0   # Initially assign default_n0 to all array so sure have no zeros values
    18101810   
  • branches/numpy/anuga/utilities/polygon.py

    r6689 r7193  
    388388        # If this fails it is going to be because the points can't be
    389389        # converted to a numeric array.
    390         msg = 'Points could not be converted to Numeric array'
     390        msg = 'Points could not be converted to numeric array'
    391391        raise Exception, msg
    392392
Note: See TracChangeset for help on using the changeset viewer.