Changeset 333 for inundation/ga/storm_surge/pyvolution

Timestamp:

Sep 21, 2004, 5:12:15 PM (20 years ago)

Author:

duncan

Message:

testing fit_to_mesh

Location:

inundation/ga/storm_surge/pyvolution

Files:

• least_squares.py (modified) (1 diff)
• load_mesh/loadASCII.py (modified) (1 diff)
• test_least_squares.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -12 +12 @@
 from LinearAlgebra import solve_linear_equations
 
-def smooth_attributes_to_mesh(vertex_coordinates,
+def fit_to_mesh(vertex_coordinates,
                               triangles,
                               point_coordinates,
-                              point_attributes):
+                              point_attributes,
+                              alpha = 0.0):
     """
     """
     interp = Interpolation(vertex_coordinates,
-                              triangles,
-                              point_coordinates)
-    vertex_attributes = interp.smooth_attributes_to_mesh(point_attributes)
+                           triangles,
+                           point_coordinates,
+                           alpha = alpha)
+    
+    vertex_attributes = interp.fit(point_attributes)
     return vertex_attributes
 

inundation/ga/storm_surge/pyvolution/load_mesh/loadASCII.py

@@ -258 +258 @@
     return meshDict
 
+###
+#  LOADING XYA FILES
+###
+  
+            
+def load_xya_file(ofile,delimiter):
+    """
+    load a file, ofile, with the format
+    x,y, [attributes]
+    """
+    try:
+        fd = open(ofile)
+        xya_dic = read_xya_file(fd, delimiter)
+        fd.close()
+    except IOError, e:        
+        msg = 'Could not open file %s ' %fileName
+        raise IOError, msg 
+    return xya_dic
+
+def read_xya_file(fd, delimiter):
+    lines = fd.readlines()
+    points = []
+    pointattributes = []
+    if len(lines) <= 1:
+        raise SyntaxError
+    lines.pop(0) #remove the first (title) line
+    attLength = len(clean_line(lines[0],delimiter))-2
+    
+    #print "initlegth"
+    #print attLength
+    for line in lines:
+        #print "line >%s" %line
+        numbers = clean_line(line,delimiter)
+        #print "numbers >%s<" %numbers
+        if len(numbers) < 2 and numbers != []:
+            raise SyntaxError
+        if numbers != []:
+            try:
+                x = float(numbers[0])
+                y = float(numbers[1])
+                points.append([x,y])
+                numbers.pop(0)
+                numbers.pop(0)
+                attributes = []
+                if attLength != len(numbers):
+                    raise SyntaxError
+                    
+                attLength = len(numbers)
+
+                for num in numbers:
+                    num.strip()
+                    if num != '\n' and num != '':
+                        attributes.append(float(num))
+            except ValueError:
+                raise SyntaxError
+            pointattributes.append(attributes)
+    xya_dict = {}
+    xya_dict['pointlist'] = points
+    xya_dict['pointattributelist'] = pointattributes
+    xya_dict['segmentlist'] = []
+    xya_dict['segmentmarkerlist'] = []
+    xya_dict['regionlist'] = []
+    xya_dict['regionattributelist'] = []
+    xya_dict['regionmaxarealist'] = []
+    xya_dict['holelist'] = []
+    
+    return xya_dict
+
+def clean_line(line,delimiter):      
+    """Remove whitespace
+    """
+    #print ">%s" %line
+    line = line.strip()
+    #print "stripped>%s" %line
+    numbers = line.split(delimiter)
+    i = len(numbers) - 1
+    while i >= 0:
+        if numbers[i] == '':
+            numbers.pop(i)
+        i += -1
+    #for num in numbers:
+    #    print "num>%s<" %num
+    return numbers
+
 if __name__ == "__main__":
     m = import_mesh("tee.txt")

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -314 +314 @@
         z3 = [4,8]
         data_coords = [ d1, d2, d3]
-        
-        interp = Interpolation(points, triangles, data_coords, alpha=0.0)
         z = [z1, z2, z3]
-        f = interp.fit(z)
+        
+        f = fit_to_mesh(points, triangles, data_coords, z, alpha=0.0)
         answer = [[0, 0], [5., 10.], [5., 10.]]