Ignore:
Timestamp:
Jul 30, 2008, 5:03:47 PM (14 years ago)
Author:
steve
Message:

Added in minimum height

File:
1 edited

Legend:

Unmodified
Added
Removed
  • anuga_work/development/anuga_1d/shallow_water_domain.py

    r5563 r5587  
    5959                                tagged_elements)
    6060       
    61         from config import minimum_allowed_height, g
     61        from config import minimum_allowed_height, g, h0
    6262        self.minimum_allowed_height = minimum_allowed_height
    6363        self.g = g
     64        self.h0 = h0
    6465
    6566        #forcing terms not included in 1d domain ?WHy?
     
    308309    """
    309310
    310     from config import g, epsilon
     311    from config import g, epsilon, h0
    311312    from math import sqrt
    312313    from Numeric import array
     
    333334        h_left = 0.0
    334335    else:
    335         u_left  = uh_left/h_left
     336        u_left  = uh_left/(h_left +  h0/h_left)
     337
     338
     339    uh_left = u_left*h_left
    336340
    337341
     
    339343    h_right  = w_right-z
    340344    uh_right = q_right[1]
    341 
    342345
    343346    if h_right < epsilon:
     
    345348        h_right = 0.0
    346349    else:
    347         u_right  = uh_right/h_right
     350        u_right  = uh_right/(h_right + h0/h_right)
     351
     352    uh_right = u_right*h_right
    348353
    349354    #vh_left  = q_left[2]
Note: See TracChangeset for help on using the changeset viewer.