Ignore:
Timestamp:
May 5, 2014, 5:21:42 PM (11 years ago)
Author:
davies
Message:

Fixed conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/anuga_core/source/anuga/shallow_water/okada_tsunami.py

    r8943 r9105  
    136136                 width  = the width of the sub-fault (km) DOWN THE DIP (i.e. width=surface_width/cos(dip))
    137137
    138                  dis1, dis2, dis3 are the fault displacement components in the
     138                 dis1, dis2, dis3 are the fault displacement components (m) in the
    139139                 directions 'along strike', 'up-dip', and 'perpendicular to the slip plain'.
    140140                 
Note: See TracChangeset for help on using the changeset viewer.