Changeset 5386 for anuga_work/production/perth/build_perth.py

Timestamp:

May 30, 2008, 3:34:13 PM (16 years ago)

Author:

kristy

Message:

cleaned Perth python files

File:

• anuga_work/production/perth/build_perth.py (modified) (4 diffs)

anuga_work/production/perth/build_perth.py

@@ -117 +117 @@
 
 print'add all geospatial objects'
-G = G1 + G2 + G3 + G4 + G5 + G6 + G_off + G_off1 
+G = G1 + G2 + G3 + G4 + G5 + G6 + G_off
 
 print'clip combined geospatial object by bounding polygon'
-G_clipped = G.clip(project.bounding_polygon)
-#FIXME: add a clip function to pts
-#print'shape of clipped data', G_clipped.get_data_points().shape
+G_clipped = G.clip(project.poly_all)
 
 print'export combined DEM file'
@@ -128 +126 @@
     mkdir (project.topographies_dir)
 G_clipped.export_points_file(project.combined_dir_name + '.pts')
-#G_clipped.export_points_file(project.combined_dir_name + '.xya')
-
-'''
-print'project.combined_dir_name + 1.xya',project.combined_dir_name + '1.xya'
-G_all=Geospatial_data(file_name = project.combined_dir_name + '1.xya')
-print'split'
-G_all_1, G_all_2 = G_all.split(.10)
-print'export 1'
-G_all_1.export_points_file(project.combined_dir_name+'_small1' + '.xya')
-print'export 2'
-G_all_2.export_points_file(project.combined_dir_name+'_other1' + '.xya')
-
+#G_clipped.export_points_file(project.combined_dir_name + '.xya') - use for comparision in ARC
 
 #-------------------------------------------------------------------------
@@ -145 +132 @@
 #-------------------------------------------------------------------------
 print 'starting to create boundary conditions'
+from anuga.shallow_water.data_manager import urs2sww, urs_ungridded2sww
+
 boundaries_in_dir_name = project.boundaries_in_dir_name
+print 'boundaries_in_dir_name',project.boundaries_in_dir_name
 
-from anuga.shallow_water.data_manager import urs2sww
-
-print 'minlat=project.north_boundary, maxlat=project.south_boundary',project.north_boundary, project.south_boundary
-print 'minlon= project.west_boundary, maxlon=project.east_boundary',project.west_boundary, project.east_boundary
 
 #import sys; sys.exit()
 
-#if access(project.boundaries_dir,F_OK) == 0:
-#    mkdir (project.boundaries_dir)
-
-from caching import cache
-cache(urs2sww,
-      (boundaries_in_dir_name,
-       project.boundaries_dir_name1), 
-      {'verbose': True,
-       'minlat': project.south_boundary,
-       'maxlat': project.north_boundary,
-       'minlon': project.west_boundary,
-       'maxlon': project.east_boundary,
-#       'minlat': project.south,
-#       'maxlat': project.north,
-#       'minlon': project.west,
-#       'maxlon': project.east,
-       'mint': 0, 'maxt': 40000,
-#       'origin': domain.geo_reference.get_origin(),
-       'mean_stage': project.tide,
-#       'zscale': 1,                 #Enhance tsunami
-       'fail_on_NaN': False},
-       verbose = True,
-       )
-#       dependencies = source_dir + project.boundary_basename + '.sww')
-
-'''
+urs_ungridded2sww(project.boundaries_in_dir_name, project.boundaries_in_dir_name,
+                  verbose=True, mint=4000, maxt=10000, zscale=1)
 
 
@@ -187 +149 @@
 
 
+
+
+