Changeset 5946

Timestamp:

Nov 12, 2008, 11:52:17 AM (16 years ago)

Author:

rwilson

Message:

More NumPy? changes.

File:

• anuga_core/source_numpy_conversion/anuga/load_mesh/loadASCII.py (modified) (14 diffs)

anuga_core/source_numpy_conversion/anuga/load_mesh/loadASCII.py

@@ -60 +60 @@
 from os.path import splitext
 
+from anuga.config import Float, Character, Int
 from anuga.coordinate_transforms.geo_reference import Geo_reference,TITLE, TitleError
 
@@ -699 +700 @@
     if (mesh['vertices'].shape[0] > 0):
         outfile.createDimension('num_of_vertices', mesh['vertices'].shape[0])
-        outfile.createVariable('vertices', numpy.float, ('num_of_vertices',
+        outfile.createVariable('vertices', Float, ('num_of_vertices',
                                                    'num_of_dimensions'))
         outfile.variables['vertices'][:] = mesh['vertices']
@@ -709 +710 @@
                                     mesh['vertex_attribute_titles'].shape[1])
             outfile.createVariable('vertex_attributes',
-                                   numpy.float,
+                                   Float,
                                    ('num_of_vertices',
-                                    'num_of_vertex_attributes'))   
+                                    'num_of_vertex_attributes'))
             outfile.createVariable('vertex_attribute_titles',
-                                   numpy.character,
+                                   Character,
                                    ( 'num_of_vertex_attributes',
                                      'num_of_vertex_attribute_title_chars' ))
@@ -725 +726 @@
                                 mesh['segments'].shape[0])
         outfile.createVariable('segments',
-                               IntType,
+                               Int,
                                ('num_of_segments', 'num_of_segment_ends'))
         outfile.variables['segments'][:] = mesh['segments']
@@ -732 +733 @@
                                     mesh['segment_tags'].shape[1])
             outfile.createVariable('segment_tags',
-                                   numpy.character,
+                                   Character,
                                    ('num_of_segments',
                                     'num_of_segment_tag_chars'))
@@ -741 +742 @@
                                 mesh['triangles'].shape[0])
         outfile.createVariable('triangles',
-                               IntType,
+                               Int,
                                ('num_of_triangles',
                                 'num_of_triangle_vertices'))
         outfile.createVariable('triangle_neighbors',
-                               IntType,
+                               Int,
                                ('num_of_triangles',
                                 'num_of_triangle_faces'))
@@ -755 +756 @@
                                     mesh['triangle_tags'].shape[1]) 
             outfile.createVariable('triangle_tags',
-                                   numpy.character,
+                                   Character,
                                    ('num_of_triangles',
                                     'num_of_triangle_tag_chars'))
@@ -765 +766 @@
     if (mesh['points'].shape[0] > 0):
         outfile.createDimension('num_of_points', mesh['points'].shape[0])
-        outfile.createVariable('points', numpy.float, ('num_of_points',
+        outfile.createVariable('points', Float, ('num_of_points',
                                                  'num_of_dimensions'))
         outfile.variables['points'][:] = mesh['points'] 
@@ -772 +773 @@
                                     mesh['point_attributes'].shape[1])
             outfile.createVariable('point_attributes',
-                                   numpy.float,
+                                   Float,
                                    ('num_of_points',
                                     'num_of_point_attributes'))
@@ -781 +782 @@
                                 mesh['outline_segments'].shape[0])
         outfile.createVariable('outline_segments',
-                               IntType,
+                               Int,
                                ('num_of_outline_segments',
                                 'num_of_segment_ends'))
@@ -789 +790 @@
                                     mesh['outline_segment_tags'].shape[1])
             outfile.createVariable('outline_segment_tags',
-                                   numpy.character,
+                                   Character,
                                    ('num_of_outline_segments',
                                     'num_of_outline_segment_tag_chars'))
@@ -796 +797 @@
     if (mesh['holes'].shape[0] > 0):
         outfile.createDimension('num_of_holes', mesh['holes'].shape[0])
-        outfile.createVariable('holes', numpy.float, ('num_of_holes',
+        outfile.createVariable('holes', Float, ('num_of_holes',
                                                 'num_of_dimensions'))
         outfile.variables['holes'][:] = mesh['holes']
@@ -802 +803 @@
     if (mesh['regions'].shape[0] > 0):
         outfile.createDimension('num_of_regions', mesh['regions'].shape[0])
-        outfile.createVariable('regions', numpy.float, ('num_of_regions',
+        outfile.createVariable('regions', Float, ('num_of_regions',
                                                   'num_of_dimensions'))
         outfile.createVariable('region_max_areas',
-                               numpy.float,
+                               Float,
                                ('num_of_regions',))
         outfile.variables['regions'][:] = mesh['regions']
@@ -813 +814 @@
                                     mesh['region_tags'].shape[1])
             outfile.createVariable('region_tags',
-                                   numpy.character,
+                                   Character,
                                    ('num_of_regions',
                                     'num_of_region_tag_chars'))