Changeset 4308

Timestamp:

Mar 21, 2007, 2:17:41 PM (18 years ago)

Author:

nick

Message:

update to dampier

Location:

anuga_work/production/dampier_2006

Files:

• check_data.py (added)
• get_timeseries.py (modified) (5 diffs)
• get_timeseries_and.py (added)
• get_timeseries_bf.py (added)
• project.py (modified) (3 diffs)
• run_dampier.py (modified) (5 diffs)

anuga_work/production/dampier_2006/get_timeseries.py

@@ -23 +23 @@
     
 # sww file created from URS boundary
-production_dirs = {#'20070206_005106_run': '10000 yr wave height'}
-                   '20070223_031527_run': 'URS boundary condition'}
+production_dirs = {'boundaries': '10000 yr wave height'
+                   #'20070307_224017_run': 'URS boundary normal'
+                   }
 
+    
 is_parallel = False
 if is_parallel == True:
@@ -33 +35 @@
 swwfiles = {}
 
+#J:\inundation\data\western_australia\onslow_tsunami_scenario_2006\anuga\boundaries SU-AU_high_res1.sww
+
+#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'
+   
 
-    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 = file_loc + sep + '20070223_031527_run' + sep + 'dampier.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'
-            swwfiles[swwfile] = label_id
-
-        texname, elev_output = sww2timeseries(swwfiles,
-                                              project.gauges_dir_name_test,
-                                              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)
-    
 else:
     
@@ -70 +48 @@
         
         if label_id == 'boundaries':
+                print 'boundaries'
                 file_loc = project.boundaries_in_dir
-                swwfile = file_loc + sep + '20070223_031527_run' + sep + 'dampier.sww'
+                swwfile = project.boundaries_dir_name3 + '.sww'
+#                swwfile = boundary_dir_filename
         else:
             file_loc = project.output_dir + label_id + sep
@@ -78 +58 @@
         
     texname, elev_output = sww2timeseries(swwfiles,
-                                          project.gauges_dir_name_test,
+                                          project.gauges_dir_name_simple,
                                           production_dirs,
                                           report = False,
                                           #reportname = report_name,
-                                          plot_quantity = ['stage', 'momentum'],
+#                                          plot_quantity = ['stage', 'momentum'],
+                                          plot_quantity = ['stage', 'xmomentum', 'ymomentum'],
                                           surface = False,
                                           time_min = None,
@@ -88 +69 @@
                                           title_on = False,
                                           verbose = True)
+                                          

anuga_work/production/dampier_2006/project.py

@@ -99 +99 @@
 boundaries_dir_name3 = boundaries_dir + boundaries_name+'_test_8500_12000'
 boundaries_dir_name4 = boundaries_dir + boundaries_name+'_8500_12000_no_zone'
-boundaries_dir_name5 = boundaries_dir + boundaries_name+'_not-gridded'
+boundaries_dir_name5 = boundaries_dir + '20061026_173920_build'+sep+'dampier'
+boundaries_dir_name6 = boundaries_dir + 'SU-AU'
 
 #boundaries_time_dir = home+sep+state+sep+scenario+sep+'anuga'+sep+'boundaries'+sep+build_time+sep
@@ -113 +114 @@
 gauge_name = 'dampier_gauges_up2.csv' #'dampier.csv'
 gauge_name_test = 'dampier_gauges_up_test.csv' #'dampier.csv'
+gauge_name_simple = 'dampier_gauges_simple.csv' 
 gauges_dir = home+sep+state+sep+scenario+sep+'anuga'+sep+'gauges'+sep
 gauges_dir_name = gauges_dir + gauge_name
 gauges_dir_name_test = gauges_dir + gauge_name_test
+gauges_dir_name_simple = gauges_dir + gauge_name_simple
 
 
@@ -176 +179 @@
 
 poly_coast = read_polygon(polygons_dir+'coastpoly.csv')
-res_coast = 1000
-#res_coast = 10000
+#res_coast = 1000
+res_coast = 10000
 
 poly_NWislands = read_polygon(polygons_dir+'nw_islands_area.csv')

anuga_work/production/dampier_2006/run_dampier.py

@@ -166 +166 @@
 #                    filename = project.combined_dir_name + '.pts',
 # MUST USE TXT FILES FOR CACHING TO WORK!
-                    filename = project.combined_smaller_dir_name + '.txt',
+                    filename = project.combined_smallest_dir_name + '.txt',
                     use_cache = True,
                     verbose = True,
@@ -203 +203 @@
 print 'Reading Boundary file',project.boundaries_dir_name4 + '.sww'
 #Bf = File_boundary(boundaries_dir_name + '.sww',
-Bf = File_boundary(project.boundaries_dir_name4 + '.sww',
-                  domain, time_thinning=4, use_cache=True, verbose=True)
+Bf = File_boundary(project.boundaries_dir_name3 + '.sww',
+                  domain, time_thinning=24, use_cache=True, verbose=True)
 
 print 'finished reading boundary file'
@@ -226 +226 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 60, finaltime = 9000):
+for t in domain.evolve(yieldstep = 60, finaltime = 3400):
     domain.write_time()
     domain.write_boundary_statistics(tags = 'ocean')
@@ -233 +233 @@
 #    domain.write_time()
 #    domain.write_boundary_statistics(tags = 'ocean')
-     
+'''     
 for t in domain.evolve(yieldstep = 60, finaltime = 28800
                        ,skip_initial_step = True):
@@ -243 +243 @@
     domain.write_time()
     domain.write_boundary_statistics(tags = 'ocean')    
-
+'''
 x, y = domain.get_maximum_inundation_location()
 q = domain.get_maximum_inundation_elevation()