Changeset 467

Timestamp:

Oct 29, 2004, 3:07:35 PM (20 years ago)

Author:

ole

Message:

 

Location:

inundation/ga/storm_surge/pyvolution

Files:

• cg_solve.py (modified) (1 diff)
• least_squares.py (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/cg_solve.py

@@ -3 +3 @@
 
 
-def conjugate_gradient(A,b,x0,imax=2000,tol=1.0e-8,iprint=0):
+def conjugate_gradient(A,b,x0,imax=10000,tol=1.0e-8,iprint=0):
    """
    Try to solve linear equation Ax = b using

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -18 +18 @@
 """
 
+
 #FIXME: Current implementation uses full matrices and a general solver.
 #Later on we may consider using sparse techniques
@@ -50 +51 @@
         return a, b
 
-ALPHA_INITIAL = 0.001
-
-def fit_to_mesh_file(mesh_file, point_file, mesh_output_file, alpha= ALPHA_INITIAL):
+
+DEFAULT_ALPHA = 0.001
+    
+
+def fit_to_mesh_file(mesh_file, point_file, mesh_output_file, alpha=DEFAULT_ALPHA):
     """
     Given a mesh file (tsh) and a point attribute file (xya), fit
@@ -108 +111 @@
                 point_coordinates,
                 point_attributes,
-                alpha = ALPHA_INITIAL):
+                alpha = DEFAULT_ALPHA):
     """
     Fit a smooth surface to a trianglulation,
@@ -144 +147 @@
                  triangles,
                  point_coordinates = None,
-                 alpha = ALPHA_INITIAL):
+                 alpha = DEFAULT_ALPHA):
 
         
@@ -512 +515 @@
             alpha = sys.argv[4]
         else:
-            alpha = ALPHA_INITIAL
+            alpha = DEFAULT_ALPHA
         fit_to_mesh_file(mesh_file, point_file, mesh_output_file, alpha)