Changeset 4396 for anuga_core/source

Timestamp:

Apr 18, 2007, 11:48:41 AM (18 years ago)

Author:

nick

Message:

reverted to revision 4391 because tests were broken.

Location:

anuga_core/source

Files:

• anuga/abstract_2d_finite_volumes/test_domain.py (modified) (2 diffs)
• anuga/abstract_2d_finite_volumes/util.py (modified) (2 diffs)
• anuga/fit_interpolate/interpolate.py (modified) (5 diffs)
• anuga_parallel/parallel_shallow_water.py (modified) (2 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_domain.py

@@ -491 +491 @@
                         'set region failed')
 
-
-    def test_track_speeds(self):
-        """
-        get values based on triangle lists.
-        """
-        from mesh_factory import rectangular
-        from shallow_water import Domain
-        from Numeric import zeros, Float
-
-        #Create basic mesh
-        points, vertices, boundary = rectangular(1, 3)
-
-        #Create shallow water domain
-        domain = Domain(points, vertices, boundary)
-        domain.write_time(track_speeds=True)
 
 
@@ -607 +592 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-#    suite = unittest.makeSuite(Test_Domain,'test')
-    suite = unittest.makeSuite(Test_Domain,'test_track_speeds')
+    suite = unittest.makeSuite(Test_Domain,'test')
     runner = unittest.TextTestRunner()
     runner.run(suite)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -329 +329 @@
     # each timestep for each quantity
     quantities = {}
-    if verbose:
-        print 'before interpolation function1'
     for i, name in enumerate(quantity_names):
         quantities[name] = fid.variables[name][:]
     fid.close()
     
-    if verbose:
-        print 'before interpolation function2'
-        
+
     #from least_squares import Interpolation_function
     from anuga.fit_interpolate.interpolate import Interpolation_function
@@ -344 +340 @@
         vertex_coordinates = triangles = interpolation_points = None         
 
-    if verbose:
-        print 'before interpolation function3'
 
     # Return Interpolation_function instance as well as

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -433 +433 @@
         import types
 
-        if verbose:
-            print 'started Interpolation function'
-          
+
         # Check temporal info
         time = ensure_numeric(time)        
@@ -456 +454 @@
             quantity_names = quantities.keys()
 
-        if verbose:
-            print 'started Interpolation function1'
 
         # Check spatial info
@@ -475 +471 @@
             if len(quantities[name].shape) == 2:
                 quantities[name] = array(quantities[name][::time_thinning,:])
-
-        if verbose:
-            print 'started Interpolation function2'
              
         # Save for use with statistics
@@ -493 +486 @@
         self.precomputed_values = {}
         
-        if verbose:
-            print 'started Interpolation function3'
-        
-        
+            
         # Precomputed spatial interpolation if requested
         if interpolation_points is not None:
@@ -514 +504 @@
             m = len(self.interpolation_points)
             p = len(self.time)
-
-        if verbose:
-            print 'started Interpolation function4'
-
+            
             for name in quantity_names:
                 self.precomputed_values[name] = zeros((p, m), Float)

anuga_core/source/anuga_parallel/parallel_shallow_water.py

@@ -261 +261 @@
         self.communication_time += time.time()-t0
 
-'''
-This was removed due to not beening required to be redefined in parallel_shallow_water
-the original "write_time" is good... however might need some small edits to work properly 
-with parallel- Nick and Ole April 2007
+
     def write_time(self):
         if self.min_timestep == self.max_timestep:
@@ -282 +279 @@
                     self.max_timestep, self.number_of_steps,
                     self.number_of_first_order_steps)
-'''
 
 # commented out on the 7/11/06