Changeset 2516

Timestamp:

Mar 9, 2006, 5:05:54 PM (19 years ago)

Author:

ole

Message:

Lots of clean up of obsolete stuff

Location:

inundation

Files:

• pyvolution/data_manager.py (modified) (2 diffs)
• pyvolution/domain.py (modified) (1 diff)
• pyvolution/least_squares.py (modified) (8 diffs)
• pyvolution/quantity.py (modified) (2 diffs)
• pyvolution/shallow_water.py (modified) (3 diffs)
• pyvolution/test_all.py (modified) (1 diff)
• pyvolution/test_shallow_water.py (modified) (3 diffs)
• pyvolution/util.py (modified) (3 diffs)
• utilities/numerical_tools.py (modified) (1 diff)
• utilities/test_numerical_tools.py (modified) (1 diff)

inundation/pyvolution/data_manager.py

@@ -55 +55 @@
 
 from coordinate_transforms.geo_reference import Geo_reference
+
 
 def make_filename(s):
@@ -2549 +2550 @@
     from Numeric import array
     from config import time_format
-    from util import ensure_numeric
+    from utilities.numerical_tools import ensure_numeric    
+
 
 

inundation/pyvolution/domain.py

@@ -9 +9 @@
 
 from mesh import Mesh
-from generic_boundary_conditions import *
+from generic_boundary_conditions import Boundary
+from generic_boundary_conditions import File_boundary
+from generic_boundary_conditions import Dirichlet_boundary
+from generic_boundary_conditions import Time_boundary
+from generic_boundary_conditions import Transmissive_boundary
+
 import types
 

inundation/pyvolution/least_squares.py

@@ -28 +28 @@
 from utilities.sparse import Sparse, Sparse_CSR
 from utilities.cg_solve import conjugate_gradient, VectorShapeError
+from utilities.numerical_tools import ensure_numeric, mean, gradient
+
 
 from coordinate_transforms.geo_reference import Geo_reference
@@ -34 +36 @@
 
 
-from utilities.numerical_tools import gradient
+
 
 DEFAULT_ALPHA = 0.001
@@ -321 +323 @@
 
         """
-        from pyvolution.util import ensure_numeric
 
         #Convert input to Numeric arrays
@@ -441 +442 @@
 
         from pyvolution.quad import build_quadtree
-        from utilities.numerical_tools import ensure_numeric
         from utilities.polygon import inside_polygon
         
@@ -678 +678 @@
         """
 
-        from util import ensure_numeric
 
         #Convert input to Numeric arrays
@@ -849 +848 @@
 
         #Convert input to Numeric arrays
-        from pyvolution.util import ensure_numeric
         z = ensure_numeric(z, Float)
 
@@ -894 +892 @@
 
             #Convert input to Numeric arrays
-            from util import ensure_numeric
             z = ensure_numeric(z, Float)
 
@@ -989 +986 @@
 
 
-        from util import mean, ensure_numeric
         from config import time_format
         import types

inundation/pyvolution/quantity.py

@@ -285 +285 @@
         msg = 'Indices must be a list or None'
         assert type(indices) in [ListType, NoneType, ArrayType], msg
+
+
+        if not(points is None and values is None and data_georef is None):
+            from warnings import warn
+            
+            msg = 'Using points, values or data_georef with set_quantity '
+            msg += 'is obsolete. Please use a Geospatial_data object instead.'
+            warn(msg, DeprecationWarning)
 
 
@@ -610 +618 @@
 
         from Numeric import Float
-        from util import ensure_numeric
+        from utilities.numerical_tools import ensure_numeric
         from least_squares import fit_to_mesh
         from coordinate_transforms.geo_reference import Geo_reference

inundation/pyvolution/shallow_water.py

@@ -55 +55 @@
 
 
-from domain import *
-from region import *#
-
-Generic_Domain = Domain #Rename
+from domain import Domain as Generic_Domain
+from generic_boundary_conditions import Boundary
+from generic_boundary_conditions import File_boundary
+from generic_boundary_conditions import Dirichlet_boundary
+from generic_boundary_conditions import Time_boundary
+from generic_boundary_conditions import Transmissive_boundary
+
+from utilities.numerical_tools import gradient, mean
+
+
 
 #Shallow water domain
@@ -94 +100 @@
 
         #Reduction operation for get_vertex_values
-        from util import mean
         self.reduction = mean
         #self.reduction = min  #Looks better near steep slopes
@@ -1095 +1100 @@
     """
 
-    from util import gradient
     from Numeric import zeros, Float, array, sum
 

inundation/pyvolution/test_all.py

@@ -81 +81 @@
 
     #Attempt to compile all extensions
-    execfile('..' + sep + 'utilities' + sep + 'compile.py')
+    #execfile('..' + sep + 'utilities' + sep + 'compile.py')
 
     #FIXME: Temporary measure
-    os.chdir('..' + sep + 'utilities')
-    execfile('compile.py')
-    os.chdir('..' + sep + 'pyvolution')    
+    #os.chdir('..' + sep + 'utilities')
+    #execfile('compile.py')
+    #os.chdir('..' + sep + 'pyvolution')    
     
     #FIXME: Temporary measure
-    os.chdir('..' + sep + 'triangle')
-    execfile('compile.py')
-    os.chdir('..' + sep + 'pyvolution')   
+    #os.chdir('..' + sep + 'triangle')
+    #execfile('compile.py')
+    #os.chdir('..' + sep + 'pyvolution')   
     
     #os.system('python compile.py') 

inundation/pyvolution/test_shallow_water.py

@@ -6 +6 @@
 from config import g, epsilon
 from Numeric import allclose, array, zeros, ones, Float, take
+from utilities.numerical_tools import mean
+
 from shallow_water import *
 
@@ -2943 +2945 @@
         domain1 = Domain(points, vertices, boundary)
 
-        from util import mean
         domain1.reduction = mean
         domain1.smooth = False  #Exact result
@@ -3062 +3063 @@
         domain1 = Domain(points, vertices, boundary)
 
-        from util import mean
         domain1.reduction = mean
         domain1.smooth = True #To mimic MOST output

inundation/pyvolution/util.py

@@ -6 +6 @@
 
 
-#FIXME: Deprecate this shortcut
-from utilities.numerical_tools import ensure_numeric
-
 import utilities.polygon
 from warnings import warn
 
-def point_on_line(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    msg = 'point_on_line has moved from util.py.  '
-    msg += 'Please use "from utilities.polygon import point_on_line"'
-    warn(msg, DeprecationWarning) 
-
-    return utilities.polygon.point_on_line(*args, **kwargs)     
-    
-def inside_polygon(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    print 'inside_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import inside_polygon"'
-
-    return utilities.polygon.inside_polygon(*args, **kwargs)    
-    
-def outside_polygon(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    print 'outside_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import outside_polygon"'
-
-    return utilities.polygon.outside_polygon(*args, **kwargs)    
-
-
-def separate_points_by_polygon(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    print 'separate_points_by_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import separate_points_by_polygon"'
-
-    return utilities.polygon.separate_points_by_polygon(*args, **kwargs)    
-
-
-from utilities.polygon import Polygon_function #No warning
-from utilities.numerical_tools import gradient, gradient2, gradient_python #No warning
-
-
-
-def read_polygon(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    print 'read_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import read_polygon"'
-
-    return utilities.polygon.read_polygon(*args, **kwargs)    
-
-
-def populate_polygon(*args, **kwargs):
-    """Temporary Interface to new location"""
-
-    print 'populate_polygon has moved from util.py.  ',
-    print 'Please use "from utilities.polygon import populate_polygon"'
-
-    return utilities.polygon.populate_polygon(*args, **kwargs)    
-
-def read_xya(filename):
-    """Read simple xya file, possibly with a header in the first line, just
-    x y [attributes]
-    separated by whitespace
-
-    Format can be either ASCII or NetCDF
-
-    Return list of points, list of attributes and
-    attribute names if present otherwise None
-    """
-    print "read_xya is obsolete.  Use import_points_file from load_mesh.loadASCII"
-    #FIXME: Probably obsoleted by similar function in load_ASCII
-    #FIXME: Name read_data_points (or see 'load' in pylab)
-
-    
-    from load_mesh.loadASCII import import_points_file
-
-    points_dict = import_points_file(filename)
-    return points_dict['pointlist'], points_dict['attributelist']
-
-   
-
-
-#Normal util stuff
 
 def angle(v):
@@ -324 +240 @@
     from Scientific.IO.NetCDF import NetCDFFile
     from Numeric import array, zeros, Float, alltrue, concatenate, reshape
-    from util import ensure_numeric    
+    from utilities.numerical_tools import ensure_numeric    
 
     #Open NetCDF file
@@ -545 +461 @@
 
 
-
-
-
-
-
-
-
+####################################
+####OBSOLETE STUFF
+
+
+def point_on_line(*args, **kwargs):
+    """Temporary Interface to new location"""
+
+    msg = 'point_on_line has moved from util.py.  '
+    msg += 'Please use "from utilities.polygon import point_on_line"'
+    warn(msg, DeprecationWarning) 
+
+    return utilities.polygon.point_on_line(*args, **kwargs)     
+    
+def inside_polygon(*args, **kwargs):
+    """Temporary Interface to new location"""
+
+    print 'inside_polygon has moved from util.py.  ',
+    print 'Please use "from utilities.polygon import inside_polygon"'
+
+    return utilities.polygon.inside_polygon(*args, **kwargs)    
+    
+def outside_polygon(*args, **kwargs):
+    """Temporary Interface to new location"""
+
+    print 'outside_polygon has moved from util.py.  ',
+    print 'Please use "from utilities.polygon import outside_polygon"'
+
+    return utilities.polygon.outside_polygon(*args, **kwargs)    
+
+
+def separate_points_by_polygon(*args, **kwargs):
+    """Temporary Interface to new location"""
+
+    print 'separate_points_by_polygon has moved from util.py.  ',
+    print 'Please use "from utilities.polygon import separate_points_by_polygon"'
+
+    return utilities.polygon.separate_points_by_polygon(*args, **kwargs)    
+
+
+
+def read_polygon(*args, **kwargs):
+    """Temporary Interface to new location"""
+
+    print 'read_polygon has moved from util.py.  ',
+    print 'Please use "from utilities.polygon import read_polygon"'
+
+    return utilities.polygon.read_polygon(*args, **kwargs)    
+
+
+def populate_polygon(*args, **kwargs):
+    """Temporary Interface to new location"""
+
+    print 'populate_polygon has moved from util.py.  ',
+    print 'Please use "from utilities.polygon import populate_polygon"'
+
+    return utilities.polygon.populate_polygon(*args, **kwargs)    
+
+def read_xya(filename):
+    """Read simple xya file, possibly with a header in the first line, just
+    x y [attributes]
+    separated by whitespace
+
+    Format can be either ASCII or NetCDF
+
+    Return list of points, list of attributes and
+    attribute names if present otherwise None
+    """
+    print "read_xya is obsolete.  Use import_points_file from load_mesh.loadASCII"
+    #FIXME: Probably obsoleted by similar function in load_ASCII
+    #FIXME: Name read_data_points (or see 'load' in pylab)
+
+    
+    from load_mesh.loadASCII import import_points_file
+
+    points_dict = import_points_file(filename)
+    return points_dict['pointlist'], points_dict['attributelist']
+
+   
+
+

inundation/utilities/numerical_tools.py

@@ -167 +167 @@
 from utilities import compile
 if compile.can_use_C_extension('util_ext.c'):
-    from util_ext import gradient, gradient2#, point_on_line
+    from util_ext import gradient, gradient2
 else:
     gradient = gradient_python

inundation/utilities/test_numerical_tools.py

@@ -181 +181 @@
         for i in range(4):
             #Gradient of fitted pwl surface
-            from util import gradient_python
-            a_ref, b_ref = gradient(x0, y0, x1, y1, x2, y2,
-                                    q0[i], q1[i], q2[i])
+            a_ref, b_ref = gradient_python(x0, y0, x1, y1, x2, y2,
+                                           q0[i], q1[i], q2[i])
 
             #print a_ref, b_ref