Changeset 1423

Timestamp:

May 18, 2005, 5:17:10 PM (20 years ago)

Author:

duncan

Message:

I've removed the function mesh_file_to_mesh_dictionary. Please use the function import_mesh_file instead.

Location:

inundation/ga/storm_surge/pyvolution

Files:

• combine_pts.py (modified) (2 diffs)
• least_squares.py (modified) (1 diff)
• pmesh2domain.py (modified) (1 diff)
• test_least_squares.py (modified) (8 diffs)

inundation/ga/storm_surge/pyvolution/combine_pts.py

@@ -125 +125 @@
                                      verbose = False):
     
-    from load_mesh.loadASCII import import_points_file, extent, point_atts2array, export_points_file, add_point_dictionaries,take_points, mesh_file_to_mesh_dictionary
+    from load_mesh.loadASCII import import_points_file, extent, point_atts2array, export_points_file, add_point_dictionaries,take_points, import_mesh_file
 
     
@@ -135 +135 @@
     
     # load  mesh file
-    mesh = mesh_file_to_mesh_dictionary(mesh_file)
+    mesh = import_mesh_file(mesh_file)
 
     # get extent of mesh

inundation/ga/storm_surge/pyvolution/least_squares.py

@@ -76 +76 @@
     """
 
-    from load_mesh.loadASCII import mesh_file_to_mesh_dictionary, \
+    from load_mesh.loadASCII import import_mesh_file, \
                  import_points_file, export_mesh_file, \
                  concatinate_attributelist
 
-    mesh_dict = mesh_file_to_mesh_dictionary(mesh_file)
+    mesh_dict = import_mesh_file(mesh_file)
     vertex_coordinates = mesh_dict['vertices']
     triangles = mesh_dict['triangles']

inundation/ga/storm_surge/pyvolution/pmesh2domain.py

@@ -66 +66 @@
     
     from Numeric import transpose
-    from load_mesh.loadASCII import mesh_file_to_mesh_dictionary
+    from load_mesh.loadASCII import import_mesh_file
     
-    mesh_dict = mesh_file_to_mesh_dictionary(fileName)
+    mesh_dict = import_mesh_file(fileName)
     #print "mesh_dict",mesh_dict
     vertex_coordinates = mesh_dict['vertices']

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -1055 +1055 @@
 
     def test_fit_to_mesh_file(self):
-        from load_mesh.loadASCII import mesh_file_to_mesh_dictionary, \
+        from load_mesh.loadASCII import import_mesh_file, \
              export_mesh_file
         import tempfile
@@ -1089 +1089 @@
                          alpha = 0.0)
         # load in the .tsh file we just wrote
-        mesh_dic = mesh_file_to_mesh_dictionary(mesh_output_file)
+        mesh_dic = import_mesh_file(mesh_output_file)
         #print "mesh_dic",mesh_dic
         ans =[[0.0, 0.0],
@@ -1106 +1106 @@
 
     def test_fit_to_mesh_file3(self):
-        from load_mesh.loadASCII import mesh_file_to_mesh_dictionary, \
+        from load_mesh.loadASCII import import_mesh_file, \
              export_mesh_file
         import tempfile
@@ -1142 +1142 @@
                          alpha = 0.0)
         # load in the .tsh file we just wrote
-        mesh_dic = mesh_file_to_mesh_dictionary(mesh_output_file)
+        mesh_dic = import_mesh_file(mesh_output_file)
         #print "mesh_dic",mesh_dic
         ans =[[0.0, 0.0],
@@ -1159 +1159 @@
 
     def test_fit_to_mesh_fileII(self):
-        from load_mesh.loadASCII import mesh_file_to_mesh_dictionary, \
+        from load_mesh.loadASCII import import_mesh_file, \
              export_mesh_file
         import tempfile
@@ -1193 +1193 @@
                          alpha = 0.0)
         # load in the .tsh file we just wrote
-        mesh_dic = mesh_file_to_mesh_dictionary(mesh_output_file)
+        mesh_dic = import_mesh_file(mesh_output_file)
 
         assert allclose(mesh_dic['vertex_attributes'],
@@ -1210 +1210 @@
 
     def test_fit_to_msh_netcdf_fileII(self):
-        from load_mesh.loadASCII import mesh_file_to_mesh_dictionary,export_mesh_file
+        from load_mesh.loadASCII import import_mesh_file,export_mesh_file
         import tempfile
         import os
@@ -1243 +1243 @@
                          alpha = 0.0)
         # load in the .tsh file we just wrote
-        mesh_dic = mesh_file_to_mesh_dictionary(mesh_output_file)
+        mesh_dic = import_mesh_file(mesh_output_file)
 
         assert allclose(mesh_dic['vertex_attributes'],