Changeset 6255

Timestamp:

Jan 31, 2009, 5:16:00 AM (16 years ago)

Author:

ole

Message:

Started some cleaning up of standardised demo

File:

• anuga_work/production/busselton/standardised_version/run_busselton.py (modified) (10 diffs)

anuga_work/production/busselton/standardised_version/run_busselton.py

@@ -78 +78 @@
 
     # Read in boundary from ordered sts file
-    urs_bounding_polygon=create_sts_boundary(os.path.join(project.boundaries_dir_event,project.scenario_name))
+    urs_bounding_polygon=create_sts_boundary(os.path.join(project.boundaries_dir_event, project.scenario_name))
 
     # Reading the landward defined points, this incorporates the original clipping
@@ -125 +125 @@
     print 'triangles',len(domain)
     
-    kwargs['act_num_trigs']=len(domain)
 
 
@@ -134 +133 @@
 
     # sets the initial stage in the offcoast region only
-    IC = Polygon_function( [(project.poly_mainland, 0),(project.poly_marina, 0)], default = kwargs['tide'],
-                             geo_reference = domain.geo_reference)
+    IC = Polygon_function( [(project.poly_mainland, 0),
+                            (project.poly_marina, 0)], 
+                           default = project.tide,
+                           geo_reference = domain.geo_reference)
     domain.set_quantity('stage', IC)
-    #domain.set_quantity('stage',kwargs['tide'] )
-    domain.set_quantity('friction', kwargs['friction']) 
+
+    domain.set_quantity('friction', project.friction) 
     
     print 'Start Set quantity',kwargs['elevation_file']
@@ -146 +147 @@
                         use_cache = False,
                         verbose = True,
-                        alpha = kwargs['alpha'])
+                        alpha = project.alpha)
     print 'Finished Set quantity'
 
@@ -160 +161 @@
     #------------------------------------------------------
     print 'domain id', id(domain)
-    domain.set_name(kwargs['scenario_name'])
+    domain.set_name(project.scenario_name)
     domain.set_datadir(kwargs['output_dir'])
     domain.set_default_order(2)                 # Apply second order scheme
@@ -178 +179 @@
 
     Br = Reflective_boundary(domain)
-    Bd = Dirichlet_boundary([kwargs['tide'],0,0])
+    Bd = Dirichlet_boundary(project.tide,0,0])
     
     print 'Available boundary tags', domain.get_boundary_tags()
@@ -193 +194 @@
                          'ocean': Bf}) 
 
-    kwargs['input_start_time']=domain.starttime
 
     print'finish set boundary'
@@ -202 +202 @@
     t0 = time.time()
 
-    for t in domain.evolve(yieldstep = project.yieldstep, finaltime = kwargs['finaltime']
-                       ,skip_initial_step = False): 
+    for t in domain.evolve(yieldstep=project.yieldstep, 
+                           finaltime=project.finaltime,
+                           skip_initial_step=False): 
         domain.write_time()
         domain.write_boundary_statistics(tags = 'ocean')
@@ -214 +215 @@
     print 'Simulation took %.2f seconds' %(time.time()-t0)
 
-    #kwargs 'completed' must be added to write the final parameters to file
+
     kwargs['completed']=str(time.time()-t0)
      
     store_parameters(**kwargs)
-     
-    print 'memory usage before del domain1',mem_usage()
+
     
     
@@ -227 +227 @@
     kwargs={}
     kwargs['file_name']=project.dir_comment
-    kwargs['finaltime']=project.finaltime
     kwargs['output_dir']=project.output_run_time_dir
     kwargs['elevation_file']=project.combined_dir_name+'.pts'
-    kwargs['scenario_name']=project.scenario_name
-    kwargs['tide']=project.tide
-    kwargs['alpha'] = project.alpha
-    kwargs['friction']=project.friction
-    #kwargs['num_cpu']=numprocs
-    #kwargs['host']=project.host
-    #kwargs['starttime']=project.starttime
-    #kwargs['yieldstep']=project.yieldstep
-    #kwargs['user']=project.user
-    #kwargs['time_thinning'] = project.time_thinning
       
     run_model(**kwargs)