Changeset 6329 for anuga_work/production/busselton/standardised_version/build_urs_boundary.py

Timestamp:

Feb 13, 2009, 10:39:47 AM (15 years ago)

Author:

rwilson

Message:

Further changes from testing.

File:

• anuga_work/production/busselton/standardised_version/build_urs_boundary.py (modified) (4 diffs)

anuga_work/production/busselton/standardised_version/build_urs_boundary.py

@@ -22 +22 @@
 #-------------------------------------------------------------------------------
 def get_sts_gauge_data(filename, verbose=False):
+    print 'get_sts_gauge_data: filename=%s' % filename
     fid = NetCDFFile(filename+'.sts', 'r')      #Open existing file for read
     permutation = fid.variables['permutation'][:]
@@ -87 +88 @@
 ##
 # @brief Build boundary STS files from one or more MUX files.
-# @param mux_dir Directory containing the MUX files.
-# @param event_file Path to meta-file containing mux files+weight data.
+# @param event_file Name of mux meta-file or single mux stem.
 # @param output_dir Directory to write STS data to.
 # @note 'event_file' is produced by EventSelection.
-def build_urs_boundary(mux_dir, event_file, output_dir):
+def build_urs_boundary(event_file, output_dir):
     '''Build a boundary STS file from a set of MUX files.'''
 
-    print 'build_urs_boundary: mux_dir=%s' % mux_dir
     print 'build_urs_boundary: event_file=%s' % event_file
     print 'build_urs_boundary: output_dir=%s' % output_dir
 
     # if we are using an EventSelection multi-mux file
-    if project.multi_mux:    
-        # get the mux+weight data from the event file
-        mux_event_file = os.path.join(mux_dir, event_file)
+    if project.multi_mux:
+        print 'using multi-mux file'
+        # get the mux+weight data from the meta-file (in <boundaries>)
+        mux_event_file = os.path.join(project.boundaries_folder, event_file)
         try:
             fd = open(mux_event_file, 'r')
@@ -130 +130 @@
             split_index = muxname.index('.grd')
             muxname = muxname[:split_index+len('.grd')]
-            muxname = os.path.join(mux_dir, muxname)
+            muxname = os.path.join(project/mux_data_folder, muxname)
             mux_filenames.append(muxname)
         
@@ -144 +144 @@
                 verbose=True)
     else:                           # a single mux stem file, assume 1.0 weight
-        mux_filenames = [os.path.join(mux_dir, event_file)]
+        print 'using single-mux file'
+        mux_filenames = [os.path.join(project.mux_data_folder, event_file)]
 
         weight_factor = 1.0
         mux_weights = weight_factor*num.ones(len(mux_filenames), num.Float)
             
-        order_filename = project.order_filename_dir
+        order_filename = project.urs_order
 
         print 'reading', order_filename
         # Create ordered sts file
         print 'creating sts file'
+        print 'mux_filenames=%s' % str(mux_filenames)
+        print 'output_dir=%s' % str(output_dir)
+        print 'mux_weights=%s' % str(mux_weights)
+        print 'project.tide=%s' % str(project.tide)
         urs2sts(mux_filenames,
                 basename_out=output_dir,