Changeset 6975

Timestamp:

May 5, 2009, 6:51:54 PM (15 years ago)

Author:

ole

Message:

Removed accidental copying of the 'gulf' scenario onto 'bamaga.'
This reverted all changesets from 6895 to the current (6972).
The command used on bamaga was

svn merge -r HEAD:6894 .

Location:

anuga_work/production/australia_ph2/bamaga

Files:

• Arc_asc2raster_GDA94z54.py (deleted)
• build_elevation.py (modified) (3 diffs)
• export_results.py (deleted)
• export_results_max.py (modified) (2 diffs)
• project.py (copied) (copied from anuga_work/production/australia_ph2/bamaga/project.py)
• run_model.py (modified) (1 diff)

anuga_work/production/australia_ph2/bamaga/build_elevation.py

@@ -59 +59 @@
         dem2pts(absolute_filename, use_cache=True, verbose=True)
 
-        G_grid = Geospatial_data(file_name=absolute_filename+'.pts',
+        geospatial_data[filename] = 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
@@ -68 +66 @@
     for filename in project.point_filenames:
         absolute_filename = join(project.topographies_folder, filename)
-        G_points = Geospatial_data(file_name=absolute_filename,
+        geospatial_data[filename] = Geospatial_data(file_name=absolute_filename,
                                                     verbose=True)
-        print 'Clip geospatial object'
-        geospatial_data[filename] = G_points.clip(project.bounding_polygon)
 
 #-------------------------------------------------------------------------------
@@ -86 +82 @@
     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.export_points_file(project.combined_elevation + '.pts')
+G_clip.export_points_file(project.combined_elevation + '.pts')
 print 'Do txt version too'
 # Use for comparision in ARC
-G.export_points_file(project.combined_elevation + '.txt')
+G_clip.export_points_file(project.combined_elevation + '.txt')
 

anuga_work/production/australia_ph2/bamaga/export_results_max.py

@@ -22 +22 @@
 directory = project.output_folder
 
-##time_dir1 = '20090408_152655_run_final_0_31975_2000_Tb__mhingee'
-##time_dir2 = '20090409_123239_run_final_0_51390_2000_Tb__mhingee'
-##time_dir3 = '20090410_110658_run_final_0_63735_2000_Tb__mhingee'
+time_dir1 = '20090408_152655_run_final_0_31975_2000_Tb__mhingee'
+time_dir2 = '20090409_123239_run_final_0_51390_2000_Tb__mhingee'
+time_dir3 = '20090410_110658_run_final_0_63735_2000_Tb__mhingee'
 
-time_dir1 = '20090421_135412_run_final_0_31975_2000_Tb_internal_lfountai'
-
-time_dirs = [time_dir1]#, time_dir2, time_dir3]
+time_dirs = [time_dir1, time_dir2, time_dir3]
 
 cellsize = 250
@@ -84 +82 @@
 
             name1 = join(directory, time_dir, project.scenario_name)
-##            name2 = join(directory, time_dir, project.scenario_name)+'_time_37920_0'
-            name2 = join(directory, time_dir, project.scenario_name)+'_time_37860_0'
-            
+            name2 = join(directory, time_dir, project.scenario_name)+'_time_37920_0'
+
             names = [name1, name2]
 

anuga_work/production/australia_ph2/bamaga/run_model.py

@@ -87 +87 @@
 # Number of boundary segments
 num_ocean_segments = len(event_sts) - 1
-print num_ocean_segments
 # Number of landward_boundary points
 num_land_points = file_length(project.landward_boundary)
-print num_land_points
+
 # Boundary tags refer to project.landward_boundary
 # 4 points equals 5 segments start at N
-boundary_tags={'back': range(num_ocean_segments+2,
-                             num_ocean_segments+5),
+boundary_tags={'back': range(num_ocean_segments+1,
+                             num_ocean_segments+num_land_points),
                'side': [num_ocean_segments,
-                        num_ocean_segments+1,
-                        num_ocean_segments+5,
-                        num_ocean_segments+6,
-                        num_ocean_segments+7,
-                        num_ocean_segments+8,
-                        num_ocean_segments+9],
+                        num_ocean_segments+num_land_points],
                'ocean': range(num_ocean_segments)}
-##boundary_tags = {'back':[3],
-##                 'side':[2,4],
-##                 'ocean':[0,1,5]}
-
-print 'boundary tags', boundary_tags
 
 # Build mesh and domain