Changeset 6784 for anuga_work

Timestamp:

Apr 14, 2009, 10:15:49 AM (16 years ago)

Author:

kristy

Message:

Reverted back to previous version to pass through 3 arguments

File:

• anuga_work/production/australia_ph2/melbourne/build_urs_boundary.py (modified) (4 diffs)

anuga_work/production/australia_ph2/melbourne/build_urs_boundary.py

@@ -92 +92 @@
 # @param output_dir Directory to write STS data to.
 # @note 'event_file' is produced by EventSelection.
-def build_urs_boundary(event_file, output_dir):
+def build_urs_boundary(event_file, output_dir,urs_file):
     '''Build a boundary STS file from a set of MUX files.'''
-
+    print 'reading', urs_file
     # if we are using an EventSelection multi-mux file
     if project.multi_mux:
@@ -137 +137 @@
         urs2sts(mux_filenames,
                 basename_out=output_dir,
-                ordering_filename=project.urs_order,
+                ordering_filename=urs_file,
                 weights=mux_weights,
                 central_meridian=project.central_meridian,
@@ -149 +149 @@
         weight_factor = 1.0
         mux_weights = weight_factor*num.ones(len(mux_filenames), num.Float)
-            
-        order_filename = project.urs_order
 
-        print 'reading', order_filename
+
         # Create ordered sts file
         urs2sts(mux_filenames,
                 basename_out=output_dir,
-                ordering_filename=order_filename,
+                ordering_filename=urs_file,
                 weights=mux_weights,
                 central_meridian=project.central_meridian,
@@ -163 +161 @@
 
     # report on progress so far
-    sts_file = os.path.join(project.event_folder, project.scenario_name)
-    quantities, elevation, time = get_sts_gauge_data(sts_file, verbose=False)
+##    sts_file = os.path.join(project.event_folder, project.scenario_name)
+    quantities, elevation, time = get_sts_gauge_data(output_dir, verbose=False)
     print len(elevation), len(quantities['stage'][0,:])