Changeset 7012
- Timestamp:
- May 11, 2009, 3:53:16 PM (16 years ago)
- Location:
- anuga_core/source/anuga
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
anuga_core/source/anuga/abstract_2d_finite_volumes/util.py
r6320 r7012 1136 1136 """ 1137 1137 import sys 1138 from sets import Set as set1139 1138 1140 1139 all_quantity = ['stage', 'depth', 'momentum', 'xmomentum', -
anuga_core/source/anuga/geospatial_data/test_geospatial_data.py
r6546 r7012 6 6 from math import sqrt, pi 7 7 import tempfile 8 from sets import ImmutableSet9 8 10 9 import Numeric as num … … 1740 1739 p1 = (lat_gong, lon_gong) 1741 1740 p2 = (lat_2, lon_2) 1742 points = ImmutableSet([p1, p2, p1])1741 points = frozenset([p1, p2, p1]) 1743 1742 gsd = Geospatial_data(data_points=list(points), 1744 1743 points_are_lats_longs=True) … … 1763 1762 p1 = (lat_gong, lon_gong) 1764 1763 p2 = (lat_2, lon_2) 1765 points = ImmutableSet([p1, p2, p1])1764 points = frozenset([p1, p2, p1]) 1766 1765 gsd = Geospatial_data(data_points=list(points), 1767 1766 points_are_lats_longs=True) -
anuga_core/source/anuga/shallow_water/data_manager.py
r7003 r7012 5010 5010 """ 5011 5011 5012 from sets import ImmutableSet5013 5014 5012 msg = "grid_spacing can not be zero" 5015 5013 assert not grid_spacing == 0, msg … … 5023 5021 # Don't assume the zone of the segments is the same as the lower left 5024 5022 # corner of the lat long data!! They can easily be in different zones 5025 lat_long_set = ImmutableSet()5023 lat_long_set = frozenset() 5026 5024 for seg in segs: 5027 5025 points_lat_long = points_needed(seg, ll_lat, ll_long, grid_spacing, 5028 5026 lat_amount, long_amount, zone, 5029 5027 isSouthHemisphere) 5030 lat_long_set |= ImmutableSet(points_lat_long)5031 5032 if lat_long_set == ImmutableSet([]):5028 lat_long_set |= frozenset(points_lat_long) 5029 5030 if lat_long_set == frozenset([]): 5033 5031 msg = "URS region specified and polygon does not overlap." 5034 5032 raise ValueError, msg -
anuga_core/source/anuga/shallow_water/test_data_manager.py
r6873 r7012 14 14 from Scientific.IO.NetCDF import NetCDFFile 15 15 from struct import pack, unpack 16 from sets import ImmutableSet17 16 import shutil 18 17 … … 9558 9557 # the poly as points though. 9559 9558 #geo.export_points_file("results.txt", as_lat_long=True) 9560 results = ImmutableSet(geo.get_data_points(as_lat_long=True))9559 results = frozenset(geo.get_data_points(as_lat_long=True)) 9561 9560 #print 'results',results 9562 9561 … … 9572 9571 points_are_lats_longs=True) 9573 9572 #geo_answer.export_points_file("answer.txt", as_lat_long=True) 9574 answer = ImmutableSet(points)9573 answer = frozenset(points) 9575 9574 9576 9575 outs = answer.difference(results) … … 9662 9661 verbose=self.verbose) 9663 9662 9664 results = ImmutableSet(geo.get_data_points(as_lat_long=True,9665 isSouthHemisphere=False))9663 results = frozenset(geo.get_data_points(as_lat_long=True, 9664 isSouthHemisphere=False)) 9666 9665 #print 'results',results 9667 9666 … … 9673 9672 degminsec2decimal_degrees(97,i*2,0))) 9674 9673 #print "answer points", points 9675 answer = ImmutableSet(points)9674 answer = frozenset(points) 9676 9675 9677 9676 for point in points:
Note: See TracChangeset
for help on using the changeset viewer.