Changeset 3953

Timestamp:

Nov 9, 2006, 9:42:34 AM (18 years ago)

Author:

sexton

Message:

clean up

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/util.py (modified) (1 diff)
• shallow_water/data_manager.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -1195 +1195 @@
     return texfile2, elev_output
 
-
-def gauge_in_sww(swwfile,
-                 gauge_filename,
-                 verbose = False):
-    
-    """ Determine which gauges fall in sww file.
-
-    Input variables:
-
-    swwfiles        - sww files 
-    
-    gauge_filename  - name of file containing gauge data
-                        - easting, northing, name , elevation
-                    - OR (this is not yet done)
-                        - structure which can be converted to a Numeric array,
-                          such as a geospatial data object
-                      
-    Output:
-    
-    - Modified gauge_filename containing gauges which fall is given sww file.
-      Name = gauges_filename_mod 
-    Other important information:
-                          
-    """
-
-    
-    k = _gauge_in_sww(swwfile,
-                      gauge_filename,
-                      verbose)
-
-    return k
-
-def _gauge_in_sww(swwfile, 
-                  gauge_filename,
-                  verbose = False):   
-
-    try:
-        fid = open(swwfile)
-    except Exception, e:
-        msg = 'File "%s" could not be opened: Error="%s"'\
-              %(swwfile, e)
-        raise msg
-        
-    assert type(gauge_filename) == type(''),\
-           'Gauge filename must be a string'
-    
-    try:
-        fid = open(gauge_filename)
-    except Exception, e:
-        msg = 'File "%s" could not be opened: Error="%s"'\
-                  %(gauge_filename, e)
-        raise msg
-
-    sww_quantity = ['stage', 'elevation', 'xmomentum', 'ymomentum']
-    f = file_function(swwfile,
-                      quantities = sww_quantity,
-                      #interpolation_points = gauges,
-                      verbose = True,
-                      use_cache = True)
-    print dir(f)
-    
-    #from bstract_2d_finite_volumes.neighbour_mesh import get_boundary_polygon
-    from anuga.abstract_2d_finite_volumes.neighbour_mesh import Mesh
-    #from anuga.fit_interpolate.general_fit_interpolate import FitInterpolate
-    #from anuga.fit_interpolate.interpolate import Interpolation_function
-    from anuga.fit_interpolate.interpolate import Interpolate
-
-    test = Mesh(f.vertex_coordinates)
-    print test.mesh.get_boundary_polygon()
-    
-    return check_gauge(gauge_filename,bounding_polygon)
-
-def check_gauge(gauge_filename,bounding_polygon):
-
-    from anuga.utilities.polygon import is_inside_polygon 
-    
-    filename_out = gauge_filename + '_mod'
-    fid_out = open(filename_out, 'w')
-    fid_out.write(s)
-
-    gauges, locations, elev = get_gauges_from_file(gauge_filename)
-    
-    for i, gauge in enumerate(gauges):
-        v = is_inside_polygon(gauge,bounding_polygon,verbose=False)
-        if v == True:
-            s = '%.2f, %.2f, %.2f, %s\n' %(gauges[0], gauges[1], elev[i], locations[i])
-    
-    return fid_out
-
 from os.path import basename
 

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4020 +4020 @@
 
 
-# FIXME (Ole): Is this doing anything at all? 
-def sww2timeseries(swwfile,
-                   gauge_filename,
-                   gauge_data_outname,
-                   quantity = None,
-                   time_min = None,
-                   time_max = None,
-                   verbose = False):
-
-    """Read SWW file and extract time series for prescribed quantities at
-    gauge locations.
-
-    The gauge locations are defined in gauge_filename. This file should be
-    in the form: gaugename, easting, northing, and should be stored in a
-    .csv or .xya file.
-
-    Time series data at the gauges can be written to file (for example,
-    Benfield requested raw data) with the default being no data written.
-
-    The parameter quantity must be the name of an existing quantity or
-    an expression involving existing quantities. The default is
-    'depth'.
-
-    The user can define a list of quantities. The possibilities are
-    the conserved quantitues of the shallow water wave equation and other
-    quantities which can be derived from those, i.e.
-    ['depth', 'xmomentum', 'ymomentum', 'momentum', 'velocity', 'bearing'].
-
-    Momentum is the absolute momentum, sqrt(xmomentum^2 + ymomentum^2).
-    Note, units of momentum are m^2/s and depth is m.
-
-    Velocity is absolute momentum divided by depth. (Confirming correct units:
-    vel = abs mom / depth = (m^2/s)/m = m/s.)
-
-    Bearing returns the angle of the velocity vector from North.
-
-    If time_min and time_max is given, output plotted in that time range.
-    The default is to plot the entire range of the time evident in sww file.
-
-    The export graphic format in 'png' and will be stored in the same
-    directory as the input file.
-    """
-
-    if quantity is None: quantity = 'depth'
-
-    # extract gauge locations from gauge file
-
-    # extract all quantities from swwfile (f = file_function)
-    if time_min is None: time_min = min(f.get_time())
-    if time_max is None: time_max = max(f.get_time())
-
-    # loop through appropriate range of time
-    # plot prescribed quantities and export data if requested
-
-    #if gauge_data_outname is None:
-
-    return
 
     ####  URS 2 SWW  ###