Changeset 6533 for branches/numpy/anuga/culvert_flows/culvert_class.py

Timestamp:

Mar 17, 2009, 4:02:54 PM (14 years ago)

Author:

rwilson

Message:

Revert back to 6481, prior to auto-merge of trunk and numpy branch.

File:

• branches/numpy/anuga/culvert_flows/culvert_class.py (modified) (7 diffs)

branches/numpy/anuga/culvert_flows/culvert_class.py

@@ -204 +204 @@
             log_to_file(self.log_filename, description)
             log_to_file(self.log_filename, self.culvert_type)        
-        else:
-            self.log_filename = None
 
 
@@ -298 +296 @@
 
         # Print some diagnostics to log if requested
-        if self.log_filename is not None:
+        if hasattr(self, 'log_filename'):
             s = 'Culvert Effective Length = %.2f m' %(self.length)
             log_to_file(self.log_filename, s)
@@ -326 +324 @@
                 update = True
 
-            
-        if self.log_filename is not None:        
+        if hasattr(self, 'log_filename'):            
             s = '\nTime = %.2f, delta_t = %f' %(time, delta_t)
             log_to_file(self.log_filename, s)
@@ -442 +439 @@
             if self.verbose is True:
                 print msg
-                
-            if self.log_filename is not None:                
+            if hasattr(self, 'log_filename'):                    
                 log_to_file(self.log_filename, msg)
         
@@ -528 +524 @@
                 print '%.2fs - WARNING: Flow is running uphill.' % time
             
-        if self.log_filename is not None:
+        if hasattr(self, 'log_filename'):
             s = 'Time=%.2f, inlet stage = %.2f, outlet stage = %.2f'\
                 %(time, self.inlet.stage, self.outlet.stage)
@@ -577 +573 @@
                     msg += 'for culvert "%s"' % self.label 
                     
-                    if self.log_filename is not None:                    
+                    if hasattr(self, 'log_filename'):                    
                         log_to_file(self.log_filename, msg)
             else:
                 # User culvert routine
                 Q, barrel_velocity, culvert_outlet_depth =\
-                    self.culvert_routine(inlet.depth,
-                                         outlet.depth,
-                                         inlet.specific_energy, 
-                                         delta_total_energy, 
-                                         g,
-                                         culvert_length=self.length,
-                                         culvert_width=self.width,
-                                         culvert_height=self.height,
-                                         culvert_type=self.culvert_type,
-                                         manning=self.manning,
-                                         sum_loss=self.sum_loss,
-                                         log_filename=self.log_filename)
+                    self.culvert_routine(self, delta_total_energy, g)
             
             
@@ -616 +601 @@
 
                             
-# OBSOLETE (Except for momentum jet in Culvert_flow_energy)    
+    
 class Culvert_flow_rating:
     """Culvert flow - transfer water from one hole to another