Changeset 393

Timestamp:

Oct 12, 2004, 4:46:17 PM (20 years ago)

Author:

duncan

Message:

no longer overwriting old vert atts

Location:

inundation/ga/storm_surge/pyvolution

Files:

• least_squares.py (modified) (3 diffs)
• test_least_squares.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -58 +58 @@
     vertex_coordinates = mesh_dict['generatedpointlist']
     triangles = mesh_dict['generatedtrianglelist']
-        
+    
+    old_point_attributes = mesh_dict['generatedpointattributelist'] 
+    old_title_list = mesh_dict['generatedpointattributetitlelist']
+
+    
     # load in the .xya file
     point_dict = load_xya_file(point_file)
@@ -64 +68 @@
     point_attributes = point_dict['pointattributelist']
     title_string = point_dict['title']
-    title_list = title_string.split(',') #iffy! Hard coding title delimiter
-    #print "title_list", title_list    
+    title_list = title_string.split(',') #iffy! Hard coding title delimiter  
     for i in range(len(title_list)):
         title_list[i] = title_list[i].strip() 
@@ -74 +77 @@
                     point_attributes,
                     alpha = alpha)
+    
     # convert array to list of lists
-    mesh_dict['generatedpointattributelist'] = f.tolist()
-    mesh_dict['generatedpointattributetitlelist'] = title_list
+    new_point_attributes = f.tolist()
+
+    #FIXME have this overwrite attributes with the same title - DSG
+    #Put the newer attributes last
+    if old_title_list <> []:
+        old_title_list.extend(title_list)
+        #FIXME can this be done a faster way? - DSG
+        for i in range(len(old_point_attributes)):
+            old_point_attributes[i].extend(new_point_attributes[i])
+          
+    mesh_dict['generatedpointattributelist'] = old_point_attributes
+    mesh_dict['generatedpointattributetitlelist'] = old_title_list
+    
     export_trianglulation_file(mesh_output_file, mesh_dict)
         

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -567 +567 @@
         mesh_dic['generatedsegmentlist'] = [[0, 1], [2, 0], [1, 2]]
         mesh_dic['generatedtriangleattributelist'] = [['']]
-        mesh_dic['generatedpointattributelist'] = [[], [], []]
+        mesh_dic['generatedpointattributelist'] = [[1,2], [1,2], [1,2]]
+        mesh_dic['generatedpointattributetitlelist'] = ['density', 'temp']
         mesh_dic['generatedtriangleneighborlist'] = [[-1, -1, -1]]
         mesh_dic['generatedsegmentmarkerlist'] = ['external',
@@ -578 +579 @@
         point_file = tempfile.mktemp(".xya")
         fd = open(point_file,'w')
-        fd.write("bed_elevation, stage \n 1.0, 1.0,2.,4 \n 1.0, 3.0,4,8 \n 3.0,1.0,4.,8 \n")
+        fd.write("elevation, stage \n 1.0, 1.0,2.,4 \n 1.0, 3.0,4,8 \n 3.0,1.0,4.,8 \n")
         fd.close()
         
@@ -590 +591 @@
 
         assert allclose(mesh_dic['generatedpointattributelist'],
-                        [[0.0, 0.0], [5.0, 10.0], [5.0,10.0]])
+                        [[1.0, 2.0,0.0, 0.0],
+                         [1.0, 2.0,5.0, 10.0],
+                         [1.0, 2.0,5.0,10.0]])
         
         self.failUnless(mesh_dic['generatedpointattributetitlelist']  ==
-                        ['bed_elevation','stage'],
+                        ['density', 'temp','elevation','stage'],
                         'test_fit_to_mesh_file failed')