Changeset 342 for inundation/ga/storm_surge/pyvolution/least_squares.py

Timestamp:

Sep 22, 2004, 6:04:29 PM (21 years ago)

Author:

duncan

Message:

added 1st iteration of loading a .tsh and .xya file and returning a .tsh with fitted attribute values

File:

• inundation/ga/storm_surge/pyvolution/least_squares.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -331 +331 @@
     
     import os, sys
-    from load_mesh.loadASCII import mesh_file_to_mesh_dictionary
-    usage = "usage: %s pmesh_file_name" %         os.path.basename(sys.argv[0])
-
-    if len(sys.argv) < 2:
+    from load_mesh.loadASCII import mesh_file_to_mesh_dictionary, \
+                 load_xya_file, export_trianglulation_file
+    usage = "usage: %s mesh_input.tsh point.xya  mesh_output.tsh" %         os.path.basename(sys.argv[0])
+
+    if len(sys.argv) < 4:
         print usage
     else:
-        mesh_file_name = sys.argv[1]
-
-        meshdic = mesh_file_to_mesh_dictionary(mesh_file_name)
-        vertex_coordinates = meshdic['generatedpointlist']
-        triangles = meshdic['generatedtrianglelist']
-        
-        d1 = [1.0, 1.0]
-        d2 = [1.0, 3.0]
-        d3 = [3.0,1.0]
-        z1 = 2
-        z2 = 4
-        z3 = 4
-        data_coords = [ d1, d2, d3]
-        z = [z1, z2, z3]
+        mesh_file = sys.argv[1]
+        point_file = sys.argv[2]
+        mesh_output_file = sys.argv[3]
+
+        # load in the .tsh file
+        mesh_dic = mesh_file_to_mesh_dictionary(mesh_file)
+        vertex_coordinates = mesh_dic['generatedpointlist']
+        triangles = mesh_dic['generatedtrianglelist']
+
+        # load in the .xya file
+        point_dict = load_xya_file(point_file)
+        point_coordinates = point_dict['pointlist']
+        point_attributes = point_dict['pointattributelist']
+        
         
         f = fit_to_mesh(vertex_coordinates,
                                       triangles,
-                                      data_coords,
-                                      z)
-        print f
-        
-
-
-
-
-
-
-
-
-
-
-
+                                      point_coordinates,
+                                      point_attributes)
+        # convert array to list of lists
+        mesh_dic['generatedpointattributelist'] = f.tolist()
+        export_trianglulation_file(mesh_output_file, mesh_dic)
+        #FIXME  do unit test
+        
+        
+
+
+
+
+
+
+
+
+
+
+