Changeset 4396 for anuga_core/source


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/abstract_2d_finite_volumes/test_domain.py

    r4393 r4396  
    491491                        'set region failed')
    492492
    493 
    494     def test_track_speeds(self):
    495         """
    496         get values based on triangle lists.
    497         """
    498         from mesh_factory import rectangular
    499         from shallow_water import Domain
    500         from Numeric import zeros, Float
    501 
    502         #Create basic mesh
    503         points, vertices, boundary = rectangular(1, 3)
    504 
    505         #Create shallow water domain
    506         domain = Domain(points, vertices, boundary)
    507         domain.write_time(track_speeds=True)
    508493
    509494
     
    607592#-------------------------------------------------------------
    608593if __name__ == "__main__":
    609 #    suite = unittest.makeSuite(Test_Domain,'test')
    610     suite = unittest.makeSuite(Test_Domain,'test_track_speeds')
     594    suite = unittest.makeSuite(Test_Domain,'test')
    611595    runner = unittest.TextTestRunner()
    612596    runner.run(suite)
  • anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

    r4392 r4396  
    329329    # each timestep for each quantity
    330330    quantities = {}
    331     if verbose:
    332         print 'before interpolation function1'
    333331    for i, name in enumerate(quantity_names):
    334332        quantities[name] = fid.variables[name][:]
    335333    fid.close()
    336334   
    337     if verbose:
    338         print 'before interpolation function2'
    339        
     335
    340336    #from least_squares import Interpolation_function
    341337    from anuga.fit_interpolate.interpolate import Interpolation_function
     
    344340        vertex_coordinates = triangles = interpolation_points = None         
    345341
    346     if verbose:
    347         print 'before interpolation function3'
    348342
    349343    # Return Interpolation_function instance as well as
  • anuga_core/source/anuga/fit_interpolate/interpolate.py

    r4394 r4396  
    433433        import types
    434434
    435         if verbose:
    436             print 'started Interpolation function'
    437          
     435
    438436        # Check temporal info
    439437        time = ensure_numeric(time)       
     
    456454            quantity_names = quantities.keys()
    457455
    458         if verbose:
    459             print 'started Interpolation function1'
    460456
    461457        # Check spatial info
     
    475471            if len(quantities[name].shape) == 2:
    476472                quantities[name] = array(quantities[name][::time_thinning,:])
    477 
    478         if verbose:
    479             print 'started Interpolation function2'
    480473             
    481474        # Save for use with statistics
     
    493486        self.precomputed_values = {}
    494487       
    495         if verbose:
    496             print 'started Interpolation function3'
    497        
    498        
     488           
    499489        # Precomputed spatial interpolation if requested
    500490        if interpolation_points is not None:
     
    514504            m = len(self.interpolation_points)
    515505            p = len(self.time)
    516 
    517         if verbose:
    518             print 'started Interpolation function4'
    519 
     506           
    520507            for name in quantity_names:
    521508                self.precomputed_values[name] = zeros((p, m), Float)
  • anuga_core/source/anuga_parallel/parallel_shallow_water.py

    r4395 r4396  
    261261        self.communication_time += time.time()-t0
    262262
    263 '''
    264 This was removed due to not beening required to be redefined in parallel_shallow_water
    265 the original "write_time" is good... however might need some small edits to work properly
    266 with parallel- Nick and Ole April 2007
     263
    267264    def write_time(self):
    268265        if self.min_timestep == self.max_timestep:
     
    282279                    self.max_timestep, self.number_of_steps,
    283280                    self.number_of_first_order_steps)
    284 '''
    285281
    286282# commented out on the 7/11/06
Note: See TracChangeset for help on using the changeset viewer.