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

Back-merge from Numeric trunk. Final one?

Location:
branches/numpy/anuga/shallow_water
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/numpy/anuga/shallow_water/data_manager.py

    r7176 r7207  
    31893189              % (num.min(times), num.max(times), len(times.flat))
    31903190
    3191         q = amplitudes.flatten()
     3191#        q = amplitudes.flatten()
    31923192        name = 'Amplitudes (ha) [cm]'
    3193         print '  %s in [%f, %f]' % (name, min(q), max(q))
    3194 
    3195         q = uspeed.flatten()
     3193        print '  %s in [%f, %f]' % (name, num.min(amplitudes), num.max(amplitudes))
     3194
     3195#        q = uspeed.flatten()
    31963196        name = 'Speeds (ua) [cm/s]'
    3197         print '  %s in [%f, %f]' % (name, min(q), max(q))
    3198 
    3199         q = vspeed.flatten()
     3197        print '  %s in [%f, %f]' % (name, num.min(uspeed), num.max(uspeed))
     3198
     3199#        q = vspeed.flatten()
    32003200        name = 'Speeds (va) [cm/s]'
    3201         print '  %s in [%f, %f]' % (name, min(q), max(q))
    3202 
    3203         q = elevations.flatten()
     3201        print '  %s in [%f, %f]' % (name, num.min(vspeed), num.max(vspeed))
     3202
     3203#        q = elevations.flatten()
    32043204        name = 'Elevations (e) [m]'
    3205         print '  %s in [%f, %f]' % (name, min(q), max(q))
     3205        print '  %s in [%f, %f]' % (name, num.min(elevations), num.max(elevations))
    32063206
    32073207    # print number_of_latitudes, number_of_longitudes
     
    33373337        print '  Quantities [SI units]:'
    33383338        for name in ['stage', 'xmomentum', 'ymomentum', 'elevation']:
    3339             q = outfile.variables[name][:].flatten()
    3340             print '    %s in [%f, %f]' % (name, min(q), max(q))
     3339            q = outfile.variables[name][:]    # .flatten()
     3340            print '    %s in [%f, %f]' % (name, num.min(q), num.max(q))
    33413341
    33423342    outfile.close()
     
    73637363            points = num.ascontiguousarray(num.concatenate((x[:,num.newaxis],
    73647364                                                            y[:,num.newaxis]),
    7365                                                            axis=1))
     7365                                                            axis=1))
    73667366            point_indices = inside_polygon(points, polygon)
    73677367
  • TabularUnified branches/numpy/anuga/shallow_water/shallow_water_domain.py

    r7193 r7207  
    913913        """
    914914       
    915         boundary_flows, total_boundary_inflow, total_boundary_outflow = self.compute_boundary_flows()
     915        (boundary_flows, total_boundary_inflow,
     916         total_boundary_outflow) = self.compute_boundary_flows()
    916917       
    917918        s = '---------------------------\n'       
  • TabularUnified 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.