Changeset 5404

Timestamp:

Jun 13, 2008, 3:50:07 PM (15 years ago)

Author:

ole

Message:

Fixed clipping of polygons.
Updated polygon files
Played with resolutions.

Location:

anuga_work/development/boxingday08

Files:

• combine_good_data.py (modified) (3 diffs)
• export_results.py (modified) (2 diffs)
• mesh_polygons/20m.csv (modified) (2 diffs)
• mesh_polygons/extent.csv (modified) (1 diff)
• project.py (modified) (1 diff)
• run_boxingday_most.py (modified) (2 diffs)

anuga_work/development/boxingday08/combine_good_data.py

@@ -1 +1 @@
 from anuga.geospatial_data.geospatial_data import *
+from anuga.utilities.numerical_tools import ensure_numeric
 import project
 from os.path import exists
@@ -72 +73 @@
 
 dir='data'
-print 'Converting .xya files to .csv format'
+print 'Converting .xyz files to .csv format'
 for filename in filenames:
     if not exists(dir+sep+filename+'.csv'):
         xyz2csv(dir+sep+filename)
     else:
-        print dir+sep+filename+'.csv already exists ensure the .xya changed has not changed'
+        print dir+sep+filename+'.csv already exists ensure the .xyz changed has not changed'
 
 print 'Clipping .csv files'
@@ -87 +88 @@
 
 print 'Creating geospatial data'
-if exists(project.good_combined_dir_name +'.pts'):
-    print project.good_combined_dir_name +'.pts'+' already exists ensure the input .csv files have not changed'
-else:
-    G0 = Geospatial_data(file_name=dir+sep+filenames[0]+'.csv')
-    print 'read bay'
-    G1=Geospatial_data(file_name=dir+sep+filenames[1]+'_clipped.csv')
-    print 'read andaman'
-    G1.clip(project.bounding_polygon)
-    print 'clipped andaman'
-    G1.clip_outside(G0)
+G0 = Geospatial_data(file_name=dir+sep+filenames[0]+'.csv')
+print 'read bay'
+G1 = Geospatial_data(file_name=dir+sep+filenames[1]+'_clipped.csv')
+print 'read andaman'
+bounding_polygon=ensure_numeric(project.bounding_polygon)
+G1 = G1.clip(bounding_polygon)
+print 'clipped andaman'
+bay_grid_poly=ensure_numeric(project.bay_grid_poly)
+G1 = G1.clip_outside(bay_grid_poly)
 
-    G = G0 + G1
+# Plot the two point sets
+data_3s=G1.get_data_points()
+data_1s=G0.get_data_points()
 
-    print 'Creating .pts file'
-    G.export_points_file(project.good_combined_dir_name +'.pts')
+from pylab import *
+hold(True)
+plot(data_3s[:,0],data_3s[:,1],'r.')
+#plot(data_1s[:,0],data_1s[:,1],'b.')
+#plot(bounding_polygon[:,0],bounding_polygon[:,1],'k-')
+show()
+
+
+G = G0 + G1
+
+print 'Creating .pts file'
+G.export_points_file(project.good_combined_dir_name +'.pts')

anuga_work/development/boxingday08/export_results.py

@@ -4 +4 @@
 from anuga.shallow_water.data_manager import sww2dem
 from os import sep
+import project
 
 #name='good_simulation/good_simulation_polylinefriction20080529_115703'
@@ -36 +37 @@
         quantity = quantityname,
         cellsize = 20,
-        easting_min = 417348,
-        easting_max = 425656,
-        northing_min = 870565,
-        northing_max = 877008,   
+        easting_min = project.bay_west,
+        easting_max = project.bay_east,
+        northing_min = project.bay_south,
+        northing_max = project.bay_borth,   
         reduction = max, 
         verbose = True,

anuga_work/development/boxingday08/mesh_polygons/20m.csv

@@ -1 @@
-419517.9812,889806.5043
-422812.9129,886474.9623
 422520.03,882374.603
 422666.4714,879262.7231
@@ -7 +5 @@
 424423.7683,869194.8766
 424057.6648,865607.0622
-423691.5613,862824.6755
 424643.4304,859310.0817
-427425.8171,854184.6326
-429036.6726,846359.013
-425961.4031,841892.5501
-417467.8016,850450.3768
 409999.2899,866851.8141
 407070.4618,879299.3335
-406411.4755,891380.7494
-405972.1513,898776.0403
-404214.8544,903791.6584

anuga_work/development/boxingday08/mesh_polygons/extent.csv

@@ -1 @@
-419336.424,810100.845
-342405.0281,711455.8026
 274649.9152,723352.9603
-272089.092,972393.0131
-347633.3754,968551.7784
+272089.092,922393.0131
 427979.2022,885965.2313
 427659.0993,875721.9386
 429259.6138,861317.3083
-436301.8775,840830.723

anuga_work/development/boxingday08/project.py

@@ -126 +126 @@
 south = 5.9
 
+
+bay_west = 417348.0
+bay_east = 425656.0
+bay_south = 870565.0
+bay_north = 877008.0
+
+bay_grid_poly=[[bay_west,bay_south],[bay_west,bay_north],[bay_east,bay_north],[bay_east,bay_south]]
+
 check_ferret_extent=False
 if check_ferret_extent:

anuga_work/development/boxingday08/run_boxingday_most.py

@@ -112 +112 @@
           #, evaluate=True
           )
-
 
 #------------------------------------------------------------------------------
@@ -197 +196 @@
 
 print 'Available boundary tags', domain.get_boundary_tags()
-Bf = File_boundary(project.boundary_most_out+'.sww', 
-                    domain, time_thinning=1, use_cache=True,verbose = True)
+#Bf = File_boundary(project.boundary_most_out+'.sww', 
+#                    domain, time_thinning=1, use_cache=True,verbose = True)
 Br = Reflective_boundary(domain)
 Bd = Dirichlet_boundary([tide,0.0,0.0])
 
-domain.set_boundary({'ocean': Bf,
+domain.set_boundary({'ocean': Bd,
                      'otherocean': Bd,
                      'land': Br,