Changeset 6414

Timestamp:

Feb 25, 2009, 11:41:29 AM (16 years ago)

Author:

jgriffin

Message:

Data clipped individually, rather than after it is combined, to reduce memory allocation

File:

• anuga_work/production/busselton/standardised_version/build_elevation.py (modified) (3 diffs)

anuga_work/production/busselton/standardised_version/build_elevation.py

@@ -59 +59 @@
         dem2pts(absolute_filename, use_cache=True, verbose=True)
 
-        geospatial_data[filename] = Geospatial_data(file_name=absolute_filename+'.pts',
+        G_grid = Geospatial_data(file_name=absolute_filename+'.pts',
                                                     verbose=True)
+        print 'Clip geospatial object'
+        geospatial_data[filename] = G_grid.clip(project.bounding_polygon)
 
 # Create Geospatial data from TXT files
@@ -66 +68 @@
     for filename in project.point_filenames:
         absolute_filename = join(project.topographies_folder, filename)
-        geospatial_data[filename] = Geospatial_data(file_name=absolute_filename,
+        G_points = Geospatial_data(file_name=absolute_filename,
                                                     verbose=True)
+        print 'Clip geospatial object'
+        geospatial_data[filename] = G_points.clip(project.bounding_polygon)
 
 #-------------------------------------------------------------------------------
@@ -82 +86 @@
     G += geospatial_data[key]
         
-print 'Clip combined geospatial data'
+#print 'Clip combined geospatial data'
 ##G_clip = G.clip_outside(project.poly_aoi1)
 ##G_all = G_clip + geospatial_data[project.point_filenames[4]] 
 #G_clipped = G_all.clip(project.poly_all)
-G_clip = G.clip(project.bounding_polygon)
+#G_clip = G.clip(project.bounding_polygon)
 
 
 print 'Export combined DEM file'
-G_clip.export_points_file(project.combined_elevation + '.pts')
+G.export_points_file(project.combined_elevation + '.pts')
 print 'Do txt version too'
 # Use for comparision in ARC
-G_clip.export_points_file(project.combined_elevation + '.txt')
+G.export_points_file(project.combined_elevation + '.txt')