Ignore:
Timestamp:
Aug 30, 2010, 5:53:45 PM (13 years ago)
Author:
steve
Message:

Added new tests

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/anuga_core/source/anuga/structures/culvert_operator.py

    r7978 r7980  
    22from anuga.config import g
    33import anuga.utilities.log as log
    4 import box_culvert
    5 import culvert_routines
     4
     5from boyd_box_culvert import Boyd_box_culvert
    66
    77class Culvert_operator:
     
    3434        self.height = height
    3535       
    36         self.culvert = box_culvert.Box_culvert(self.domain, end_points, self.width, self.height)
     36        self.culvert = Boyd_box_culvert(self.domain, end_points, self.width, self.height)
     37        print self.culvert
     38        self.routine = self.culvert.routine
     39        print self.routine
    3740        self.inlets = self.culvert.get_inlets()
    3841   
     
    4346
    4447        timestep = self.domain.get_timestep()
     48       
     49        Q, barrel_speed, culvert_outlet_depth = self.routine()
    4550
    46         from culvert_routines import Culvert_routines
    47         culvert_routine = culvert_routines.Culvert_routines(self.culvert)
    48        
    49         Q, barrel_velocity, culvert_outlet_depth = culvert_routine.boyd_circle()
     51        inflow  = self.routine.get_inflow()
     52        outflow = self.routine.get_outflow()
    5053
    51         transfer_water = Q*timestep
     54        outflow_direction = - outflow.outward_culvert_vector
    5255
    53         inflow = culvert_routine.get_inflow()
    54         outflow = culvert_routine.get_outflow()
     56        outflow_momentum_flux = barrel_speed**2*culvert_outlet_depth*outflow_direction
    5557
    56         inflow.set_heights(inflow.get_average_height() - transfer_water)
     58
     59        print Q, barrel_speed, culvert_outlet_depth, outflow_momentum_flux
     60
     61        #FIXME (SR) Check whether we need to mult/divide by inlet area
     62        inflow_transfer =  Q*timestep/inflow.get_area()
     63
     64        outflow_transfer = Q*timestep/outflow.get_area()
     65
     66
     67
     68        inflow.set_heights(inflow.get_average_height() - inflow_transfer)
     69
    5770        inflow.set_xmoms(0.0)
    5871        inflow.set_ymoms(0.0)
    5972
    60         outflow.set_heights(outflow.get_average_height() + transfer_water)
    61         outflow.set_xmoms(0.0)
    62         outflow.set_ymoms(0.0)
     73        #u = outflow.get_xvelocities()
     74        #v = outflow.get_yvelocities()
     75
     76        outflow.set_heights(outflow.get_average_height() + outflow_transfer)
     77        #outflow.set_xmoms(outflow.get_xmoms() + timestep*outflow_momentum_flux[0] )
     78        #outflow.set_ymoms(outflow.get_ymoms() + timestep*outflow_momentum_flux[1] )
    6379
    6480    def print_stats(self):
     
    7490
    7591            print 'inlet triangle indices and centres'
    76             print inlet.triangle_indices[i]
    77             print self.domain.get_centroid_coordinates()[inlet.triangle_indices[i]]
     92            print inlet.triangle_indices
     93            print self.domain.get_centroid_coordinates()[inlet.triangle_indices]
    7894       
    7995            print 'polygon'
Note: See TracChangeset for help on using the changeset viewer.