Changeset 8025

Timestamp:

Sep 23, 2010, 12:21:55 PM (14 years ago)

Author:

steve

Message:

Changed name of intersection of segment routine

Location:

trunk/anuga_core/source/anuga/utilities

Files:

• cg_solve.py (modified) (3 diffs)
• polygon_ext.c (modified) (1 diff)

trunk/anuga_core/source/anuga/utilities/cg_solve.py

@@ -8 +8 @@
 
 
-def conjugate_gradient(A,b,x0=None,imax=10000,tol=1.0e-8,iprint=None):
+def conjugate_gradient(A,b,x0=None,imax=10000,tol=1.0e-8,atol=1.0e-14,iprint=None):
     """
     Try to solve linear equation Ax = b using
@@ -27 +27 @@
         for i in range(b.shape[1]):
             x0[:,i] = _conjugate_gradient(A, b[:,i], x0[:,i],
-                                          imax, tol, iprint)
+                                          imax, tol, atol, iprint)
     else:
-        x0 = _conjugate_gradient(A, b, x0, imax, tol, iprint)
+        x0 = _conjugate_gradient(A, b, x0, imax, tol, atol, iprint)
 
     return x0
     
-def _conjugate_gradient(A,b,x0=None,imax=10000,tol=1.0e-8,iprint=None):
+def _conjugate_gradient(A, b, x0, 
+                        imax=10000, tol=1.0e-8, atol=1.0e-14, iprint=None):
    """
    Try to solve linear equation Ax = b using
@@ -73 +74 @@
 
    #FIXME Let the iterations stop if starting with a small residual
-   while (i<imax and rTr>tol**2*rTr0):
+   while (i<imax and rTr>tol**2*rTr0 and rTr>atol**2 ):
        q = A*d
        alpha = rTr/num.dot(d,q)

trunk/anuga_core/source/anuga/utilities/polygon_ext.c

@@ -102 +102 @@
 //  be unmodified.
 
-int __lineSegmentIntersection(
+int __line_segment_intersection(
         double Ax, double Ay,
         double Bx, double By,