Changeset 4853


Ignore:
Timestamp:
Nov 22, 2007, 6:05:38 PM (16 years ago)
Author:
sexton
Message:

reflecting updated function in other files

Files:
23 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/documentation/user_manual/anuga_user_manual.tex

    r4818 r4853  
    12741274\begin{figure}[hbt]
    12751275\centerline{\includegraphics[scale=0.5]{graphics/slidedepth.jpg}}
    1276 \caption{Maximum inundation map for the Cairns side scenario.}
     1276\caption{Maximum inundation map for the Cairns slide scenario.}
    12771277\label{fig:maxdepthcairnsslide}
    12781278\end{figure}
  • anuga_core/documentation/user_manual/demos/cairns/ExportResults.py

    r4809 r4853  
    66from os import sep
    77
    8 #scenario = 'slide'
    9 scenario = 'fixed_wave'
     8scenario = 'slide'
     9#scenario = 'fixed_wave'
    1010
    1111name = scenario + sep + scenario + 'source'
  • anuga_core/documentation/user_manual/demos/cairns/runcairns.py

    r4838 r4853  
    165165# 60 min square wave starting at 1 min, 50m high
    166166if scenario == 'fixed_wave':
    167     # FIXME (Ole): Change this to Transmissive Momentum as
    168     # suggested by Rajaraman (ticket:208)
    169     Bw = Time_boundary(domain = domain,
    170                        f=lambda t: [(60<t<3660)*50, 0, 0])
     167    Bw = Transmissive_Momentum_Set_Stage_boundary(domain = domain,
     168                          f=lambda t: [(60<t<3660)*50, 0, 0])
    171169    domain.set_boundary({'ocean_east': Bw,
    172170                         'bottom': Bd,
  • anuga_core/source/anuga/fit_interpolate/interpolate.py

    r4852 r4853  
    557557                    out_interp_pts.append(ensure_numeric(interpolation_points[i]))
    558558
    559                 from anuga.utilities.polygon import plot_polygons_points
    560                 #out_interp_pts = take(interpolation_points,[indices])
    561                 title = 'Interpolation points fall outside specified mesh'
    562                 plot_polygons_points([mesh_boundary_polygon,interpolation_points,out_interp_pts],
    563                                      ['line','point','outside'],figname='points_boundary_out',label=title,verbose=verbose)
     559                if verbose is True:
     560                    from anuga.utilities.polygon import plot_polygons_points
     561                    #out_interp_pts = take(interpolation_points,[indices])
     562                    title = 'Interpolation points fall outside specified mesh'
     563                    plot_polygons_points([mesh_boundary_polygon,interpolation_points,out_interp_pts],
     564                                         ['line','point','outside'],figname='points_boundary_out',label=title,verbose=verbose)
    564565
    565566                # Joaquim Luis suggested this as an Exception, so
  • anuga_work/production/broome_2006/project.py

    r4581 r4853  
    77import sys
    88from time import localtime, strftime, gmtime
    9 from anuga.utilities.polygon import read_polygon, plot_polygons, is_inside_polygon, number_mesh_triangles
     9from anuga.utilities.polygon import read_polygon, plot_polygons_points, is_inside_polygon, number_mesh_triangles
    1010#from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_points_from_latlon_to_utm
    1111from anuga.utilities.system_tools import get_user_name
     
    126126# Domain definitions
    127127###############################
    128 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
     128from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
    129129
    130130poly_all = read_polygon(polygons_dir+'extent_small.csv')
  • anuga_work/production/broome_2006/project_urs.py

    r4587 r4853  
    66from os import sep, environ, getenv, getcwd,umask
    77from os.path import expanduser, basename
    8 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
     8from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
    99import sys
    1010from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
     
    152152# Domain definitions
    153153###############################
    154 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
     154from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
    155155
    156156poly_all = read_polygon(polygons_dir+'extent_small.csv')
     157# to test update of plot_polygons - now allows points and polygon to be
     158# plotted together
     159#point = read_polygon(polygons_dir+'neg20_coast_contour_pts.csv')
     160#p2 = read_polygon(polygons_dir+'broome_north_coast_inside_extent.csv')
     161#label=None
     162#plot_polygons_points([poly_all,point,p2],['line','point','outside'],figname='test',label=label)
     163#plot_polygons_points([poly_all,point],figname='test')
    157164#poly_all = read_polygon(polygons_dir+'extent.csv')
    158165res_poly_all = 150000*res_factor
  • anuga_work/production/busselton_2006/project.py

    r4477 r4853  
    77import sys
    88from time import localtime, strftime, gmtime
    9 from anuga.utilities.polygon import read_polygon, plot_polygons, is_inside_polygon, number_mesh_triangles
     9from anuga.utilities.polygon import read_polygon, plot_polygons_points, is_inside_polygon, number_mesh_triangles
    1010#from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_points_from_latlon_to_utm
    1111from anuga.utilities.system_tools import get_user_name
     
    129129res_busselton2 = 500
    130130
    131 #plot_polygons([polyAll,poly_broome1,poly_broome2,poly_broome3],'boundingpoly2',verbose=False)
     131#plot_polygons_points([polyAll,poly_broome1,poly_broome2,poly_broome3],figname='boundingpoly2',verbose=False)
    132132
    133133interior_regions = [[poly_busselton1,res_busselton1],[poly_busselton2,res_busselton2]]
  • anuga_work/production/dampier_2006/project.py

    r4581 r4853  
    66import sys
    77from time import localtime, strftime, gmtime
    8 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
     8from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
    99from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_from_latlon_to_utm
    1010from anuga.utilities.system_tools import get_user_name
     
    237237
    238238
    239 #plot_polygons([poly_dampier,poly_karratha,poly_karratha_town,poly_delambre,
     239#plot_polygons_points([poly_dampier,poly_karratha,poly_karratha_town,poly_delambre,
    240240#                poly_coast,poly_NWislands,poly_island0,poly_island1,poly_island2,
    241241#                poly_island3,poly_island4,poly_island5,poly_island6,
    242242#                poly_island7,poly_island8,poly_ref_nw4,poly_ref_nw5,
    243 #                poly_ref_nw6,poly_ref_nw7,poly_ref_nw8,poly_all],'poly_pic')
     243#                poly_ref_nw6,poly_ref_nw7,poly_ref_nw8,poly_all],figname='poly_pic')
    244244
    245245interior_regions = [[poly_dampier,res_dampier],
  • anuga_work/production/dampier_2006/project_urs.py

    r4587 r4853  
    44from os import sep, environ, getenv, getcwd,umask
    55from os.path import expanduser, basename
    6 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
     6from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
    77import sys
    88from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
     
    243243
    244244
    245 #plot_polygons([poly_dampier,poly_karratha,poly_karratha_town,poly_delambre,
     245#plot_polygons_points([poly_dampier,poly_karratha,poly_karratha_town,poly_delambre,
    246246#                poly_coast,poly_NWislands,poly_island0,poly_island1,poly_island2,
    247247#                poly_island3,poly_island4,poly_island5,poly_island6,
    248248#                poly_island7,poly_island8,poly_ref_nw4,poly_ref_nw5,
    249 #                poly_ref_nw6,poly_ref_nw7,poly_ref_nw8,poly_all],'poly_pic')
     249#                poly_ref_nw6,poly_ref_nw7,poly_ref_nw8,poly_all],figname='poly_pic')
    250250
    251251interior_regions = [[poly_dampier,res_dampier],
  • anuga_work/production/exmouth_2006/project.py

    r4587 r4853  
    55from os import sep, environ, getenv, getcwd,umask
    66from os.path import expanduser, basename
    7 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
     7from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
    88import sys
    99from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
     
    154154# Domain definitions
    155155###############################
    156 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
     156from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
    157157
    158158poly_all = read_polygon(polygons_dir+'extent_more_points.csv')
  • anuga_work/production/galle_2007/project.py

    r4547 r4853  
    88import sys
    99from time import localtime, strftime, gmtime
    10 from anuga.utilities.polygon import read_polygon, plot_polygons, is_inside_polygon, \
     10from anuga.utilities.polygon import read_polygon, plot_polygons_points, is_inside_polygon, \
    1111                                    number_mesh_triangles, polygon_area
    1212from anuga.utilities.system_tools import get_user_name
     
    133133                    [poly_canal, canal_res]]
    134134
    135 #plot_polygons([bounding_polygon,poly_intermediate,\
     135#plot_polygons_points([bounding_polygon,poly_intermediate,\
    136136#               poly_shallow,poly_coast,poly_canal],\
    137 #              'boundingpoly',verbose=False)
     137#              figname='boundingpoly',verbose=False)
    138138
    139139trigs_min = number_mesh_triangles(interior_regions, bounding_polygon, regional_res)
  • anuga_work/production/gold_coast_2007/project.py

    r4310 r4853  
    77import sys
    88from time import localtime, strftime, gmtime
    9 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
     9from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
    1010
    1111if sys.platform == 'win32':
  • anuga_work/production/hobart_2006/project.py

    r4275 r4853  
    77import sys
    88from time import localtime, strftime, gmtime
    9 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area
     9from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area
    1010from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_from_latlon_to_utm
    1111
     
    149149# Mark run - morning Fri 29 Sep; surrounds -100m and 20mish elevation
    150150polyAll = read_polygon(polygondir+'new_extent_2.csv')
    151 #plot_polygons([polyAll, polyAll2],'boundingpoly',verbose=False)
     151#plot_polygons_points([polyAll, polyAll2],figname='boundingpoly',verbose=False)
    152152#print 'Area of bounding polygon', polygon_area(polyAll)
    153153polyAll_refine = read_polygon(polygondir+'extent_refine.csv')
  • anuga_work/production/newcastle_2006/project_slide.py

    r4346 r4853  
    77import sys
    88from time import localtime, strftime, gmtime
    9 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
     9from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
    1010
    1111if sys.platform == 'win32':
     
    9898poly_entrance_c0 = read_polygon(polygondir+'entrance.csv')
    9999
    100 #plot_polygons([polyAll,poly_local,poly_newcastle],'fig',verbose=True)
     100#plot_polygons_points([polyAll,poly_local,poly_newcastle],figname='fig',verbose=True)
    101101###################################################################
    102102# Clipping regions for export to asc and regions for clipping data
  • anuga_work/production/onslow_2006/project_grad.py

    r4698 r4853  
    66from os import sep, environ, getenv, getcwd, umask
    77from os.path import expanduser, basename, join
    8 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
     8from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
    99import sys
    1010from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
     
    3939finaltime = 40000
    4040starttime = 3600 # Action starts around 9000
    41 setup='final'
    42 #setup = 'trial'
     41#setup='final'
     42setup = 'trial'
    4343which_data = 'original'
    4444#which_data = 'revised'
  • anuga_work/production/onslow_2006/project_urs.py

    r4587 r4853  
    66import sys
    77from time import localtime, strftime, gmtime
    8 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
     8from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
    99from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_from_latlon_to_utm
    1010from anuga.utilities.system_tools import get_user_name, get_host_name
  • anuga_work/production/perth_2006/project.py

    r4477 r4853  
    77import sys
    88from time import localtime, strftime, gmtime
    9 from anuga.utilities.polygon import read_polygon, plot_polygons, is_inside_polygon, number_mesh_triangles
     9from anuga.utilities.polygon import read_polygon, plot_polygons_points, is_inside_polygon, number_mesh_triangles
    1010#from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_points_from_latlon_to_utm
    1111from anuga.utilities.system_tools import get_user_name
     
    118118# Domain definitions
    119119###############################
    120 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
     120from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
    121121
    122122poly_all = read_polygon(polygons_dir+'bounding_poly.csv')
  • anuga_work/production/pt_hedland_2006/project_urs.py

    r4587 r4853  
    55from os import sep, environ, getenv, getcwd,umask
    66from os.path import expanduser, basename
    7 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
     7from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
    88import sys
    99from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
  • anuga_work/production/shark_bay_2007/project.py

    r4689 r4853  
    77from os import sep, environ, getenv, getcwd, umask
    88from os.path import expanduser, basename, join
    9 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
     9from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
    1010import sys
    1111from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
  • anuga_work/production/sydney_2006/project_slide.py

    r4314 r4853  
    77import sys
    88from time import localtime, strftime, gmtime
    9 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
     9from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
    1010
    1111if sys.platform == 'win32':
  • anuga_work/production/sydney_2006/smf_approx.py

    r4316 r4853  
    2424# Application specific imports
    2525import project                 # Definition of file names and polygons
    26 from anuga.shallow_water.smf import slide_tsunami, slump_tsunami  # Function for submarine mudslide
    2726
    2827def stats_slide(depth,length,width,thickness,slope,gamma):
     
    254253
    255254close('all')
    256 
    257 ##import sys; sys.exit()
    258 ##tsunami_source = slide_tsunami(length=16840.0,
    259 ##                               width=8860.0,
    260 ##                               depth=2087.0,
    261 ##                               slope=4.0,
    262 ##                               thickness=424.0,
    263 ##                               gamma=1.46,
    264 ##                               #dphi=0.23,
    265 ##                               x0=project.slump_origin2[0],
    266 ##                               y0=project.slump_origin2[1],
    267 ##                               #alpha=0.0,
    268 ##                               #domain=domain,
    269 ##                               verbose=True)
    270 ##        tsunami_source = slump_tsunami(length=16840.0,
    271 ##                                       width=8860.0,
    272 ##                                       #depth=2087.0,
    273 ##                                       slope=4.0,
    274 ##                                       thickness=424.0,
    275 ##                                       gamma=1.45,
    276 ##                                       #dphi=0.23,
    277 ##                                       #radius = 3330,
    278 ##                                       x0=project.slump_origin2[0],
    279 ##                                       y0=project.slump_origin2[1],
    280 ##                                       #alpha=0.0,
    281 ##                                       #domain=domain,
    282 ##                                       verbose=True)
  • anuga_work/production/wollongong_2006/project_kembla.py

    r4696 r4853  
    77import sys
    88from time import localtime, strftime, gmtime
    9 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
     9from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
    1010
    1111#Making assumptions about the location of scenario data
  • anuga_work/production/wollongong_2006/project_slide.py

    r4504 r4853  
    77import sys
    88from time import localtime, strftime, gmtime
    9 from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
     9from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
    1010
    1111if sys.platform == 'win32':
Note: See TracChangeset for help on using the changeset viewer.