Changeset 4541 for anuga_core

Timestamp:

Jun 12, 2007, 5:18:26 PM (18 years ago)

Author:

duncan

Message:

fixed ticket:171

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/quantity.py (modified) (1 diff)
• abstract_2d_finite_volumes/util.py (modified) (1 diff)
• shallow_water/data_manager.py (modified) (2 diffs)
• shallow_water/test_data_manager.py (modified) (8 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -1477 +1477 @@
     #Replace python version with c implementations
 
+    from quantity_ext import average_vertex_values
+
     from quantity_ext import compute_gradients, limit,\
-    extrapolate_second_order, interpolate_from_vertices_to_edges, update,\
-    average_vertex_values
+    extrapolate_second_order, interpolate_from_vertices_to_edges, update

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -1446 +1446 @@
     # initialise the array to easily find the index of the first loner
     loners=arange(2*N, N, -1) # if N=3 [6,5,4]
-    
     for t in triangles:
         for vert in t:

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4715 +4715 @@
             number_of_times = 0
             starttime = times
-        #print "times",times
-        #print "starttime", starttime
+            #times = ensure_numeric([])
         outfile.starttime = starttime
         # dimension definitions
@@ -4766 +4765 @@
             outfile.variables[q+Write_sww.RANGE][1] = \
                 -outfile.variables[q+Write_sww.RANGE][1]
-        outfile.variables['time'][:] = times    #Store time relative
+            
+        if type(times) is list or type(times) is ArrayType:  
+            outfile.variables['time'][:] = times    #Store time relative
             
         if verbose:

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -1108 +1108 @@
 
     def test_sww2dem_asc_elevation_depth(self):
-        """Test that sww information can be converted correctly to asc/prj
+        """
+        test_sww2dem_asc_elevation_depth(self):
+        Test that sww information can be converted correctly to asc/prj
         format readable by e.g. ArcView
         """
@@ -1296 +1298 @@
 
     def test_export_grid(self):
-        """Test that sww information can be converted correctly to asc/prj
+        """
+        test_export_grid(self):
+        Test that sww information can be converted correctly to asc/prj
         format readable by e.g. ArcView
         """
@@ -1378 +1382 @@
 
     def test_export_gridII(self):
-        """Test that sww information can be converted correctly to asc/prj
+        """
+        test_export_gridII(self):
+        Test that sww information can be converted correctly to asc/prj
         format readable by e.g. ArcView
         """
@@ -1506 +1512 @@
 
     def test_export_gridIII(self):
-        """Test that sww information can be converted correctly to asc/prj
+        """
+        test_export_gridIII
+        Test that sww information can be converted correctly to asc/prj
         format readable by e.g. ArcView
         """
@@ -1520 +1528 @@
 
         #Setup
+        
         self.domain.set_name('tegIII')
 
@@ -1531 +1540 @@
 
         self.domain.geo_reference = Geo_reference(56,308500,6189000)
-
+        
         sww = get_dataobject(self.domain)
         sww.store_connectivity()
@@ -6938 +6947 @@
     #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_header')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_export_grid_parallel')
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_store_parameters')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_export_gridIII')
+    suite = unittest.makeSuite(Test_Data_Manager,'test')
     if len(sys.argv) > 1 and sys.argv[1][0].upper() == 'V':
         Test_Data_Manager.verbose=True
@@ -6947 +6957 @@
     else:
         pass
-    suite = unittest.makeSuite(Test_Data_Manager,'test')
-    runner = unittest.TextTestRunner()#(verbosity=2)
+    runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)