Changeset 5669 for anuga_work/production/geraldton/run_geraldton.py

Timestamp:

Aug 20, 2008, 7:44:49 AM (16 years ago)

Author:

kristy

Message:

Updated

File:

• anuga_work/production/geraldton/run_geraldton.py (modified) (6 diffs)

anuga_work/production/geraldton/run_geraldton.py

@@ -78 +78 @@
     # Domain definitions
     #-----------------------------------------------------------------------
-
-    # Read in boundary from ordered sts file
-    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_boundary.txt')
-
-    # Combine sts polyline with landward points
-    bounding_polygon = urs_bounding_polygon + landward_bounding_polygon
-    
-    # counting segments
-    N = len(urs_bounding_polygon)-1
-    boundary_tags={'back': [N+2,N+3], 'side': [N,N+1,N+4],'ocean': range(N)}
+##
+##    # Read in boundary from ordered sts file
+##    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.boundaries_dir+'landward_boundary.txt')
+##
+##    # Combine sts polyline with landward points
+##    bounding_polygon = urs_bounding_polygon + landward_bounding_polygon
+##    
+##    # counting segments
+##    N = len(urs_bounding_polygon)-1
+##    boundary_tags={'back': [N+2,N+3], 'side': [N,N+1,N+4],'ocean': range(N)}
+
+    bounding_polygon = project.poly_all
+    
 
     
@@ -108 +111 @@
 
         create_mesh_from_regions(bounding_polygon,
-                             boundary_tags=boundary_tags,
+                             boundary_tags=project.boundary_tags,
                              maximum_triangle_area=project.res_poly_all,
                              interior_regions=project.interior_regions,
@@ -218 +221 @@
     Bd = Dirichlet_boundary([kwargs['tide'],0,0])
 
-    fid = NetCDFFile(boundary_urs_out+'.sts', 'r')    #Open existing file for read
-    sts_time=fid.variables['time'][:]+fid.starttime
-    tmin=min(sts_time)
-    tmax=max(sts_time)
-    fid.close()
-
-    print 'Boundary end time ', tmax-tmin
-    
 ##    Bf = Field_boundary(kwargs['boundary_file'],
 ##                domain, time_thinning=kwargs['time_thinning'], mean_stage=kwargs['tide'], 
@@ -232 +227 @@
     domain.set_boundary({'back': Br,
                          'side': Bd,
-                         'ocean': Bf}) 
+                         'ocean': Bd}) # change baxk to Bf when running properly
 
     kwargs['input_start_time']=domain.starttime
@@ -248 +243 @@
         domain.write_boundary_statistics(tags = 'ocean')
 
-        if t >= tmax-tmin:
-            print 'changed to tide boundary condition at ocean'
-            domain.set_boundary({'ocean': Bd}) 
             
     x, y = domain.get_maximum_inundation_location()
@@ -283 +275 @@
     kwargs['output_dir']=project.output_run_time_dir
     kwargs['elevation_file']=project.combined_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