Changeset 5245

Timestamp:

Apr 28, 2008, 8:00:14 AM (17 years ago)

Author:

sexton

Message:

(1) update of production processes document (2) test for generating points for URS output (3) update of graduate proposal

Files:

• anuga_core/documentation/planning/graduate_proposal_smf_development.doc (modified) (previous)
• anuga_core/documentation/user_manual/Production Processes.doc (modified) (previous)
• anuga_core/source/anuga/geospatial_data/geospatial_data.py (modified) (1 diff)
• anuga_core/source/anuga/shallow_water/test_data_manager.py (modified) (1 diff)
• anuga_work/development/MISG_2008/sensitivity_study.py (modified) (2 diffs)
• anuga_work/production/broome/run_boundary_points.py (modified) (2 diffs)
• anuga_work/production/exmouth_2006/plot_contour_data.py (modified) (3 diffs)
• anuga_work/production/onslow_2006/convert_db_points.py (modified) (2 diffs)
• anuga_work/production/shark_bay_2007/export_results.py (modified) (1 diff)
• anuga_work/production/west_tas_2008/convert2eastnorth.py (modified) (1 diff)
• anuga_work/production/west_tas_2008/project_smf.py (modified) (4 diffs)
• anuga_work/production/west_tas_2008/run_west_tas_smf.py (modified) (1 diff)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -910 +910 @@
             raise ValueError, msg
         lats_longs = ensure_numeric(data_points)
+        print 'hello', lats_longs
         latitudes = ravel(lats_longs[:,0:1])
         longitudes = ravel(lats_longs[:,1:])

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6117 +6117 @@
                           lat_amount, long_amount,
                           verbose=self.verbose)
+
+    def test_URS_points_needed_poly1(self):
+        # domain in southern hemisphere zone 51
+        grid_spacing = 2./60.
+        poly1 = [[296361.89, 8091928.62],[429495.07,8028278.82], [447230.56,8000674.05],
+                     [429661.2,7982177.6],[236945.9,7897453.16],[183493.44,7942782.27],
+                     [226583.04,8008058.96]]
+        URS_points_needed_to_file('test_example_poly1',poly1,51,
+                                  grid_spacing,verbose=self.verbose) 
+
+    def test_URS_points_needed_poly2(self):
+        # domain in northern hemisphere zone 47
+        grid_spacing = 2./60.
+        poly2 = [[419336.424,810100.845],[342405.0281,711455.8026],[274649.9152,723352.9603],
+                  [272089.092,972393.0131],[347633.3754,968551.7784],
+                        [427979.2022,885965.2313],[427659.0993,875721.9386],
+                        [429259.6138,861317.3083],[436301.8775,840830.723]]
+        URS_points_needed_to_file('test_example_poly2',poly2,47,
+                                  grid_spacing,verbose=self.verbose) 
         
     #### END TESTS URS UNGRIDDED 2 SWW ###

anuga_work/development/MISG_2008/sensitivity_study.py

@@ -136 +136 @@
     tri_id2 = domain.get_triangle_containing_point([-c/m-20,y_extent*0.5])
     tri_id3 = domain.get_triangle_containing_point([-c/m+50,y_extent*0.5])
-      
+
+    print 'hello', -c/m, -c/m-10, -c/m-20, -c/m+50
+    
     stage_centroid     = domain.quantities['stage'].centroid_values
     xmom_centroid      = domain.quantities['xmomentum'].centroid_values
@@ -146 +148 @@
     elev3 = elevation_centroid[tri_id3]
 
+    print 'hello again', elev0, elev1, elev2, elev3
     import time
     t0 = time.time()

anuga_work/production/broome/run_boundary_points.py

@@ -21 +21 @@
 from anuga.shallow_water.data_manager import URS_points_needed_to_file, \
      urs_ungridded2sww
-import project                 # Definition of file names and polygons
+import project_urs                 # Definition of file names and polygons
 
 #------------------------------------------------------------------------------
@@ -27 +27 @@
 # output to file
 #------------------------------------------------------------------------------
-poly = project.poly_all
+poly = project_urs.poly_all
 print "poly", poly
-print "project.boundaries_in_dir_name",project.boundaries_in_dir_name
-URS_points_needed_to_file(project.boundaries_in_dir_name,poly, export_csv=True, zone=51)
+print "project_urs.boundaries_in_dir_name",project_urs.boundaries_in_dir_name
+URS_points_needed_to_file(project_urs.boundaries_in_dir_name,poly, export_csv=True, zone=51)
 #URS_points_needed_to_file(project.boundaries_dir_name5,poly, export_csv=True, zone=50)
 #URS_points_needed_to_file(project.boundaries_dir_name5,poly, export_csv=True)

anuga_work/production/exmouth_2006/plot_contour_data.py

@@ -3 +3 @@
 
 import project
-from pylab import plot, xlabel, ylabel, savefig, ion, close, axis, title, legend, grid
+from pylab import plot, xlabel, ylabel, savefig, ion, close, axis, title, legend, grid, figure
 from os import sep
  
@@ -56 +56 @@
 #Magnitude 9.0 event (Sumba) at Exmouth')
 legend(['ANUGA','Green\'s law'])
-axis([-5,85,min(stage_max)*0.9,max(stage_max)*1.1])
+#axis([-5,85,min(stage_max)*0.9,max(stage_max)*1.1])
+axis([-5,85,3.5,max(stage_max)*1.1])
 grid(True)
 #savefig('stratification_onslow_gun')
@@ -62 +63 @@
 #savefig('stratification_dampier_gun')
 
+depthv2 = [0,5,20,80]
+datav2 = [8.2,6,4,h1]
+figure(2)
+plot(d2,green,'g-',depthv2,datav2,'bo-')
+xlabel('depth (m)')
+ylabel('stage (m)')
+title('ANUGA modelled maximum stage versus Green\'s approximation \n \
+Magnitude 9.3 event (Java) at Exmouth')
+legend(['ANUGA','Green\'s law'])
+axis([-5,85,3.5,max(stage_max)*1.1])
+grid(True)
+savefig('strat_exmouth_gun_v2')
 close('all')
 

anuga_work/production/onslow_2006/convert_db_points.py

@@ -13 +13 @@
     
     fid_out = open(filenameout, 'w')
-    s = '%s,%s\n' %('easting','northing')
+    s = '%s,%s,%s\n' %('easting','northing','zone')
     fid_out.write(s)
     for line in lines[1:]:
        fields = line.split(',')
-       x = float(fields[1])
-       y = float(fields[0])
+       #x = float(fields[1])
+       #y = float(fields[0])
+       x = float(fields[0])
+       y = float(fields[1])
        zone, easting, northing = redfearn(x,y)
-       s = '%f,%f\n' %(easting,northing)
+       s = '%f,%f,%f\n' %(easting,northing,zone)
        fid_out.write(s)
 
@@ -29 +31 @@
 import project
 
-filename = project.gaugedir + 'db_points.txt'
-filename_out = project.gaugedir + 'db_points_convert.txt'
+#filename = project.gaugedir + 'db_points.txt'
+#filename_out = project.gaugedir + 'db_points_convert.txt'
+filename = project.gaugedir + 'aus_hazard_pts.txt'
+filename_out = project.gaugedir + 'aus_hazard_pts_en.txt'
 alter_file(filename,filename_out)
+

anuga_work/production/shark_bay_2007/export_results.py

@@ -71 +71 @@
                     reduction = max, 
                     verbose = True,
-                    format = 'asc')
+                    format = 'txt')

anuga_work/production/west_tas_2008/convert2eastnorth.py

@@ -31 +31 @@
 #filename = project_smf.polygondir + 'domain.txt'
 #filename = project_smf.polygondir + 'local.txt'
-filename = project_smf.polygondir + 'region.txt'
+#filename = project_smf.polygondir + 'region.txt'
+#filename = project_smf.datadir + 'Sorell_Basin_150m_DD_Interp.txt'
+#filename = project_smf.datadir + 'S_Tasman_Rise_150m_DD_Interp.txt'
+filename = project_smf.polygondir + 'origin.txt'
 #filename_out = project_smf.polygondir + 'domain.csv'
 #filename_out = project_smf.polygondir + 'local.csv'
-filename_out = project_smf.polygondir + 'region.csv'
+#filename_out = project_smf.polygondir + 'region.csv'
+#filename_out = project_smf.datadir + 'Sorell_Basin_150m_EN_Interp.txt'
+#filename_out = project_smf.datadir + 'S_Tasman_Rise_150m_EN_Interp.txt'
+filename_out = project_smf.polygondir + 'origin_EN.csv'
 alter_file(filename,filename_out)

anuga_work/production/west_tas_2008/project_smf.py

@@ -24 +24 @@
 state = 'tasmania'
 scenario_dir_name = 'smf_scenario_2008'
-'''
-# onshore data provided by NSW LPI, Krishna merged with existing
-# PMD data to make 100m DEM
-on_offshore_name100 = 'bathyland100'
+
+# onshore data sourced from 250m grid
+onshore_name250 = 'bathyland250'
+
+# coastline from GA
+coast_line_name = 'aus_cst'
 
 # survey data
-offshore_name1 = 'surveyAreaA'
-offshore_name2 = 'surveyAreaB'
-offshore_name3 = 'surveyAreaC'
+offshore_name1 = 'S_Tasman_Rise_150m_EN_Interp'
+offshore_name2 = 'Sorell_Basin_150m_EN_Interp'
+offshore_name3 = 'West_Tas_EastNorth_z'
 
-# AHO data
-offshore_name4 = '1000003611export'
-offshore_name5 = '1000003613export'
-offshore_name6 = '1000003614export'
-offshore_name7 = '1000003627export'
-offshore_name8 = '1000003628export'
-offshore_name9 = 'AHDexport'
-'''
 #swollen/ all data output
 basename = 'source'
@@ -61 +55 @@
 codedirname = codedir + 'project_smf.py'
 meshname = outputtimedir + 'mesh_' + basename
-'''
+
 # Necessary if using point datasets, rather than grid
-on_offshore100_dem_name = datadir + on_offshore_name100
+onshore_250_dem_name = datadir + onshore_name250
 offshore_dem_name1 = datadir + offshore_name1
 offshore_dem_name2 = datadir + offshore_name2
 offshore_dem_name3 = datadir + offshore_name3
+coast_line = datadir + coast_line_name
 
 combined_dem_name   = datadir + 'west_tas_combined_elevation'
-'''
+
 ###############################
 # Domain definitions
@@ -94 +89 @@
 ###################################################################
 
-
 # exporting asc grid
 eastingmin = 333000
@@ -107 +101 @@
 
 # historical slides
-#slide_origin = [,]
+slide_origin = [338270.5407, 5217273.89]
 
 depth = 1750.0

anuga_work/production/west_tas_2008/run_west_tas_smf.py

@@ -54 +54 @@
 
 # filenames
-on_offshore25_dem_name = project_smf.on_offshore25_dem_name
+onshore_250_dem_name = project_smf.onshore_250_dem_name
 meshname = project_smf.meshname+'.msh'
 
 # creates DEM from asc data
-convert_dem_from_ascii2netcdf(on_offshore25_dem_name, use_cache=True, verbose=True)
+convert_dem_from_ascii2netcdf(onshore_250_dem_name, use_cache=True, verbose=True)
 
 #creates pts file for onshore DEM
-dem2pts(on_offshore25_dem_name,
-        easting_min=project_smf.eastingmin25,
-        easting_max=project_smf.eastingmax25,
-        northing_min=project_smf.northingmin25,
-        northing_max= project_smf.northingmax25,
-        use_cache=True, verbose=True)
+dem2pts(onshore_250_dem_name, use_cache=True, verbose=True)
 
 print 'create offshore'
-G1 = Geospatial_data(file_name = project_smf.offshore_dem_name1 + '.xya')+\
-     Geospatial_data(file_name = project_smf.offshore_dem_name2 + '.xya')+\
-     Geospatial_data(file_name = project_smf.offshore_dem_name3 + '.xya')
+G1 = Geospatial_data(file_name = project_smf.offshore_dem_name1 + '.txt')+\
+     Geospatial_data(file_name = project_smf.offshore_dem_name2 + '.txt')+\
+     Geospatial_data(file_name = project_smf.offshore_dem_name3 + '.txt')
 
 print 'create onshore'
-G2 = Geospatial_data(file_name = project_smf.on_offshore25_dem_name + '.pts')
+G2 = Geospatial_data(file_name = project_smf.onshore_250_dem_name + '.pts')
+
+print 'create coastline'
+G3 = Geospatial_data(file_name = project_smf.coast_line + '.txt')
 
 print 'add'
-G = G1 + G2
+G = G1.clip(Geospatial_data(project_smf.polyAll)) + G2 + G3
 
 print 'export points'