Changeset 374 for inundation

Timestamp:

Oct 7, 2004, 2:50:59 PM (20 years ago)

Author:

duncan

Message:

minor changes - vert att titles

Location:

inundation/ga/storm_surge/pyvolution

Files:

• interpolate_sww.py (modified) (1 diff)
• least_squares.py (modified) (3 diffs)
• pmesh2domain.py (modified) (1 diff)
• test_interpolate_sww.py (modified) (1 diff)
• test_least_squares.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/interpolate_sww.py

@@ -152 +152 @@
             for i in range(len(self.time)):
                 if i == 0:
-                    title = "x,y," + str(self.time[0])
+                    title = str(self.time[0])
                 else:
                     title = title + delimiter + str(self.time[i])

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -55 +55 @@
                  load_xya_file, export_trianglulation_file
     # load in the .tsh file
-    mesh_dic = mesh_file_to_mesh_dictionary(mesh_file)
-    vertex_coordinates = mesh_dic['generatedpointlist']
-    triangles = mesh_dic['generatedtrianglelist']
+    mesh_dict = mesh_file_to_mesh_dictionary(mesh_file)
+    vertex_coordinates = mesh_dict['generatedpointlist']
+    triangles = mesh_dict['generatedtrianglelist']
         
     # load in the .xya file
@@ -64 +64 @@
     point_attributes = point_dict['pointattributelist']
     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    
+    for i in range(len(title_list)):
+        title_list[i] = title_list[i].strip() 
+    #print "title_list stripped", title_list    
     f = fit_to_mesh(vertex_coordinates,
                     triangles,
@@ -72 +76 @@
                     alpha = alpha)
     # convert array to list of lists
-    mesh_dic['generatedpointattributelist'] = f.tolist()
-    export_trianglulation_file(mesh_output_file, mesh_dic)
+    mesh_dict['generatedpointattributelist'] = f.tolist()
+    mesh_dict['generatedpointattributetitlelist'] = title_list
+    export_trianglulation_file(mesh_output_file, mesh_dict)
         
 

inundation/ga/storm_surge/pyvolution/pmesh2domain.py

@@ -1 @@
-"""Class mesh2domain - 2D triangular domains for finite-volume computations of
-   the shallow water wave equation
+"""Class pmesh2domain - Converting .tsh files to doamains
 
 

inundation/ga/storm_surge/pyvolution/test_interpolate_sww.py

@@ -198 +198 @@
         time_list = []
 
-        answer = string_list.pop(0)
-        self.failUnless( answer == 'x', 'Title is wrong!')
-        self.failUnless( string_list.pop(0) == 'y', 'Title is wrong!')
+        # this is if titles start with x,y
+        #answer = string_list.pop(0)
+        #self.failUnless( answer == 'x', 'Title is wrong!')
+        #self.failUnless( string_list.pop(0) == 'y', 'Title is wrong!')
         
         for time in string_list:

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -578 +578 @@
         point_file = tempfile.mktemp(".xya")
         fd = open(point_file,'w')
-        fd.write("# demo \n 1.0, 1.0,2.,4 \n 1.0, 3.0,4,8 \n 3.0,1.0,4.,8 \n")
+        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.close()
         
@@ -592 +592 @@
                         [[0.0, 0.0], [5.0, 10.0], [5.0,10.0]])
         
+        self.failUnless(mesh_dic['generatedpointattributetitlelist']  ==
+                        ['bed_elevation','stage'],
+                        'test_fit_to_mesh_file failed')
+        
         #clean up
         os.remove(mesh_file)