Changeset 3650

Timestamp:

Sep 22, 2006, 12:21:09 PM (17 years ago)

Author:

sexton

Message:

updates for Hobart and want to export elevation grid for Onslow

Location:

anuga_work/production

Files:

• hobart_2006/export_results.py (modified) (2 diffs)
• hobart_2006/project.py (modified) (4 diffs)
• hobart_2006/run_hobart.py (modified) (4 diffs)
• onslow_2006/export_results.py (modified) (2 diffs)
• onslow_2006/project.py (modified) (2 diffs)

anuga_work/production/hobart_2006/export_results.py

@@ -2 +2 @@
 import sys
 
-from anuga.pyvolution.data_manager import sww2dem
-from anuga.pyvolution.ermapper_grids import read_ermapper_grid
-from anuga.pyvolution.util import Screen_Catcher
+from anuga.shallow_water.data_manager import sww2dem
 from os import sep
 
-time_dir = '20060919_050831' #MSL
+time_dir = '20060921_083846' #MSL
 directory = project.outputdir
 name = directory + time_dir + sep + 'source'
@@ -40 +38 @@
 sww2dem(name, basename_out = outname,
             quantity = quantityname,
-            cellsize = 20,       
+            cellsize = 25,       
             # define region for viz purposes
             easting_min = project.e_min_area,

anuga_work/production/hobart_2006/project.py

@@ -13 +13 @@
 
 # data provided by Tas SES and checked by NM&I
-onshore_name = 'hob3_topo' 
+#onshore_name = 'hob3_topo' # original
+onshore_name = 'hob5_topo' # 12.5m grid and clipped to 100m elevation or 3000m from coast
+onshore_name_25 = 'hob5_topo_25' # 25m grid and clipped to 100m elevation or 3000m from coast
 offshore_name_tas1 = 'derwent_2m'
 offshore_name_tas2 = 'derwent_5m'
-offshore_name_tas3 = 'south_east_tas'
+offshore_name_tas3 = 'south_east_tas' #actually this is AHO
 offshore_name_tas4 = 'hobart_1m'
 
@@ -85 +87 @@
 
 onshore_dem_name = datadir + onshore_name
+onshore_dem_name_25 = datadir + onshore_name_25
+all_onshore_dem_name = datadir + 'combined_onshore'
 offshore_dem_name_local1 = datadir + offshore_name_tas1
 offshore_dem_name_local2 = datadir + offshore_name_tas2
@@ -110 +114 @@
 outputname = outputtimedir + basename  #Used by post processing
 
-# region to export
+# clipping 12.5m onshore data set
+eastingmin = 520000
+eastingmax = 536000
+northingmin = 5245000
+northingmax = 5260000
+
+# region to export for inundation map
 e_min_area = 500000
 e_max_area = 580000
@@ -132 +142 @@
 polyAll, zone = convert_points_from_latlon_to_utm([d0, d1, d2, d3])
 refzone = zone
+NWcorner = polyAll[0]
+SEcorner = polyAll[2]
+
+# region to export for Alex to make bathymetry map
+e_min_area = 480000#NWcorner[0]
+e_max_area = 600000#SEcorner[0]
+n_min_area = 5156000#NWcorner[1]
+n_max_area = 5285000#SEcorner[1]
 
 #Interior region - Hobart city area + Glenorchy, Kingston

anuga_work/production/hobart_2006/run_hobart.py

@@ -24 +24 @@
                             Dirichlet_boundary, Time_boundary, File_boundary
 from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf, dem2pts
+from anuga.abstract_2d_finite_volumes.combine_pts import combine_rectangular_points_files 
 from anuga.geospatial_data.geospatial_data import *
 from anuga.abstract_2d_finite_volumes.util import Screen_Catcher
@@ -61 +62 @@
 # filenames
 onshore_dem_name = project.onshore_dem_name
+onshore_dem_name_25 = project.onshore_dem_name_25
 meshname = project.meshname+'.msh'
 source_dir = project.boundarydir
@@ -69 +71 @@
 convert_dem_from_ascii2netcdf(onshore_dem_name, use_cache=True, verbose=True)
 
-#creates pts file for onshore DEM
-dem2pts(onshore_dem_name, use_cache=True, verbose=True)
-
-print 'local offshore data sets'
+#creates pts file for onshore DEM - 12.5
+dem2pts(onshore_dem_name,
+        easting_min=project.eastingmin,
+        easting_max=project.eastingmax,
+        northing_min=project.northingmin,
+        northing_max= project.northingmax,
+        use_cache=True, verbose=True)
+
+#creates pts file for onshore DEM - 25
+dem2pts(onshore_dem_name_25, use_cache=True, verbose=True)
+
+combine_rectangular_points_files(project.onshore_dem_name + '.pts',
+                                 project.onshore_dem_name_25 + '.pts',
+                                 project.all_onshore_dem_name + '.pts')
+#print 'local offshore data sets'
 #G1 = Geospatial_data(file_name = project.offshore_dem_name_local1 + '.xya')
 #G2 = Geospatial_data(file_name = project.offshore_dem_name_local2 + '.xya')
@@ -78 +91 @@
 #G4 = Geospatial_data(file_name = project.offshore_dem_name_local4 + '.xya')
 #G11 = G1 + G2 + G3 + G4
-print 'aho offshore data sets'
-G5 = Geospatial_data(file_name = project.offshore_dem_name_aho1 + '.xya')
-G6 = Geospatial_data(file_name = project.offshore_dem_name_aho2 + '.xya')
-G7 = Geospatial_data(file_name = project.offshore_dem_name_aho3 + '.xya')
-G8 = Geospatial_data(file_name = project.offshore_dem_name_aho4 + '.xya')
-G9 = Geospatial_data(file_name = project.offshore_dem_name_aho5 + '.xya')
-G10 = Geospatial_data(file_name = project.offshore_dem_name_aho6 + '.xya')
-G11 = Geospatial_data(file_name = project.offshore_dem_name_aho7 + '.xya')
-G12 = Geospatial_data(file_name = project.offshore_dem_name_aho8 + '.xya')
-G13 = Geospatial_data(file_name = project.offshore_dem_name_aho9 + '.xya')
-G14 = Geospatial_data(file_name = project.offshore_dem_name_aho10 + '.xya')
-G15 = Geospatial_data(file_name = project.offshore_dem_name_aho11 + '.xya')
-G16 = Geospatial_data(file_name = project.offshore_dem_name_aho12 + '.xya')
-G17 = Geospatial_data(file_name = project.offshore_dem_name_aho13 + '.xya')
-G18 = Geospatial_data(file_name = project.offshore_dem_name_aho14 + '.xya')
-G19 = Geospatial_data(file_name = project.offshore_dem_name_aho15 + '.xya')
-G20 = Geospatial_data(file_name = project.offshore_dem_name_aho16 + '.xya')
-G12 = G5+G6+G7+G8+G9+G10+G11+G12+G13+G14+G15+G16+G17+G18+G19+G20
-print 'local onshore dem'
-G21 = Geospatial_data(file_name = project.onshore_dem_name + '.pts')
+#print 'aho offshore data sets'
+#G5 = Geospatial_data(file_name = project.offshore_dem_name_aho1 + '.xya')
+#G6 = Geospatial_data(file_name = project.offshore_dem_name_aho2 + '.xya')
+#G7 = Geospatial_data(file_name = project.offshore_dem_name_aho3 + '.xya')
+#G8 = Geospatial_data(file_name = project.offshore_dem_name_aho4 + '.xya')
+#G9 = Geospatial_data(file_name = project.offshore_dem_name_aho5 + '.xya')
+#G10 = Geospatial_data(file_name = project.offshore_dem_name_aho6 + '.xya')
+#G11 = Geospatial_data(file_name = project.offshore_dem_name_aho7 + '.xya')
+#G12 = Geospatial_data(file_name = project.offshore_dem_name_aho8 + '.xya')
+#G13 = Geospatial_data(file_name = project.offshore_dem_name_aho9 + '.xya')
+#G14 = Geospatial_data(file_name = project.offshore_dem_name_aho10 + '.xya')
+#G15 = Geospatial_data(file_name = project.offshore_dem_name_aho11 + '.xya')
+#G16 = Geospatial_data(file_name = project.offshore_dem_name_aho12 + '.xya')
+#G17 = Geospatial_data(file_name = project.offshore_dem_name_aho13 + '.xya')
+#G18 = Geospatial_data(file_name = project.offshore_dem_name_aho14 + '.xya')
+#G19 = Geospatial_data(file_name = project.offshore_dem_name_aho15 + '.xya')
+#G20 = Geospatial_data(file_name = project.offshore_dem_name_aho16 + '.xya')
+#G12 = G5+G6+G7+G8+G9+G10+G11+G12+G13+G14+G15+G16+G17+G18+G19+G20
+#print 'local onshore dem'
+#G21 = Geospatial_data(file_name = project.onshore_dem_name + '.pts')
 print 'coast'
-G22 = Geospatial_data(file_name = project.coast_dem_name + '.xya')
-print 'adding data sets'
+#G22 = Geospatial_data(file_name = project.coast_dem_name + '.xya')
+#print 'adding data sets'
 #G = G11 + G12 + G21 + G22
-G = G21
+#G = G1+G2+G3+G4+G5+G6+G7+G8+G9+G10+G11+G12+G13+G14+G15+G16+G17+G18+G19+G20+G21+G22
+#G = G5+G6+G7+G8+G9+G10+G11+G12+G13+G14+G15+G16+G17+G18+G19+G20+G21+G22
+#G = G21+G22+G5+G6+G7+G8+G9+G10+G11+G12+G13+G14+G15+G16+G17+G18+G19+G20
+#G = G21+G22+G5
+#G = Geospatial_data(file_name = project.onshore_dem_name + '.pts') #+ \
+#    Geospatial_data(file_name = project.coast_dem_name + '.xya') #+ \
+#    Geospatial_data(file_name = project.offshore_dem_name_aho1 + '.xya')
+G = Geospatial_data(file_name = project.offshore_dem_name_local1 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_local2 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_local3 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_local4 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho1 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho2 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho3 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho4 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho5 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho6 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho7 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho8 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho9 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho10 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho11 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho12 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho13 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho14 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho15 + '.xya')+\
+    Geospatial_data(file_name = project.offshore_dem_name_aho16 + '.xya')+\
+    Geospatial_data(file_name = project.all_onshore_dem_name + '.pts')
 G.export_points_file(project.combined_dem_name + '.pts')
 

anuga_work/production/onslow_2006/export_results.py

@@ -2 +2 @@
 import sys
 
-from anuga.pyvolution.data_manager import sww2dem
-from anuga.pyvolution.ermapper_grids import read_ermapper_grid
-from anuga.pyvolution.util import Screen_Catcher
+from anuga.shallow_water.data_manager import sww2dem
+#from anuga.pyvolution.ermapper_grids import read_ermapper_grid
+from anuga.abstract_2d_finite_volumes.util import Screen_Catcher
 from os import sep
 
 #time_dir = '20060704_063005' #HAT
-time_dir = '20060706_235246' #LAT
-#time_dir = '20060704_063234' #MSL
+#time_dir = '20060706_235246' #LAT
+time_dir = '20060704_063234' #MSL
 #time_dir = '20060515_001733' #DTED data
 directory = project.outputdir
@@ -25 +25 @@
 
 #used to catch screen output to file
-sys.stdout = Screen_Catcher(screen_output_name)
-sys.stderr = Screen_Catcher(screen_error_name)
+#sys.stdout = Screen_Catcher(screen_output_name)
+#sys.stderr = Screen_Catcher(screen_error_name)
 
 print 'output dir:', name

anuga_work/production/onslow_2006/project.py

@@ -8 +8 @@
 import sys
 
-from anuga.pmesh.create_mesh import convert_points_from_latlon_to_utm
+from anuga.coordinate_transforms.redfearn import convert_points_from_latlon_to_utm
 
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
@@ -134 +134 @@
 n_max_area = 7610000
 
+# region to export to make elevation map: JS 22/9/06
+
+e_min_area = 240000
+e_max_area = 340000
+n_min_area = 7580000
+n_max_area = 7690000
+
 #Georeferencing
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees