Changeset 6517 for branches/numpy/anuga/culvert_flows/culvert_class.py
- Timestamp:
- Mar 16, 2009, 11:06:22 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/numpy/anuga/culvert_flows/culvert_class.py
r6304 r6517 204 204 log_to_file(self.log_filename, description) 205 205 log_to_file(self.log_filename, self.culvert_type) 206 else: 207 self.log_filename = None 206 208 207 209 … … 296 298 297 299 # Print some diagnostics to log if requested 298 if hasattr(self, 'log_filename'):300 if self.log_filename is not None: 299 301 s = 'Culvert Effective Length = %.2f m' %(self.length) 300 302 log_to_file(self.log_filename, s) … … 324 326 update = True 325 327 326 if hasattr(self, 'log_filename'): 328 329 if self.log_filename is not None: 327 330 s = '\nTime = %.2f, delta_t = %f' %(time, delta_t) 328 331 log_to_file(self.log_filename, s) … … 439 442 if self.verbose is True: 440 443 print msg 441 if hasattr(self, 'log_filename'): 444 445 if self.log_filename is not None: 442 446 log_to_file(self.log_filename, msg) 443 447 … … 524 528 print '%.2fs - WARNING: Flow is running uphill.' % time 525 529 526 if hasattr(self, 'log_filename'):530 if self.log_filename is not None: 527 531 s = 'Time=%.2f, inlet stage = %.2f, outlet stage = %.2f'\ 528 532 %(time, self.inlet.stage, self.outlet.stage) … … 573 577 msg += 'for culvert "%s"' % self.label 574 578 575 if hasattr(self, 'log_filename'):579 if self.log_filename is not None: 576 580 log_to_file(self.log_filename, msg) 577 581 else: 578 582 # User culvert routine 579 583 Q, barrel_velocity, culvert_outlet_depth =\ 580 self.culvert_routine(self, delta_total_energy, g) 584 self.culvert_routine(inlet.depth, 585 outlet.depth, 586 inlet.specific_energy, 587 delta_total_energy, 588 g, 589 culvert_length=self.length, 590 culvert_width=self.width, 591 culvert_height=self.height, 592 culvert_type=self.culvert_type, 593 manning=self.manning, 594 sum_loss=self.sum_loss, 595 log_filename=self.log_filename) 581 596 582 597 … … 601 616 602 617 603 618 # OBSOLETE (Except for momentum jet in Culvert_flow_energy) 604 619 class Culvert_flow_rating: 605 620 """Culvert flow - transfer water from one hole to another
Note: See TracChangeset
for help on using the changeset viewer.