Changeset 4373

Timestamp:

Apr 13, 2007, 5:00:58 PM (18 years ago)

Author:

nick

Message:

update dampier

Location:

anuga_work/production/dampier_2006

Files:

• get_timeseries.py (modified) (3 diffs)
• project.py (modified) (6 diffs)
• run_dampier.py (modified) (6 diffs)

anuga_work/production/dampier_2006/get_timeseries.py

@@ -23 +23 @@
     
 # sww file created from URS boundary
-production_dirs = {'boundaries': '10000 yr wave height'
-                   #'20070307_224017_run': 'URS boundary normal'
+production_dirs = {#'boundaries': '10000 yr wave height'
+                   '20070413_033455_run': 'URS boundary normal'
                    }
->>>>>>> .r4304
 
     
-is_parallel = False
+is_parallel = True
 if is_parallel == True:
-    nodes = 2
+    nodes = 8
     
 # Generate figures
@@ -40 +39 @@
 #boundary_dir_filename= os.path.join(home,data,state,'onslow_tsunami_scenario_2006',an,bo,'SU-AU_high_res1.sww')
 #gauges_dir_name_simple = 
-if is_parallel == True:
-    print 'buggur'
+if is_parallel is True:
+    print 'bugger'
+    
+    for i in range(nodes):
+        print 'Sending node %d of %d' %(i,nodes)
+        swwfiles = {}
+        #reportname = report_name + '_%s' %(i)
+        for label_id in production_dirs.keys():
+            if label_id == 'boundaries':
+#                file_loc = project.boundaries_in_dir
+                swwfile = best_boundary_sww
+                print 'hi'
+            else:
+                file_loc = project.output_dir + label_id + sep
+                sww_extra = '_P%s_%s' %(i,nodes)
+                swwfile = file_loc + project.scenario_name + sww_extra + '.sww'
+                print 'swwfile',swwfile
+            swwfiles[swwfile] = label_id
+
+        texname, elev_output = sww2timeseries(swwfiles,
+                                              project.gauges_dir_name_simple,
+                                              production_dirs,
+                                              report = False,
+                                              #reportname = reportname,
+                                              plot_quantity = ['stage', 'momentum'],
+                                              generate_fig = False,
+                                              surface = False,
+                                              time_min = None,
+                                              time_max = None,
+                                              title_on = False,
+                                              verbose = True)
+            
+            #latex_output.append(texname)
    
 
@@ -60 +90 @@
     texname, elev_output = sww2timeseries(swwfiles,
                                           project.gauges_dir_name_simple,
->>>>>>> .r4304
                                           production_dirs,
                                           report = False,

anuga_work/production/dampier_2006/project.py

@@ -28 +28 @@
 print 'gtime: ', gtime
 
+#tide = -2.5
+#tide = 0.0
 tide = 2.4
 
@@ -150 +152 @@
 print 'Area of bounding polygon', polygon_area(poly_all)/1000000.0
 
-res_poly_all = 400000
-#res_poly_all = 500000
+#res_poly_all = 400000
+res_poly_all = 150000
 
 ###############################
@@ -161 +163 @@
 
 poly_dampier = read_polygon(polygons_dir+'dampier_town.csv')
-res_dampier = 1000
-#res_dampier = 500
-#res_dampier = 5000
+#res_dampier = 1000
+res_dampier = 500
 
 poly_karratha = read_polygon(polygons_dir+'karrathav2.csv')
@@ -169 +170 @@
 
 poly_karratha_town = read_polygon(polygons_dir+'karratha_townv2.csv')
-res_karratha_town = 1000
-#res_karratha_town = 500
-#res_karratha_town = 5000
+#res_karratha_town = 1000
+res_karratha_town = 500
 
 poly_facility = read_polygon(polygons_dir+'facility.csv')
@@ -180 +180 @@
 
 poly_coast = read_polygon(polygons_dir+'coastpoly.csv')
-#res_coast = 1000
-res_coast = 10000
+res_coast = 2500
+#res_coast = 10000
 
 poly_NWislands = read_polygon(polygons_dir+'nw_islands_area.csv')
@@ -254 +254 @@
                     [poly_karratha,res_karratha],[poly_karratha_town,res_karratha_town]]
 
-trigs_min = number_mesh_triangles(interior_regions_test, poly_all, res_poly_all)
+#trigs_min = number_mesh_triangles(interior_regions_test, poly_all, res_poly_all)
+trigs_min = number_mesh_triangles(interior_regions, poly_all, res_poly_all)
 
 print 'min number triangles', trigs_min

anuga_work/production/dampier_2006/run_dampier.py

@@ -28 +28 @@
 from anuga.shallow_water import File_boundary
 from anuga.shallow_water import Reflective_boundary
+from anuga.shallow_water import Field_boundary
 from Numeric import allclose
 
@@ -43 +44 @@
 #------------------------------------------------------------------------------
 
+#copy script must be before screen_catcher
+if myid == 0:
+    copy_code_files(project.output_run_time_dir,__file__, 
+                 dirname(project.__file__)+sep+ project.__name__+'.py' )
+barrier()
+
 start_screen_catcher(project.output_run_time_dir, myid, numprocs)
 
@@ -56 +63 @@
 
 # creates copy of code in output dir
-if myid == 0:
-    copy_code_files(project.output_run_time_dir,__file__, 
-                 dirname(project.__file__)+sep+ project.__name__+'.py' )
-barrier()
+
 
 print 'USER: ', project.user
@@ -199 +203 @@
 domain.set_maximum_allowed_speed(0.1) # Allow a little runoff (0.1 is OK)
 print 'domain id', id(domain)
-domain.beta_h = 0
-domain.limit2007 = 1
+#domain.beta_h = 0
+#domain.limit2007 = 1
 
 #-------------------------------------------------------------------------
@@ -212 +216 @@
 #                  domain, time_thinning=24, use_cache=True, verbose=True)
 Bf = Field_boundary(project.boundaries_dir_namea + '.sww',
-                  domain, time_thinning=12,mean_stage=tide, use_cache=True, verbose=True)
+                  domain, time_thinning=12, mean_stage=tide, use_cache=True, verbose=True)
 
 print 'finished reading boundary file'
@@ -237 +241 @@
     domain.write_time()
     domain.write_boundary_statistics(tags = 'ocean')
+    
+    domain.write_time(track_speeds=True)
 
 #for t in domain.evolve(yieldstep = 120, finaltime = 9000):