Changeset 6360 for branches/numpy/anuga/load_mesh/loadASCII.py

Timestamp:

Feb 18, 2009, 2:44:41 PM (14 years ago)

Author:

rwilson

Message:

Ongoing conversion changes.

File:

• branches/numpy/anuga/load_mesh/loadASCII.py (modified) (9 diffs)

branches/numpy/anuga/load_mesh/loadASCII.py

@@ -53 +53 @@
     Following lines:  <segment #> <vertex #>  <vertex #> [boundary tag]
 """
+
 ##FIXME (DSG-DSG) Is the dict format mentioned above a list of a numeric array?
 #  Needs to be defined
@@ -58 +59 @@
 
 from string import  find, rfind
-import numpy as num
 from os.path import splitext
+import exceptions
 
 from anuga.coordinate_transforms.geo_reference import Geo_reference, TITLE, \
                                                       TitleError
-
-from Scientific.IO.NetCDF import NetCDFFile
 from anuga.config import netcdf_mode_r, netcdf_mode_w, netcdf_mode_a
 from anuga.config import netcdf_float, netcdf_char, netcdf_int
 
-import exceptions
+from Scientific.IO.NetCDF import NetCDFFile
+
+import numpy as num
 
 
@@ -87 +88 @@
 
     Note: will throw an IOError if it can't load the file.
-    Catch these!
     """
 
@@ -149 +149 @@
 # @brief Read a mesh file into a dictionary.
 # @param ofile Path of the file to read.
-# @return Data dictionary from the mesh (.tsh) file.
+# @return Points dictionary from the mesh (.tsh) file.
 def _read_tsh_file(ofile):
     """Read the text file format for meshes"""
@@ -164 +164 @@
 
 ##
-# @brief ??
+# @brief Read triangulation data from a file, leave file open.
 # @param fd An open descriptor of the file to read.
 # @return A dictionary ...
@@ -264 +264 @@
 
 ##
-# @brief
+# @brief Read a mesh outline file.
 # @param fd An open descriptor of the file to read.
-# @return A dictionary ...
+# @return A Points dictionary.
 # @note If file has no mesh info, an empty dict will be returned.
 def _read_outline(fd):
@@ -393 +393 @@
 
     return meshDict
-
-
-##
-# @brief Clean up a line with delimited fields.
-# @param line The string to be cleaned.
-# @param delimiter String used a delimiter when splitting 'line'.
-# @return A list of delimited fields with white-space removed from ends.
-# @note Will also remove any field that was originally ''.
-def clean_line(line, delimiter):
-    """Clean up a line - return fields with end space removed."""
-
-    line = line.strip()
-    numbers = line.split(delimiter)
-    i = len(numbers) - 1
-    while i >= 0:
-        if numbers[i] == '':
-            numbers.pop(i)
-        else:
-            numbers[i] = numbers[i].strip()
-
-        i += -1
-
-    return numbers
 
 
@@ -649 +626 @@
         num.array(mesh['vertex_attribute_titles'], num.character)
     mesh['segments'] = num.array(mesh['segments'], IntType)
+    print ("Before num.array(), mesh['segment_tags']=%s"
+           % str(mesh['segment_tags']))
     mesh['segment_tags'] = num.array(mesh['segment_tags'], num.character)
+    print ("After num.array(), mesh['segment_tags']=%s"
+           % str(mesh['segment_tags']))
+    print "mesh['segment_tags'].shape=%s" % str(mesh['segment_tags'].shape)
     mesh['triangles'] = num.array(mesh['triangles'], IntType)
     mesh['triangle_tags'] = num.array(mesh['triangle_tags'])
@@ -967 +949 @@
     fd.close()
 
-
 ################################################################################
 #  IMPORT/EXPORT POINTS FILES