Changeset 5578

Timestamp:

Jul 25, 2008, 5:21:30 PM (15 years ago)

Author:

kristy

Message:

updated sts boundary

Location:

anuga_work/production

Files:

• busselton/build_boundary.py (modified) (2 diffs)
• busselton/run_busselton.py (modified) (5 diffs)
• perth/build_boundary.py (modified) (3 diffs)
• perth/run_perth.py (modified) (2 diffs)

anuga_work/production/busselton/build_boundary.py

@@ -52 +52 @@
         verbose=True)
 
-# Read in boundary from ordered sts file
-urs_boundary_polygon=create_sts_boundary(scenario_name)
 
 
@@ -60 +58 @@
 
 
-

anuga_work/production/busselton/run_busselton.py

@@ -18 +18 @@
 from os import sep
 from os.path import dirname, basename
+import os
 from os import mkdir, access, F_OK
 from shutil import copy
@@ -30 +31 @@
 from anuga.shallow_water import Field_boundary
 from Numeric import allclose
-from anuga.shallow_water.data_manager import export_grid
+from anuga.shallow_water.data_manager import export_grid, create_sts_boundary
 
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
@@ -77 +78 @@
 
     # Read in boundary from ordered sts file
-    urs_bounding_polygon=create_sts_boundary(project.scenario_name)
+    urs_bounding_polygon=create_sts_boundary(os.path.join(project.boundaries_dir,project.scenario_name))
 
     # Reading the landward defined points, this incorporates the original clipping
     # polygon minus the 100m contour
-    landward_bounding_polygon = read_polygon(project.polygons_dir+'landward_bounding_polygon.txt')
+    landward_bounding_polygon = read_polygon(project.boundaries_dir+'landward_bounding_polygon.txt')
 
     # Combine sts polyline with landward points
@@ -104 +105 @@
         print 'start create mesh from regions'
         
-        create_mesh_from_regions(project.poly_all,
-                             boundary_tags=project.boundary_tags,
+        create_mesh_from_regions(bounding_polygon,
+                             boundary_tags=boundary_tags,
                              maximum_triangle_area=project.res_poly_all,
                              interior_regions=project.interior_regions,
@@ -255 +256 @@
     kwargs['bathy_file']=project.combined_dir_name+'.txt'
 #    kwargs['bathy_file']=project.combined_small_dir_name + '.pts'
-    kwargs['boundary_file']=project.boundaries_in_dir_name + '.sww'
+ 
     kwargs['file_name']=project.home+'detail.csv'
     kwargs['aa_scenario_name']=project.scenario_name

anuga_work/production/perth/build_boundary.py

@@ -21 +21 @@
 suffix='-z.grd'
 
-
-
-
 urs_filenames={}
 for filename in os.listdir(dir):
@@ -29 +26 @@
 
     urs_filenames[basename] = True
-
 
 # Make list of basenames  
@@ -55 +51 @@
         verbose=True)
 
-# Read in boundary from ordered sts file
-urs_boundary_polygon=create_sts_boundary(scenario_name)
 
 
 
 
-
-
-

anuga_work/production/perth/run_perth.py

@@ -17 +17 @@
 # Standard modules
 from os import sep
+import os
 from os.path import dirname, basename
 from os import mkdir, access, F_OK
@@ -77 +78 @@
 
     # Read in boundary from ordered sts file
-    urs_bounding_polygon=create_sts_boundary(project.scenario_name)
+    urs_bounding_polygon=create_sts_boundary(os.path.join(project.boundaries_dir,project.scenario_name))
 
     # Reading the landward defined points, this incorporates the original clipping