Changeset 4853

Timestamp:

Nov 22, 2007, 6:05:38 PM (17 years ago)

Author:

sexton

Message:

reflecting updated function in other files

Files:

• anuga_core/documentation/user_manual/anuga_user_manual.tex (modified) (1 diff)
• anuga_core/documentation/user_manual/demos/cairns/ExportResults.py (modified) (1 diff)
• anuga_core/documentation/user_manual/demos/cairns/runcairns.py (modified) (1 diff)
• anuga_core/source/anuga/fit_interpolate/interpolate.py (modified) (1 diff)
• anuga_work/production/broome_2006/project.py (modified) (2 diffs)
• anuga_work/production/broome_2006/project_urs.py (modified) (2 diffs)
• anuga_work/production/busselton_2006/project.py (modified) (2 diffs)
• anuga_work/production/dampier_2006/project.py (modified) (2 diffs)
• anuga_work/production/dampier_2006/project_urs.py (modified) (2 diffs)
• anuga_work/production/exmouth_2006/project.py (modified) (2 diffs)
• anuga_work/production/galle_2007/project.py (modified) (2 diffs)
• anuga_work/production/gold_coast_2007/project.py (modified) (1 diff)
• anuga_work/production/hobart_2006/project.py (modified) (2 diffs)
• anuga_work/production/newcastle_2006/project_slide.py (modified) (2 diffs)
• anuga_work/production/onslow_2006/project_grad.py (modified) (2 diffs)
• anuga_work/production/onslow_2006/project_urs.py (modified) (1 diff)
• anuga_work/production/perth_2006/project.py (modified) (2 diffs)
• anuga_work/production/pt_hedland_2006/project_urs.py (modified) (1 diff)
• anuga_work/production/shark_bay_2007/project.py (modified) (1 diff)
• anuga_work/production/sydney_2006/project_slide.py (modified) (1 diff)
• anuga_work/production/sydney_2006/smf_approx.py (modified) (2 diffs)
• anuga_work/production/wollongong_2006/project_kembla.py (modified) (1 diff)
• anuga_work/production/wollongong_2006/project_slide.py (modified) (1 diff)

anuga_core/documentation/user_manual/anuga_user_manual.tex

@@ -1274 +1274 @@
 \begin{figure}[hbt]
 \centerline{\includegraphics[scale=0.5]{graphics/slidedepth.jpg}}
-\caption{Maximum inundation map for the Cairns side scenario.}
+\caption{Maximum inundation map for the Cairns slide scenario.}
 \label{fig:maxdepthcairnsslide}
 \end{figure}

anuga_core/documentation/user_manual/demos/cairns/ExportResults.py

@@ -6 +6 @@
 from os import sep
 
-#scenario = 'slide'
-scenario = 'fixed_wave'
+scenario = 'slide'
+#scenario = 'fixed_wave'
 
 name = scenario + sep + scenario + 'source'

anuga_core/documentation/user_manual/demos/cairns/runcairns.py

@@ -165 +165 @@
 # 60 min square wave starting at 1 min, 50m high
 if scenario == 'fixed_wave':
-    # FIXME (Ole): Change this to Transmissive Momentum as
-    # suggested by Rajaraman (ticket:208)
-    Bw = Time_boundary(domain = domain,
-                       f=lambda t: [(60<t<3660)*50, 0, 0])
+    Bw = Transmissive_Momentum_Set_Stage_boundary(domain = domain,
+                          f=lambda t: [(60<t<3660)*50, 0, 0])
     domain.set_boundary({'ocean_east': Bw,
                          'bottom': Bd,

anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -557 +557 @@
                     out_interp_pts.append(ensure_numeric(interpolation_points[i]))
 
-                from anuga.utilities.polygon import plot_polygons_points
-                #out_interp_pts = take(interpolation_points,[indices])
-                title = 'Interpolation points fall outside specified mesh'
-                plot_polygons_points([mesh_boundary_polygon,interpolation_points,out_interp_pts],
-                                     ['line','point','outside'],figname='points_boundary_out',label=title,verbose=verbose)
+                if verbose is True:
+                    from anuga.utilities.polygon import plot_polygons_points
+                    #out_interp_pts = take(interpolation_points,[indices])
+                    title = 'Interpolation points fall outside specified mesh'
+                    plot_polygons_points([mesh_boundary_polygon,interpolation_points,out_interp_pts],
+                                         ['line','point','outside'],figname='points_boundary_out',label=title,verbose=verbose)
 
                 # Joaquim Luis suggested this as an Exception, so

anuga_work/production/broome_2006/project.py

@@ -7 +7 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, is_inside_polygon, number_mesh_triangles
 #from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_points_from_latlon_to_utm
 from anuga.utilities.system_tools import get_user_name
@@ -126 +126 @@
 # Domain definitions
 ###############################
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
 
 poly_all = read_polygon(polygons_dir+'extent_small.csv')

anuga_work/production/broome_2006/project_urs.py

@@ -6 +6 @@
 from os import sep, environ, getenv, getcwd,umask
 from os.path import expanduser, basename
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
 import sys
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
@@ -152 +152 @@
 # Domain definitions
 ###############################
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
 
 poly_all = read_polygon(polygons_dir+'extent_small.csv')
+# to test update of plot_polygons - now allows points and polygon to be
+# plotted together
+#point = read_polygon(polygons_dir+'neg20_coast_contour_pts.csv')
+#p2 = read_polygon(polygons_dir+'broome_north_coast_inside_extent.csv')
+#label=None
+#plot_polygons_points([poly_all,point,p2],['line','point','outside'],figname='test',label=label)
+#plot_polygons_points([poly_all,point],figname='test')
 #poly_all = read_polygon(polygons_dir+'extent.csv')
 res_poly_all = 150000*res_factor

anuga_work/production/busselton_2006/project.py

@@ -7 +7 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, is_inside_polygon, number_mesh_triangles
 #from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_points_from_latlon_to_utm
 from anuga.utilities.system_tools import get_user_name
@@ -129 +129 @@
 res_busselton2 = 500
 
-#plot_polygons([polyAll,poly_broome1,poly_broome2,poly_broome3],'boundingpoly2',verbose=False)
+#plot_polygons_points([polyAll,poly_broome1,poly_broome2,poly_broome3],figname='boundingpoly2',verbose=False)
 
 interior_regions = [[poly_busselton1,res_busselton1],[poly_busselton2,res_busselton2]]

anuga_work/production/dampier_2006/project.py

@@ -6 +6 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_from_latlon_to_utm
 from anuga.utilities.system_tools import get_user_name
@@ -237 +237 @@
 
 
-#plot_polygons([poly_dampier,poly_karratha,poly_karratha_town,poly_delambre,
+#plot_polygons_points([poly_dampier,poly_karratha,poly_karratha_town,poly_delambre,
 #                poly_coast,poly_NWislands,poly_island0,poly_island1,poly_island2,
 #                poly_island3,poly_island4,poly_island5,poly_island6,
 #                poly_island7,poly_island8,poly_ref_nw4,poly_ref_nw5,
-#                poly_ref_nw6,poly_ref_nw7,poly_ref_nw8,poly_all],'poly_pic')
+#                poly_ref_nw6,poly_ref_nw7,poly_ref_nw8,poly_all],figname='poly_pic')
 
 interior_regions = [[poly_dampier,res_dampier], 

anuga_work/production/dampier_2006/project_urs.py

@@ -4 +4 @@
 from os import sep, environ, getenv, getcwd,umask
 from os.path import expanduser, basename
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
 import sys
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
@@ -243 +243 @@
 
 
-#plot_polygons([poly_dampier,poly_karratha,poly_karratha_town,poly_delambre,
+#plot_polygons_points([poly_dampier,poly_karratha,poly_karratha_town,poly_delambre,
 #                poly_coast,poly_NWislands,poly_island0,poly_island1,poly_island2,
 #                poly_island3,poly_island4,poly_island5,poly_island6,
 #                poly_island7,poly_island8,poly_ref_nw4,poly_ref_nw5,
-#                poly_ref_nw6,poly_ref_nw7,poly_ref_nw8,poly_all],'poly_pic')
+#                poly_ref_nw6,poly_ref_nw7,poly_ref_nw8,poly_all],figname='poly_pic')
 
 interior_regions = [[poly_dampier,res_dampier], 

anuga_work/production/exmouth_2006/project.py

@@ -5 +5 @@
 from os import sep, environ, getenv, getcwd,umask
 from os.path import expanduser, basename
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
 import sys
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
@@ -154 +154 @@
 # Domain definitions
 ###############################
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
 
 poly_all = read_polygon(polygons_dir+'extent_more_points.csv')

anuga_work/production/galle_2007/project.py

@@ -8 +8 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, is_inside_polygon, \
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, is_inside_polygon, \
                                     number_mesh_triangles, polygon_area
 from anuga.utilities.system_tools import get_user_name
@@ -133 +133 @@
                     [poly_canal, canal_res]]
 
-#plot_polygons([bounding_polygon,poly_intermediate,\
+#plot_polygons_points([bounding_polygon,poly_intermediate,\
 #               poly_shallow,poly_coast,poly_canal],\
-#              'boundingpoly',verbose=False)
+#              figname='boundingpoly',verbose=False)
 
 trigs_min = number_mesh_triangles(interior_regions, bounding_polygon, regional_res)

anuga_work/production/gold_coast_2007/project.py

@@ -7 +7 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
 
 if sys.platform == 'win32':

anuga_work/production/hobart_2006/project.py

@@ -7 +7 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_from_latlon_to_utm
 
@@ -149 +149 @@
 # Mark run - morning Fri 29 Sep; surrounds -100m and 20mish elevation
 polyAll = read_polygon(polygondir+'new_extent_2.csv')
-#plot_polygons([polyAll, polyAll2],'boundingpoly',verbose=False)
+#plot_polygons_points([polyAll, polyAll2],figname='boundingpoly',verbose=False)
 #print 'Area of bounding polygon', polygon_area(polyAll)
 polyAll_refine = read_polygon(polygondir+'extent_refine.csv')

anuga_work/production/newcastle_2006/project_slide.py

@@ -7 +7 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
 
 if sys.platform == 'win32':
@@ -98 +98 @@
 poly_entrance_c0 = read_polygon(polygondir+'entrance.csv')
 
-#plot_polygons([polyAll,poly_local,poly_newcastle],'fig',verbose=True)
+#plot_polygons_points([polyAll,poly_local,poly_newcastle],figname='fig',verbose=True)
 ###################################################################
 # Clipping regions for export to asc and regions for clipping data

anuga_work/production/onslow_2006/project_grad.py

@@ -6 +6 @@
 from os import sep, environ, getenv, getcwd, umask
 from os.path import expanduser, basename, join
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
 import sys
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees
@@ -39 +39 @@
 finaltime = 40000
 starttime = 3600 # Action starts around 9000
-setup='final'
-#setup = 'trial'
+#setup='final'
+setup = 'trial'
 which_data = 'original'
 #which_data = 'revised'

anuga_work/production/onslow_2006/project_urs.py

@@ -6 +6 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_from_latlon_to_utm
 from anuga.utilities.system_tools import get_user_name, get_host_name

anuga_work/production/perth_2006/project.py

@@ -7 +7 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, is_inside_polygon, number_mesh_triangles
 #from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees, convert_points_from_latlon_to_utm
 from anuga.utilities.system_tools import get_user_name
@@ -118 +118 @@
 # Domain definitions
 ###############################
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
 
 poly_all = read_polygon(polygons_dir+'bounding_poly.csv')

anuga_work/production/pt_hedland_2006/project_urs.py

@@ -5 +5 @@
 from os import sep, environ, getenv, getcwd,umask
 from os.path import expanduser, basename
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
 import sys
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees

anuga_work/production/shark_bay_2007/project.py

@@ -7 +7 @@
 from os import sep, environ, getenv, getcwd, umask
 from os.path import expanduser, basename, join
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon, number_mesh_triangles
 import sys
 from anuga.coordinate_transforms.redfearn import degminsec2decimal_degrees

anuga_work/production/sydney_2006/project_slide.py

@@ -7 +7 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
 
 if sys.platform == 'win32':

anuga_work/production/sydney_2006/smf_approx.py

@@ -24 +24 @@
 # Application specific imports
 import project                 # Definition of file names and polygons
-from anuga.shallow_water.smf import slide_tsunami, slump_tsunami  # Function for submarine mudslide 
 
 def stats_slide(depth,length,width,thickness,slope,gamma):
@@ -254 +253 @@
 
 close('all')
-
-##import sys; sys.exit()
-##tsunami_source = slide_tsunami(length=16840.0,
-##                               width=8860.0,
-##                               depth=2087.0,
-##                               slope=4.0,
-##                               thickness=424.0,
-##                               gamma=1.46,
-##                               #dphi=0.23,
-##                               x0=project.slump_origin2[0], 
-##                               y0=project.slump_origin2[1], 
-##                               #alpha=0.0, 
-##                               #domain=domain,
-##                               verbose=True)
-##        tsunami_source = slump_tsunami(length=16840.0,
-##                                       width=8860.0,
-##                                       #depth=2087.0,
-##                                       slope=4.0,
-##                                       thickness=424.0,
-##                                       gamma=1.45,
-##                                       #dphi=0.23,
-##                                       #radius = 3330,
-##                                       x0=project.slump_origin2[0], 
-##                                       y0=project.slump_origin2[1], 
-##                                       #alpha=0.0, 
-##                                       #domain=domain,
-##                                       verbose=True)

anuga_work/production/wollongong_2006/project_kembla.py

@@ -7 +7 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
 
 #Making assumptions about the location of scenario data

anuga_work/production/wollongong_2006/project_slide.py

@@ -7 +7 @@
 import sys
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
+from anuga.utilities.polygon import read_polygon, plot_polygons_points, polygon_area, is_inside_polygon
 
 if sys.platform == 'win32':