Changeset 2526

Timestamp:

Mar 12, 2006, 9:25:40 PM (18 years ago)

Author:

ole

Message:

Moved more general numerical functionality into utilities/numerical_tools.py

Location:

inundation

Files:

• pyvolution/data_manager.py (modified) (1 diff)
• pyvolution/least_squares.py (modified) (1 diff)
• pyvolution/mesh.py (modified) (1 diff)
• pyvolution/quantity.py (modified) (1 diff)
• pyvolution/test_data_manager.py (modified) (1 diff)
• pyvolution/test_least_squares.py (modified) (1 diff)
• pyvolution/test_quantity.py (modified) (2 diffs)
• pyvolution/test_shallow_water.py (modified) (1 diff)
• pyvolution/test_util.py (modified) (3 diffs)
• pyvolution/util.py (modified) (2 diffs)
• test_all.py (modified) (1 diff)
• triangle/triang.c (modified) (1 diff)
• utilities/numerical_tools.py (modified) (1 diff)
• utilities/test_numerical_tools.py (modified) (1 diff)

inundation/pyvolution/data_manager.py

@@ -3086 +3086 @@
     from data_manager import get_dataobject
     from os import sep, path
-    from util import mean
+    from utilities.numerical_tools import mean
 
     if verbose == True:print 'Creating domain from', filename

inundation/pyvolution/least_squares.py

@@ -1134 +1134 @@
         from math import pi, cos, sin, sqrt
         from Numeric import zeros, Float
-        from util import mean        
+        from utilities.numerical_tools import mean        
 
         if self.spatial is True:

inundation/pyvolution/mesh.py

@@ -495 +495 @@
         from config import epsilon
         from math import pi
-        from util import anglediff
+        from utilities.numerical_tools import anglediff
 
         N = self.number_of_elements

inundation/pyvolution/quantity.py

@@ -1189 +1189 @@
 
     from Numeric import zeros, Float
-    from util import gradient
+    from utilitites.numerical_tools import gradient
 
     centroid_coordinates = quantity.domain.centroid_coordinates

inundation/pyvolution/test_data_manager.py

@@ -5 +5 @@
 import copy
 from Numeric import zeros, array, allclose, Float
-from util import mean
+from utilities.numerical_tools import mean
 import tempfile
 import os

inundation/pyvolution/test_least_squares.py

@@ -1085 +1085 @@
         #Check basic interpolation of one quantity using averaging
         #(no interpolation points or spatial info)
-        from util import mean        
+        from utilities.numerical_tools import mean        
         I = Interpolation_function(time, [mean(Q[0,:]),
                                           mean(Q[1,:]),

inundation/pyvolution/test_quantity.py

@@ -1065 +1065 @@
         from shallow_water import Domain, Transmissive_boundary
         from Numeric import zeros, Float
-        from util import mean
+        from utilities.numerical_tools import mean
 
         #Create basic mesh
@@ -1155 +1155 @@
         from shallow_water import Domain, Transmissive_boundary
         from Numeric import zeros, Float
-        from util import mean
+        from utilities.numerical_tools import mean
 
 

inundation/pyvolution/test_shallow_water.py

@@ -1685 +1685 @@
         domain = Domain(points, vertices, boundary)
         domain.smooth = False
-        domain.default_order=2
+        domain.default_order = 2
         domain.beta_h = 0.2
+        domain.set_quantities_to_be_stored(['stage'])
 
         #IC

inundation/pyvolution/test_util.py

@@ -38 +38 @@
     #                    'distance is wrong!')
 
-    def test_angle(self):
-        from util import angle
-
-        assert allclose(angle([1.0, 1.0])/pi*180, 45.0)
-
-
-    def test_anglediff(self):
-        from util import anglediff
-
-        assert allclose(anglediff([0.0, 1.], [1.0, 1.0])/pi*180, 45.0)
-
-
 
     def test_file_function_time1(self):
@@ -131 +119 @@
         domain1 = Domain(points, vertices, boundary)
 
-        from util import mean
+        from utilities.numerical_tools import mean
         domain1.reduction = mean
         domain1.smooth = True #NOTE: Mimic sww output where each vertex has
@@ -331 +319 @@
         
 
-        from util import mean
+        from utilities.numerical_tools import mean      
         domain1.reduction = mean
         domain1.smooth = True #NOTE: Mimic sww output where each vertex has

inundation/pyvolution/util.py

@@ -8 +8 @@
 import utilities.polygon
 from warnings import warn
-
-
-def angle(v):
-    """Compute angle between e1 (the unit vector in the x-direction)
-    and the specified vector
-    """
-
-    from math import acos, pi, sqrt
-    from Numeric import sum, array
-
-    l = sqrt( sum (array(v)**2))
-    v1 = v[0]/l
-    v2 = v[1]/l
-
-
-    theta = acos(v1)
-    
-    #try:
-    #   theta = acos(v1)
-    #except ValueError, e:
-    #    print 'WARNING (util.py): Angle acos(%s) failed: %s' %(str(v1), e)
-    #
-    #    #FIXME, hack to avoid acos(1.0) Value error
-    #    # why is it happening?
-    #    # is it catching something we should avoid?
-    #    #FIXME (Ole): When did this happen? We need a unit test to
-    #    #reveal this condition or otherwise remove the hack
-    #    
-    #    s = 1e-6
-    #    if (v1+s >  1.0) and (v1-s < 1.0) :
-    #        theta = 0.0
-    #    elif (v1+s >  -1.0) and (v1-s < -1.0):
-    #        theta = 3.1415926535897931
-    #    print 'WARNING (util.py): angle v1 is %f, setting acos to %f '\
-    #          %(v1, theta)
-
-    if v2 < 0:
-        #Quadrant 3 or 4
-        theta = 2*pi-theta
-
-    return theta
-
-
-def anglediff(v0, v1):
-    """Compute difference between angle of vector x0, y0 and x1, y1.
-    This is used for determining the ordering of vertices,
-    e.g. for checking if they are counter clockwise.
-
-    Always return a positive value
-    """
-
-    from math import pi
-
-    a0 = angle(v0)
-    a1 = angle(v1)
-
-    #Ensure that difference will be positive
-    if a0 < a1:
-        a0 += 2*pi
-
-    return a0-a1
-
-
-def mean(x):
-    from Numeric import sum
-    return sum(x)/len(x)
-
 
 
@@ -465 +398 @@
 
 
+def angle(v):
+    """Temporary Interface to new location"""
+
+    import utilities.numerical_tools as NT      
+    
+    msg = 'angle has moved from util.py.  '
+    msg += 'Please use "from utilities.numerical_tools import angle"'
+    warn(msg, DeprecationWarning) 
+
+    return NT.angle(v)
+    
+def anglediff(v0, v1):
+    """Temporary Interface to new location"""
+
+    import utilities.numerical_tools as NT
+    
+    msg = 'anglediff has moved from util.py.  '
+    msg += 'Please use "from utilities.numerical_tools import anglediff"'
+    warn(msg, DeprecationWarning) 
+
+    return NT.anglediff(v0, v1)    
+
+    
+def mean(x):
+    """Temporary Interface to new location"""
+
+    import utilities.numerical_tools as NT    
+    
+    msg = 'mean has moved from util.py.  '
+    msg += 'Please use "from utilities.numerical_tools import mean"'
+    warn(msg, DeprecationWarning) 
+
+    return NT.mean(x)    
+
 def point_on_line(*args, **kwargs):
     """Temporary Interface to new location"""

inundation/test_all.py

@@ -23 +23 @@
 exclude_dirs = ['pypar_dist', #Special requirements
                 'props', 'wcprops', 'prop-base', 'text-base', '.svn', #Svn
-                'tmp']#,
-                #'pmesh']         #Name conflict on my home machine (Ole)       
+                'tmp', 
+                'pmesh']         #Name conflict on my home machine (Ole)       
 
 

inundation/triangle/triang.c

@@ -53 +53 @@
 
 #include "Python.h" 
+
 
 

inundation/utilities/numerical_tools.py

@@ -5 +5 @@
 
 import Numeric
+
+
+
+def angle(v):
+    """Compute angle between e1 (the unit vector in the x-direction)
+    and the specified vector
+    """
+
+    from math import acos, pi, sqrt
+    from Numeric import sum, array
+
+    l = sqrt( sum (array(v)**2))
+    v1 = v[0]/l
+    v2 = v[1]/l
+
+
+    theta = acos(v1)
+    
+    #try:
+    #   theta = acos(v1)
+    #except ValueError, e:
+    #    print 'WARNING (util.py): Angle acos(%s) failed: %s' %(str(v1), e)
+    #
+    #    #FIXME, hack to avoid acos(1.0) Value error
+    #    # why is it happening?
+    #    # is it catching something we should avoid?
+    #    #FIXME (Ole): When did this happen? We need a unit test to
+    #    #reveal this condition or otherwise remove the hack
+    #    
+    #    s = 1e-6
+    #    if (v1+s >  1.0) and (v1-s < 1.0) :
+    #        theta = 0.0
+    #    elif (v1+s >  -1.0) and (v1-s < -1.0):
+    #        theta = 3.1415926535897931
+    #    print 'WARNING (util.py): angle v1 is %f, setting acos to %f '\
+    #          %(v1, theta)
+
+    if v2 < 0:
+        #Quadrant 3 or 4
+        theta = 2*pi-theta
+
+    return theta
+
+
+def anglediff(v0, v1):
+    """Compute difference between angle of vector x0, y0 and x1, y1.
+    This is used for determining the ordering of vertices,
+    e.g. for checking if they are counter clockwise.
+
+    Always return a positive value
+    """
+
+    from math import pi
+
+    a0 = angle(v0)
+    a1 = angle(v1)
+
+    #Ensure that difference will be positive
+    if a0 < a1:
+        a0 += 2*pi
+
+    return a0-a1
+
 
 def mean(x):

inundation/utilities/test_numerical_tools.py

@@ -18 +18 @@
     def tearDown(self):
         pass
+
+
+    def test_angle(self):
+        assert allclose(angle([1.0, 1.0])/pi*180, 45.0)
+
+
+    def test_anglediff(self):
+        assert allclose(anglediff([0.0, 1.], [1.0, 1.0])/pi*180, 45.0)