Changeset 6982 for anuga_work/production/australia_ph2/carnarvon

Timestamp:

May 6, 2009, 12:06:04 PM (16 years ago)

Author:

kristy

Message:

 

Location:

anuga_work/production/australia_ph2/carnarvon

Files:

• build_elevation.py (modified) (2 diffs)
• project.py (modified) (7 diffs)

anuga_work/production/australia_ph2/carnarvon/build_elevation.py

@@ -55 +55 @@
         convert_dem_from_ascii2netcdf(absolute_filename,
                                       basename_out=absolute_filename,
-                                      use_cache=True,
+                                      use_cache=False,
                                       verbose=True)
-        dem2pts(absolute_filename, use_cache=True, verbose=True)
+        dem2pts(absolute_filename, use_cache=False, verbose=True)
 
         geospatial_data[filename] = Geospatial_data(file_name=absolute_filename+'.pts',
@@ -86 +86 @@
 ##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_clip.export_points_file(project.combined_elevation + '.pts')
+G.export_points_file(project.combined_elevation + '.pts')
 print 'Do txt version too'
 # Use for comparision in ARC
-G_clip.export_points_file(project.combined_elevation + '.txt')
+G.export_points_file(project.combined_elevation + '.txt')
 

anuga_work/production/australia_ph2/carnarvon/project.py

@@ -32 +32 @@
     event_number = int(sys.argv[1])
 else:    
-    event_number = 27285    # the event number or the mux file name
+    event_number = 68754    # the event number or the mux file name
 
 event_number_list = [27285, 68754, 70881] # To piggy back multiple events
@@ -78 +78 @@
 # Used in build_elevation.py
 # Format for ascii grids, as produced in ArcGIS + a projection file
-ascii_grid_filenames = ['grid250m_simple'] # 250m grid 2005
+ascii_grid_filenames = ['grid_250m_simple'] # 250m grid 2005
 
 # Format for points is x,y,elevation (with header)
@@ -132 +132 @@
 # Landward bounding points
 # Format easting,northing (no header)
-landward_boundary_filename = 'landward_boundary_simple.csv'
+landward_boundary_filename = 'landward_boundary_simple2.csv'
 
 # MUX input filename.
@@ -145 +145 @@
 # Whatever is specified here will be relative to INUNDATION_HOME/.cache
 # If nothing is specified, local cache will be used.
-cachedir = '.python_cache_phII'
+#cachedir = '.python_cache_phII'
 
 
@@ -173 +173 @@
 # Output filename for elevation
 # this is a combination of all the data generated in build_elevation.py
-combined_elevation_basename = scenario_name + '_combined_elevation'
+combined_elevation_basename = scenario_name + '_combined_elevation_simple'
 
 #-------------------------------------------------------------------------------
@@ -191 +191 @@
 # Create absolute pathname for cache directory
 # and change caching to use it
-if 'cachedir' in dir():
-    cachedir = join(os.getenv(ENV_INUNDATIONHOME), '.cache', cachedir)
-    from anuga.caching import caching
-    caching.set_option('cachedir', cachedir) 
+##if 'cachedir' in dir():
+##    cachedir = join(os.getenv(ENV_INUNDATIONHOME), '.cache', cachedir)
+##    from anuga.caching import caching
+##    caching.set_option('cachedir', cachedir) 
     
 # check various directories/files that must exist
@@ -219 +219 @@
 
 # The absolute pathname of the all elevation, generated in build_elevation.py
-combined_elevation = join(topographies_folder, combined_elevation_basename)+'_simple'
+combined_elevation = join(topographies_folder, combined_elevation_basename)
 
 # The absolute pathname of the mesh, generated in run_model.py