Changeset 7810 for trunk/anuga_core/source/anuga/fit_interpolate

Timestamp:

Jun 8, 2010, 2:31:04 PM (15 years ago)

Author:

James Hudson

Message:

Added aggressive psyco optimisation, fixed benchmark app to work with new API.

File:

• trunk/anuga_core/source/anuga/fit_interpolate/interpolate.py (modified) (1 diff)

trunk/anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -1234 +1234 @@
 
 
-##
-# @brief ??
-# @param file_name Name of the .SWW file to read.
-def read_sww(file_name):
-    """
-    obsolete - Nothing should be calling this
-
-    Read in an sww file.
-
-    Input;
-    file_name - the sww file
-
-    Output;
-    x - Vector of x values
-    y - Vector of y values
-    z - Vector of bed elevation
-    volumes - Array.  Each row has 3 values, representing
-    the vertices that define the volume
-    time - Vector of the times where there is stage information
-    stage - array with respect to time and vertices (x,y)
-    """
-
-    msg = 'Function read_sww in interpolat.py is obsolete'
-    raise Exception, msg
-
-    #FIXME Have this reader as part of data_manager?
-
-    from Scientific.IO.NetCDF import NetCDFFile
-    import tempfile
-    import sys
-    import os
-
-    #Check contents
-    #Get NetCDF
-
-    # see if the file is there.  Throw a QUIET IO error if it isn't
-    # I don't think I could implement the above
-
-    #throws prints to screen if file not present
-    junk = tempfile.mktemp(".txt")
-    fd = open(junk,'w')
-    stdout = sys.stdout
-    sys.stdout = fd
-    fid = NetCDFFile(file_name, netcdf_mode_r)
-    sys.stdout = stdout
-    fd.close()
-    #clean up
-    os.remove(junk)
-
-    # Get the variables
-    x = fid.variables['x'][:]
-    y = fid.variables['y'][:]
-    volumes = fid.variables['volumes'][:]
-    time = fid.variables['time'][:]
-
-    keys = fid.variables.keys()
-    keys.remove("x")
-    keys.remove("y")
-    keys.remove("volumes")
-    keys.remove("time")
-     #Turn NetCDF objects into numeric arrays
-    quantities = {}
-    for name in keys:
-        quantities[name] = fid.variables[name][:]
-
-    fid.close()
-    return x, y, volumes, time, quantities
-
-
-#-------------------------------------------------------------
-if __name__ == "__main__":
-    names = ["x","y"]
-    someiterable = [[1,2],[3,4]]
-    csvwriter = writer(file("some.csv", "wb"))
-    csvwriter.writerow(names)
-    for row in someiterable:
-        csvwriter.writerow(row)