Changeset 6376

Timestamp:

Feb 23, 2009, 2:17:06 PM (16 years ago)

Author:

myall

Message:

Ready for use, fixed known problems

Location:

anuga_work/production/busselton/standardised_version

Files:

• build_elevation.py (modified) (1 diff)
• build_urs_boundary.py (modified) (5 diffs)
• project.py (modified) (3 diffs)
• run_model.py (modified) (1 diff)

anuga_work/production/busselton/standardised_version/build_elevation.py

@@ -50 +50 @@
 # Create Geospatial data from ASCII files
 geospatial_data = {}
-for filename in project.ascii_grid_filenames:
-    absolute_filename = join(project.topographies_folder, filename)
-    convert_dem_from_ascii2netcdf(absolute_filename,
-                                  basename_out=absolute_filename,
-                                  use_cache=True,
-                                  verbose=True)
-    dem2pts(absolute_filename, use_cache=True, verbose=True)
+if not project.ascii_grid_filenames == []:
+    for filename in project.ascii_grid_filenames:
+        absolute_filename = join(project.topographies_folder, filename)
+        convert_dem_from_ascii2netcdf(absolute_filename,
+                                      basename_out=absolute_filename,
+                                      use_cache=True,
+                                      verbose=True)
+        dem2pts(absolute_filename, use_cache=True, verbose=True)
 
-    geospatial_data[filename] = Geospatial_data(file_name=absolute_filename+'.pts',
-                                                verbose=True)
+        geospatial_data[filename] = Geospatial_data(file_name=absolute_filename+'.pts',
+                                                    verbose=True)
 
 # Create Geospatial data from TXT files
-for filename in project.point_filenames:
-    absolute_filename = join(project.topographies_folder, filename)
-    geospatial_data[filename] = Geospatial_data(file_name=absolute_filename,
-                                                verbose=True)
-
+if not project.point_filenames == []:
+    for filename in project.point_filenames:
+        absolute_filename = join(project.topographies_folder, filename)
+        geospatial_data[filename] = Geospatial_data(file_name=absolute_filename,
+                                                    verbose=True)
 
 #-------------------------------------------------------------------------------

anuga_work/production/busselton/standardised_version/build_urs_boundary.py

@@ -40 +40 @@
     # Get maximum wave height throughout timeseries at each index point
     #---------------------------------------------------------------------------
-
-    # create directory for generate STS file, if necessary
-    if not os.path.exists(project.event_sts):
-        os.mkdir(project.event_sts)
-        
+     
     maxname = 'max_sts_stage.csv'
     print 'get_sts_gauge_data: maxname=%s' % maxname
-    fid_max = open(os.path.join(project.event_sts, maxname), 'w')
+    fid_max = open(os.path.join(project.event_folder, maxname), 'w')
     fid_max.write('index, x, y, max_stage \n')    
     for j in range(len(x)):
@@ -62 +58 @@
 
     minname = 'min_sts_stage.csv'
-    fid_min = open(os.path.join(project.event_sts, minname), 'w')
+    fid_min = open(os.path.join(project.event_folder, minname), 'w')
     fid_min.write('index, x, y, max_stage \n')    
     for j in range(len(x)):
@@ -72 +68 @@
         fid_min.write('%d, %.6f, %.6f, %.6f\n' %(index, x[j], y[j], min(stage)))
 
-        out_file = os.path.join(project.event_sts,
+        out_file = os.path.join(project.event_folder,
                                 basename+'_'+str(index)+'.csv')
         fid_sts = open(out_file, 'w')
@@ -102 +98 @@
     if project.multi_mux:
         # get the mux+weight data from the meta-file (in <boundaries>)
-        mux_event_file = os.path.join(project.boundaries_folder, event_file)
+        mux_event_file = os.path.join(project.event_folder, event_file)
         print 'using multi-mux file', mux_event_file
         try:
@@ -146 +142 @@
                 verbose=True)
     else:                           # a single mux stem file, assume 1.0 weight
-        mux_file = os.path.join(project.mux_data_folder, event_file)
+        mux_file = os.path.join(project.event_folder, event_file)
         mux_filenames = [mux_file]
         print 'using single-mux file', mux_file

anuga_work/production/busselton/standardised_version/project.py

@@ -27 +27 @@
 # One or all can be changed each time the run_model script is executed
 tide = 0                # difference between MSL and HAT
-event_number = 27197    # the event number
+event_number = 27197    # the event number or the mux file name
 alpha = 0.1             # smoothing parameter for mesh
 friction=0.01           # manning's friction coefficient
@@ -125 +125 @@
 # If a meta-file from EventSelection is used, set 'multi-mux' to True.
 # If a single MUX stem filename (*.grd) is used, set 'multi-mux' to False.
-mux_input_filename = 'Java-0016-z.grd'
-multi_mux = False
-##mux_input_filename = join(event_folder, 'event.list')
-##multi_mux = True
+##mux_input_filename = event_number # to be found in event_folder
+                                    # (ie boundaries/event_number/)
+##multi_mux = False
+mux_input_filename = 'event.list'
+multi_mux = True
 
 #-------------------------------------------------------------------------------
@@ -243 +244 @@
 
 # full path to where MUX files (or meta-files) live
-mux_input = join(boundaries_folder, mux_input_filename)
-
+mux_input = join(event_folder, mux_input_filename)
+

anuga_work/production/busselton/standardised_version/run_model.py

@@ -121 +121 @@
 else:
     IC = 0
-omain.set_quantity('stage', IC, use_cache=True, verbose=True)
+domain.set_quantity('stage', IC, use_cache=True, verbose=True)
 domain.set_quantity('friction', project.friction) 
 domain.set_quantity('elevation',