Changeset 6335

Timestamp:

Feb 13, 2009, 2:45:02 PM (16 years ago)

Author:

rwilson

Message:

Final save (except for moving build_urs_boundary.py somewhere).

Location:

anuga_work/production/busselton/standardised_version

Files:

• build_urs_boundary.py (modified) (6 diffs)
• project.py (modified) (2 diffs)
• setup_model.py (modified) (2 diffs)

anuga_work/production/busselton/standardised_version/build_urs_boundary.py

@@ -41 +41 @@
     #---------------------------------------------------------------------------
 
+    # 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.write('index, x, y, max_stage \n')    
@@ -94 +99 @@
     '''Build a boundary STS file from a set of MUX files.'''
 
-    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:
-        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)
+        print 'using multi-mux file', mux_event_file
         try:
             fd = open(mux_event_file, 'r')
@@ -130 +132 @@
             split_index = muxname.index('.grd')
             muxname = muxname[:split_index+len('.grd')]
-            muxname = os.path.join(project/mux_data_folder, muxname)
+            muxname = os.path.join(project.mux_data_folder, muxname)
             mux_filenames.append(muxname)
         
@@ -144 +146 @@
                 verbose=True)
     else:                           # a single mux stem file, assume 1.0 weight
-        print 'using single-mux file'
-        mux_filenames = [os.path.join(project.mux_data_folder, event_file)]
+        mux_file = os.path.join(project.mux_data_folder, event_file)
+        mux_filenames = [mux_file]
+        print 'using single-mux file', mux_file
 
         weight_factor = 1.0
@@ -154 +157 @@
         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,
@@ -167 +165 @@
 
     # report on progress so far
-    quantities, elevation, time = get_sts_gauge_data(project.event_folder,
-                                                     verbose=False)
+    sts_file = os.path.join(project.event_folder, project.scenario_name)
+    quantities, elevation, time = get_sts_gauge_data(sts_file, verbose=False)
     print len(elevation), len(quantities['stage'][0,:])
 

anuga_work/production/busselton/standardised_version/project.py

@@ -122 +122 @@
 mux_input_filename = 'Java-0016-z.grd'
 multi_mux = False
+##mux_input_filename = 'event_027197.list'
+##multi_mux = True
 
 #-------------------------------------------------------------------------------
@@ -209 +211 @@
 meshes = join(meshes_folder, scenario_name) + '.msh'
 
-# The absolute pathname for the urs order points, used within build_boundary.py
+# The pathname for the urs order points, used within build_urs_boundary.py
 urs_order = join(boundaries_folder, urs_order_filename)
 

anuga_work/production/busselton/standardised_version/setup_model.py

@@ -88 +88 @@
 #-----
 # If this directory don't exist initially, create it.
-# This should be moved to run_model.py.
 #-----
 
@@ -159 +158 @@
 
 print 'min estimated number of triangles', trigs_min
-
-#-------------------------------------------------------------------------------
-# Return imported project object as *our* project object.
-#-------------------------------------------------------------------------------
-
-project = project
-