Changeset 4942

Timestamp:

Jan 16, 2008, 9:56:35 AM (16 years ago)

Author:

nick

Message:

update run_pt_hedland

Location:

anuga_work/production/pt_hedland_2006

Files:

• project_urs.py (modified) (1 diff)
• run_pt_hedland_urs.py (modified) (2 diffs)

anuga_work/production/pt_hedland_2006/project_urs.py

@@ -71 +71 @@
 
 #final topo name
-combined_name ='pt_hedland_combined_elevation'
+combined_name ='pt_hedland_combined_elevation_test'
 combined_small_name = 'pt_hedland_combined_elevation_small'
 combined_smallest_name = 'pt_hedland_export'

anuga_work/production/pt_hedland_2006/run_pt_hedland_urs.py

@@ -45 +45 @@
     
     print 'tide',kwargs['tide']
-    kwargs['est_num_trigs']=project_urs.trigs_min
-    kwargs['num_cpu']=numprocs
-    kwargs['host']=project_urs.host
-    kwargs['res_factor']=project_urs.res_factor
-    kwargs['starttime']=project_urs.starttime
-    kwargs['yieldstep']=project_urs.yieldstep
-    kwargs['finaltime']=project_urs.finaltime
-    
-    kwargs['output_dir']=project_urs.output_run_time_dir
-    kwargs['bathy_file']=project_urs.combined_dir_name + '.pts'
-    kwargs['boundary_file']=project_urs.boundaries_in_dir_name + '.sww'
+#    kwargs['est_num_trigs']=project_urs.trigs_min
+#    kwargs['num_cpu']=numprocs
+#    kwargs['host']=project_urs.host
+#    kwargs['res_factor']=project_urs.res_factor
+#    kwargs['starttime']=project_urs.starttime
+#    kwargs['yieldstep']=project_urs.yieldstep
+#    kwargs['finaltime']=project_urs.finaltime
+#    
+#    kwargs['output_dir']=project_urs.output_run_time_dir
+#    kwargs['bathy_file']=project_urs.combined_dir_name + '.pts'
+#    kwargs['boundary_file']=project_urs.boundaries_in_dir_name + '.sww'
 
     #------------------------------------------------------------------------------
@@ -253 +253 @@
 if __name__ == "__main__":
 
-    run_model(file_name=project_urs.home+'detail.csv', aa_scenario_name=project_urs.scenario_name,
-              ab_time=project_urs.time, res_factor= project_urs.res_factor, tide=project_urs.tide, user=project_urs.user,
-              alpha = project_urs.alpha, friction=project_urs.friction,
-              time_thinning = project_urs.time_thinning,
-              dir_comment=project_urs.dir_comment)
-
-
+#    run_model(file_name=project_urs.home+'detail.csv', aa_scenario_name=project_urs.scenario_name,
+#              ab_time=project_urs.time, res_factor= project_urs.res_factor, tide=project_urs.tide, user=project_urs.user,
+#              alpha = project_urs.alpha, friction=project_urs.friction,
+#              time_thinning = project_urs.time_thinning,
+#              dir_comment=project_urs.dir_comment)
+    kwargs={}
+    kwargs['est_num_trigs']=project_urs.trigs_min
+    kwargs['num_cpu']=numprocs
+    kwargs['host']=project_urs.host
+    kwargs['res_factor']=project_urs.res_factor
+    kwargs['starttime']=project_urs.starttime
+    kwargs['yieldstep']=project_urs.yieldstep
+    kwargs['finaltime']=project_urs.finaltime
+    
+    kwargs['output_dir']=project_urs.output_run_time_dir
+#    kwargs['bathy_file']=project_urs.combined_dir_name+'.txt'
+    kwargs['bathy_file']=project_urs.combined_dir_name + '.pts'
+    kwargs['boundary_file']=project_urs.boundaries_in_dir_name + '.sww'
+    kwargs['file_name']=project_urs.home+'detail.csv'
+    kwargs['aa_scenario_name']=project_urs.scenario_name
+    kwargs['ab_time']=project_urs.time
+    kwargs['res_factor']= project_urs.res_factor
+    kwargs['tide']=project_urs.tide
+    kwargs['user']=project_urs.user
+    kwargs['alpha'] = project_urs.alpha
+    kwargs['friction']=project_urs.friction
+    kwargs['time_thinning'] = project_urs.time_thinning
+    kwargs['dir_comment']=project_urs.dir_comment
+
+    run_model(**kwargs)
+      
+    if myid==0:
+        export_model(**kwargs)
+    barrier
+
+