Changeset 9323

Timestamp:

Sep 4, 2014, 6:45:53 PM (10 years ago)

Author:

steve

Message:

Found bug with reading in xya type data

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/test_general_mesh.py (modified) (1 diff)
• fit_interpolate/fit.py (modified) (1 diff)
• load_mesh/loadASCII.py (modified) (6 diffs)
• load_mesh/test_loadASCII.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/test_general_mesh.py

@@ -384 +384 @@
         nodes = num.array([a, b, c, d, e, f])
 
-        
         #                        bac,     bce,     ecf,     dbe
         triangles = num.array([[1,0,2], [1,2,4], [4,2,5], [3,1,4]], num.int)

trunk/anuga_core/source/anuga/fit_interpolate/fit.py

@@ -527 +527 @@
     """
 
-    from load_mesh.loadASCII import import_mesh_file, \
+    from anuga.load_mesh.loadASCII import import_mesh_file, \
          export_mesh_file, concatinate_attributelist
 

trunk/anuga_core/source/anuga/load_mesh/loadASCII.py

@@ -70 +70 @@
 
 from anuga.file.netcdf import NetCDFFile
+from anuga.utilities.numerical_tools import ensure_numeric
 
 import numpy as num
@@ -96 +97 @@
     #FIXME No test for ValueError
     except (TitleError, SyntaxError, IndexError, ValueError):
-        msg = 'File could not be opened'
+        msg = 'File %s could not be opened' % ofile
         raise IOError, msg
+    
     return dict
 
@@ -350 +352 @@
             else:
                 regionmaxareas.append(float(fragments[0]))
-        except IndexError, e:
+        except (ValueError, IndexError), e:
             regionmaxareas.append(None)
 
@@ -376 +378 @@
     vertices = gen_dict['vertices']
     vertices_attributes = gen_dict['vertex_attributes']
+
     try:
         vertices_attribute_titles = gen_dict['vertex_attribute_titles']
@@ -381 +384 @@
         #FIXME is this the best way?
         if vertices_attributes == [] or vertices_attributes[0] == []:
-             vertices_attribute_titles = []
+            vertices_attribute_titles = []
         else:
             raise KeyError, e
+        
 
     triangles = gen_dict['triangles']
@@ -400 +404 @@
         numVertAttrib = "0"
     else:
-        numVertAttrib = str(len(vertices_attributes[0]))
+        #numVertAttrib = str(len(vertices_attributes[0]))
+        try:
+            numVertAttrib = str(len(vertices_attributes[0]))
+        except TypeError:
+            vertices_attributes = [ [entry] for entry in vertices_attributes]
+            numVertAttrib = str(len(vertices_attributes[0]))
+        
+
 
     fd.write(numVert + " " + numVertAttrib + 

trunk/anuga_core/source/anuga/load_mesh/test_loadASCII.py

@@ -37 +37 @@
         self.dict['vertex_attribute_titles'] = ['bed elevation', 'height']
         self.dict['geo_reference'] = Geo_reference(56, 1.9, 1.9)
+        
+        
+        self.dict_1 = {}
+        self.dict_1['outline_segments'] = [(0, 1), (1, 2), (0, 2), (0, 3)]
+        self.dict_1['outline_segment_tags'] = ['50', '40', '30', '20']
+        self.dict_1['holes'] = [(0.2, 0.6)]
+        self.dict_1['point_attributes'] = [[5], [4], [3], [2]]
+        self.dict_1['regions'] = [(0.3, 0.3), (0.3, 0.4)]
+        self.dict_1['region_tags'] = ['1.3', 'yeah']
+        self.dict_1['region_max_areas'] = [36.0, -7.1]
+        self.dict_1['points'] = [(0.0, 0.0), (0.0, 4.0), (4.0, 0.0), (1.0, 1.0)]
+        self.dict_1['vertices'] = [(0.0, 0.0), (0.0, 4.0), (4.0, 0.0),
+                                 (1.0, 1.0), (2.0, 2.0)]
+        self.dict_1['triangles'] = [(3, 2, 4), (1, 0, 3), (3, 4,1), (2, 3, 0)]
+        self.dict_1['segments'] = [(0, 1), (1, 4), (2, 0), (0, 3), (4, 2)]
+        self.dict_1['triangle_tags'] = ['1.3', '1.3', '1.3', '1.3']
+        self.dict_1['vertex_attributes'] = [[1.2], [1.2], [1.2],
+                                         [1.2], [1.2]]
+        self.dict_1['triangle_neighbors'] = [[-1, 2, 3], [3, 2, -1],
+                                           [-1, 1, 0], [1, -1, 0]]
+        self.dict_1['segment_tags'] = ['50', '40', '30', '20', '40']
+        self.dict_1['vertex_attribute_titles'] = ['height']
+        self.dict_1['geo_reference'] = Geo_reference(56, 1.9, 1.9)        
 
         self.sparse_dict = {}
@@ -201 +224 @@
 
         os.remove(fileName)
+        
+        
+    def test_export_mesh_1_file(self):
+        meshDict = self.dict_1
+        fileName = tempfile.mktemp('.tsh')
+        export_mesh_file(fileName, meshDict)
+        loadedDict = import_mesh_file(fileName)
+        
+
+        self.failUnless(num.alltrue(num.array(meshDict['vertices']) ==
+                                    num.array(loadedDict['vertices'])),
+                        'test_export_mesh_file failed. Test 1')
+        self.failUnless(num.alltrue(num.array(meshDict['triangles']) ==
+                                    num.array(loadedDict['triangles'])),
+                        'test_export_mesh_file failed. Test 2')
+        self.failUnless(num.alltrue(num.array(meshDict['segments']) ==
+                                    num.array(loadedDict['segments'])),
+                        'test_export_mesh_file failed. Test 3')
+        self.failUnless(num.alltrue(num.array(meshDict['triangle_tags']) ==
+                                    num.array(loadedDict['triangle_tags'])),
+                        'test_export_mesh_file failed. Test 4')
+
+        self.failUnless(meshDict['vertex_attributes'] ==
+                        loadedDict['vertex_attributes'],
+                        'test_export_mesh_file failed. Test 5')
+        self.failUnless(num.alltrue(num.array(meshDict['triangle_neighbors']) ==
+                                    num.array(loadedDict['triangle_neighbors'])),
+                        'test_export_mesh_file failed. Test 6')
+        self.failUnless(num.alltrue(num.array(meshDict['segment_tags']) ==
+                                    num.array(loadedDict['segment_tags'])),
+                        'test_export_mesh_file failed. Test 7')
+        self.failUnless(num.alltrue(num.array(meshDict['vertex_attribute_titles']) ==
+                                    num.array(loadedDict['vertex_attribute_titles'])),
+                        'test_export_mesh_file failed. Test 8')
+        self.failUnless(num.alltrue(num.array(meshDict['geo_reference']) ==
+                                    num.array(loadedDict['geo_reference'])),
+                        'test_export_mesh_file failed. Test 9')
+
+
+        #os.remove(fileName)        
 
     def test_read_write_tsh_file(self):