Changeset 467


Ignore:
Timestamp:
Oct 29, 2004, 3:07:35 PM (20 years ago)
Author:
ole
Message:
 
Location:
inundation/ga/storm_surge/pyvolution
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • inundation/ga/storm_surge/pyvolution/cg_solve.py

    r438 r467  
    33
    44
    5 def conjugate_gradient(A,b,x0,imax=2000,tol=1.0e-8,iprint=0):
     5def conjugate_gradient(A,b,x0,imax=10000,tol=1.0e-8,iprint=0):
    66   """
    77   Try to solve linear equation Ax = b using
  • inundation/ga/storm_surge/pyvolution/least_squares.py

    r463 r467  
    1818"""
    1919
     20
    2021#FIXME: Current implementation uses full matrices and a general solver.
    2122#Later on we may consider using sparse techniques
     
    5051        return a, b
    5152
    52 ALPHA_INITIAL = 0.001
    53 
    54 def fit_to_mesh_file(mesh_file, point_file, mesh_output_file, alpha= ALPHA_INITIAL):
     53
     54DEFAULT_ALPHA = 0.001
     55   
     56
     57def fit_to_mesh_file(mesh_file, point_file, mesh_output_file, alpha=DEFAULT_ALPHA):
    5558    """
    5659    Given a mesh file (tsh) and a point attribute file (xya), fit
     
    108111                point_coordinates,
    109112                point_attributes,
    110                 alpha = ALPHA_INITIAL):
     113                alpha = DEFAULT_ALPHA):
    111114    """
    112115    Fit a smooth surface to a trianglulation,
     
    144147                 triangles,
    145148                 point_coordinates = None,
    146                  alpha = ALPHA_INITIAL):
     149                 alpha = DEFAULT_ALPHA):
    147150
    148151       
     
    512515            alpha = sys.argv[4]
    513516        else:
    514             alpha = ALPHA_INITIAL
     517            alpha = DEFAULT_ALPHA
    515518        fit_to_mesh_file(mesh_file, point_file, mesh_output_file, alpha)
    516519       
Note: See TracChangeset for help on using the changeset viewer.