Changeset 7577

Timestamp:

Dec 4, 2009, 10:43:32 AM (15 years ago)

Author:

jgriffin

Message:

 

Location:

anuga_work/production/new_south_wales/batemans_bay

Files:

• Arc_asc2raster_GDA94z56.py (modified) (2 diffs)
• compare_inundation_areas.py (modified) (8 diffs)
• export_results_max.py (modified) (2 diffs)
• get_timeseries.py (modified) (1 diff)
• plot_area_comp.py (added)
• plot_area_energy.py (added)
• plot_area_energy2.py (added)
• project.py (modified) (2 diffs)

anuga_work/production/new_south_wales/batemans_bay/Arc_asc2raster_GDA94z56.py

@@ -25 +25 @@
 output_dir = "anuga\\outputs\\"
 
-time_dir1 = '20090529_143527_run_final_0.0_51424_jgriffin'
+time_dir1 = '20090601_172248_run_final_0.0_58284__250m_jgriffin'
 
 time_dirs = [time_dir1]#, time_dir2, time_dir3, time_dir4, time_dir5]#, time_dir6, time_dir7, time_dir8, time_dir9]
@@ -52 +52 @@
 
     generate_filename = []
-    input_ascii = glob.glob(folder + '*elevation_max.asc')
+    input_ascii = glob.glob(folder + '*.asc')
     print time_dir
 

anuga_work/production/new_south_wales/batemans_bay/compare_inundation_areas.py

@@ -34 +34 @@
 boundary_path = "N:\\georisk_models\\inundation\\data\\new_south_wales\\batemans_bay_tsunami_scenario_2009\\anuga\\boundaries\\"
 boundary_file_name = 'wave_energy_summary.csv'
-out_file_name = 'area_comparisons.csv'
+out_file_name_madsen = 'area_comparisons_madsen.csv'
+out_file_name_energy = 'area_comparisons_energy.csv'
+out_file_name_anuga = 'area_comparisons_anuga.csv'
+out_file_name_anuga_sum = 'area_comparisons_anuga_sum.csv'
 #figure = 'area_comparisons.png'
 
 boundary_file = join(boundary_path,boundary_file_name)
-out_file = join(boundary_path, out_file_name)
-#figure_path = join(boundary_path, 'figures',figure)
-plot = True
+out_file_madsen = join(boundary_path, out_file_name_madsen)
+out_file_energy = join(boundary_path, out_file_name_energy)
+out_file_anuga = join(boundary_path, out_file_name_anuga)
+out_file_anuga_sum = join(boundary_path, out_file_name_anuga_sum)
+
 
 event_dict = {'Event1_MSL':58346,
 ##              'Event1_HAT':58346,
               'Event2_MSL':51204,
-##              'Event2_HAT':51204,
+              'Event2_HAT':51204,
               'Event3_MSL':58284,#,
 ##              'Event3_HAT':58284,
               'Puysegur_200yr':58129,
-              'Puysegur_500yr':58115,
+##              'Puysegur_500yr':58115,
               'Puysegur_1000yr':58226,
               'Puysegur_5000yr':58286,
@@ -60 +65 @@
 
 # Dictionaries for storing area comparison
-area_comp = defaultdict(list)
-area_percent = defaultdict(list)
+area_comp_madsen = defaultdict(list)
+area_comp_energy = defaultdict(list)
+area_percent_madsen = defaultdict(list)
+area_percent_energy = defaultdict(list)
+area_total_anuga = defaultdict(list)
+anuga_sum_areas = {}
 
 boundaries = file(boundary_file,'r')
@@ -73 +82 @@
     instantaneous_energy = line_split[2]
     run_up_madsen = line_split[3][0:5]
+    run_up_energy = line_split[4][0:5]
     event_name = False
     for key, value in event_dict.iteritems():
@@ -86 +96 @@
     #break
 
-
+    do_all = True
 
     
     ##run_up_madsen = 6.0
     run_up_height = str(run_up_madsen)
-    run_up_name = run_up_height.replace('.','_')[0]
+    run_up_name = run_up_height.replace('.','_')[0:5]
+    energy_run_up_height = str(run_up_energy)
+    energy_run_up_name = run_up_energy.replace('.','_')[0:5]
 
 
     ####################################################################################
-    ##    Extract areas for analytical solution
+    ##    Extract areas for Madsen analytical solution
     ####################################################################################
+    print '\nDoing Madsen solution...'
     # Local variables...
     elevation = filePath+"elevation\\elevation.gdb\\elevation"
@@ -105 +118 @@
     elevation_less = filePath+"elevation\\features.gdb\\elevation_"+run_up_name+"_less"
     batemans_bay_SMARTLINE = "N:\\georisk_models\\inundation\\data\\new_south_wales\\coastline\\batemans_bay_SMARTLINE.shp"
-    elevation_less_final = filePath+"elevation\\features.gdb\\elevation_less_final"
-
-    # Process: Extract elevation data by Mask...
-    print 'check if elevation already extracted'
-    if gp.Exists(elevation_extract)!=True:
-        print 'not already extracted'
-        print 'extracting by mask'
-        gp.ExtractByMask_sa(elevation, inundation_area1, elevation_extract)
+    elevation_less_final = filePath+"elevation\\features.gdb\\elevation_"+run_up_name+"_less_final"
+    elevation_less_final_dis = filePath+"elevation\\features.gdb\\elevation_"+run_up_name+"_less_final_dis"
+
+    # Check if already done...
+##    if do_all!=True:
+##        print 'continuing'
+    if gp.Exists(elevation_less_final_dis):
+        print 'analysis already done, skipping to next one'
     else:
-        print 'extracted elevation already exists'
-
-    # Process: Reclassify elevation data
-    print 'check if elevation already reclassified'
-    if gp.Exists(elevation_reclass)!=True:
-        print 'reclassify based on elevation height of:', run_up_height
-        reclass_level = "-200 "+run_up_height+" 1;"+run_up_height+" 300 0"
-        gp.Reclassify_sa(elevation_extract, "Value", reclass_level, elevation_reclass, "DATA")
+        # Process: Extract elevation data by Mask...
+        print 'check if elevation already extracted'
+        if gp.Exists(elevation_extract)!=True:
+            print 'not already extracted'
+            print 'extracting by mask'
+            gp.ExtractByMask_sa(elevation, inundation_area1, elevation_extract)
+        else:
+            print 'extracted elevation already exists'
+
+        # Process: Reclassify elevation data
+        print 'check if elevation already reclassified'
+        if gp.Exists(elevation_reclass)!=True:
+            print 'reclassify based on elevation height of:', run_up_height
+            reclass_level = "-200 "+run_up_height+" 1;"+run_up_height+" 300 0"
+            gp.Reclassify_sa(elevation_extract, "Value", reclass_level, elevation_reclass, "DATA")
+        else:
+            print 'elevation has previously been reclassified for this height:', run_up_height
+
+        # Process: Raster to Polygon...
+        print 'check if already converted from raster to polyon'
+        if gp.Exists(elevation_poly)!=True:
+            print 'raster to polyon'
+            gp.RasterToPolygon_conversion(elevation_reclass, elevation_poly, "NO_SIMPLIFY", "VALUE")
+        else:
+            print 'elevation raster already converted to polygon'
+
+        # Process: Select...
+        print 'select by attribute'
+        gp.Select_analysis(elevation_poly, elevation_less, "\"GRIDCODE\" = 1")
+
+        # Process: Create layer...
+        print 'creating layers'
+        gp.MakeFeatureLayer(batemans_bay_SMARTLINE,'smartline_layer')
+        gp.MakeFeatureLayer(elevation_less,'elevation_layer')
+
+        # Process: Select Layer By Location...
+        print 'select by location'
+        gp.SelectLayerByLocation_management('elevation_layer', "INTERSECT", 'smartline_layer', "", "NEW_SELECTION")
+        print 'joining'
+        print 'inundation_area1',inundation_area1
+        print 'energy_less_final',elevation_less_final
+        gp.SpatialJoin_analysis('elevation_layer',inundation_area1, elevation_less_final,"JOIN_ONE_TO_ONE","","","INTERSECTS")
+
+        print 'dissolving fields'
+        gp.Dissolve_management(elevation_less_final,elevation_less_final_dis,'inundation_ID')
+
+
+
+   ####################################################################################
+    ##    Extract areas for Energy Balance analytical solution
+    ####################################################################################
+    print '\nDoing energy solution...'
+    # Local variables...
+    elevation = filePath+"elevation\\elevation.gdb\\elevation"
+    elevation_extract = filePath+"elevation\\elevation.gdb\\elevation_extract"
+    inundation_area1 = "N:\\georisk_models\\inundation\data\\new_south_wales\\batemans_bay_tsunami_scenario_2009\\anuga\\polygons\\polygons.gdb\inundation_area1"
+    energy_reclass = filePath+"elevation\\elevation.gdb\\energy_"+energy_run_up_name+"_reclass"
+    energy_poly = filePath+"elevation\\features.gdb\\energy_"+energy_run_up_name+"_poly"
+    energy_less = filePath+"elevation\\features.gdb\\energy_"+energy_run_up_name+"_less"
+    batemans_bay_SMARTLINE = "N:\\georisk_models\\inundation\\data\\new_south_wales\\coastline\\batemans_bay_SMARTLINE.shp"
+    energy_less_final = filePath+"elevation\\features.gdb\\energy_"+energy_run_up_name+"_less_final"
+    energy_less_final_dis = filePath+"elevation\\features.gdb\\energy_"+energy_run_up_name+"_less_final_dis"
+
+    # Check if already done...
+##    if do_all!=True:
+##        print 'continuing'
+    if gp.Exists(energy_less_final_dis):
+        print 'analysis already done, skipping to next one'
     else:
-        print 'elevation has previously been reclassified for this height:', run_up_height
-
-    # Process: Raster to Polygon...
-    print 'check if already converted from raster to polyon'
-    if gp.Exists(elevation_poly)!=True:
-        print 'raster to polyon'
-        gp.RasterToPolygon_conversion(elevation_reclass, elevation_poly, "NO_SIMPLIFY", "VALUE")
-    else:
-        print 'elevation raster already converted to polygon'
-
-    # Process: Select...
-    print 'select by attribute'
-    gp.Select_analysis(elevation_poly, elevation_less, "\"GRIDCODE\" = 1")
-
-    # Process: Create layer...
-    print 'creating layers'
-    gp.MakeFeatureLayer(batemans_bay_SMARTLINE,'smartline_layer')
-    gp.MakeFeatureLayer(elevation_less,'elevation_layer')
-
-    # Process: Select Layer By Location...
-    print 'select by location'
-    gp.SelectLayerByLocation_management('elevation_layer', "INTERSECT", 'smartline_layer', "", "NEW_SELECTION")
-    print 'joining'
-    gp.SpatialJoin_analysis('elevation_layer',inundation_area1, elevation_less_final,"JOIN_ONE_TO_ONE","","","INTERSECTS")
-
-    # Process: Copy Features...
-    ##print 'copy features to output feature class'
-    ##gp.CopyFeatures_management('elevation_layer', elevation_less_final, "", "0", "0", "0")
-
+        # Process: Extract elevation data by Mask...
+        print 'check if elevation already extracted'
+        if gp.Exists(elevation_extract)!=True:
+            print 'not already extracted'
+            print 'extracting by mask'
+            gp.ExtractByMask_sa(elevation, inundation_area1, elevation_extract)
+        else:
+            print 'extracted elevation already exists'
+
+        # Process: Reclassify elevation data
+        print 'check if elevation already reclassified'
+        if gp.Exists(energy_reclass)!=True:
+            print 'reclassify based on elevation height of:', energy_run_up_height
+            reclass_level = "-200 "+energy_run_up_height+" 1;"+energy_run_up_height+" 300 0"
+            gp.Reclassify_sa(elevation_extract, "Value", reclass_level, energy_reclass, "DATA")
+        else:
+            print 'elevation has previously been reclassified for this height:', energy_run_up_height
+
+        # Process: Raster to Polygon...
+        print 'check if already converted from raster to polyon'
+        if gp.Exists(energy_poly)!=True:
+            print 'raster to polyon'
+            gp.RasterToPolygon_conversion(energy_reclass, energy_poly, "NO_SIMPLIFY", "VALUE")
+        else:
+            print 'elevation raster already converted to polygon'
+
+        # Process: Select...
+        print 'select by attribute'
+        gp.Select_analysis(energy_poly, energy_less, "\"GRIDCODE\" = 1")
+
+        # Process: Create layer...
+        print 'creating layers'
+        gp.MakeFeatureLayer(batemans_bay_SMARTLINE,'smartline_layer')
+        gp.MakeFeatureLayer(energy_less,'elevation_layer')
+
+        # Process: Select Layer By Location...
+        print 'select by location'
+        gp.SelectLayerByLocation_management('elevation_layer', "INTERSECT", 'smartline_layer', "", "NEW_SELECTION")
+        print 'joining'
+        print 'inundation_area1',inundation_area1
+        print 'energy_less_final',energy_less_final
+        gp.SpatialJoin_analysis('elevation_layer',inundation_area1, energy_less_final,"JOIN_ONE_TO_ONE","","","INTERSECTS")
+        
+        print 'dissolving fields'
+        gp.Dissolve_management(energy_less_final,energy_less_final_dis,'inundation_ID')
 
     ####################################################################################
     ##    Extract areas for ANUGA solution
     ####################################################################################
+    print '\nDoing ANUGA solution...'
     # Local variables...
     gp.workspace = raster_path
@@ -169 +259 @@
     inundation_less = "inundation_"+run_up_name+"_less"
     inundation_less_final = "inundation_less_final"
-
-    # Process: Extract inundation data by Mask...
-    print 'check if inundation already extracted'
-    if gp.Exists(inundation_extract)!=True:
-        print 'not already extracted'
-        print 'extracting by mask'
-        gp.ExtractByMask_sa(inundation, inundation_area1, inundation_extract)
+    inundation_less_final_dis = "inundation_less_final_dis"
+
+    # Check if already done...
+    if gp.Exists(inundation_less_final_dis):
+        print 'analysis already done, skipping to next one'
     else:
-        print 'extracted inundation already exists'
-
-    # Process: Reclassify inundation data
-    print 'check if inundation already reclassified'
-    if gp.Exists(inundation_reclass)!=True:
-        print 'reclassify based on inundation'
-        gp.Reclassify_sa(inundation_extract, "Value", "-200 0 1;0 300 0", inundation_reclass, "DATA")
-    else:
-        print 'inundation has previously been reclassified for this height:', run_up_height
-
-    # Process: Raster to Polygon...
-    print 'check if already converted from raster to polyon'
-    if gp.Exists(inundation_poly)!=True:
-        print 'raster to polyon'
-        gp.RasterToPolygon_conversion(inundation_reclass, inundation_poly, "NO_SIMPLIFY", "VALUE")
-    else:
-        print 'inundation raster already converted to polygon'
-
-    # Process: Select...
-    print 'select by attribute'
-    gp.Select_analysis(inundation_poly, inundation_less, "\"GRIDCODE\" = 0")
-
-    # Process: Create layer...
-    print 'creating layers'
-    gp.MakeFeatureLayer(batemans_bay_SMARTLINE,'smartline_layer')
-    gp.MakeFeatureLayer(inundation_less,'inundation_layer')
-
-    # Process: Select Layer By Location...
-    print 'select by location'
-    gp.SelectLayerByLocation_management('inundation_layer', "INTERSECT", 'smartline_layer', "", "NEW_SELECTION")
-    print 'joining'
-    gp.SpatialJoin_analysis('inundation_layer',inundation_area1, inundation_less_final,"JOIN_ONE_TO_ONE","","","INTERSECTS")
-
-
-
-
-
+        # Process: Extract inundation data by Mask...
+        print 'check if inundation already extracted'
+        if gp.Exists(inundation_extract)!=True:
+            print 'not already extracted'
+            print 'extracting by mask'
+            gp.ExtractByMask_sa(inundation, inundation_area1, inundation_extract)
+        else:
+            print 'extracted inundation already exists'
+
+        # Process: Reclassify inundation data
+        print 'check if inundation already reclassified'
+        if gp.Exists(inundation_reclass)!=True:
+            print 'reclassify based on inundation'
+            gp.Reclassify_sa(inundation_extract, "Value", "-200 0 1;0 300 0", inundation_reclass, "DATA")
+        else:
+            print 'inundation has previously been reclassified for this height for this ANUGA run'
+
+        # Process: Raster to Polygon...
+        print 'check if already converted from raster to polyon'
+        if gp.Exists(inundation_poly)!=True:
+            print 'raster to polyon'
+            gp.RasterToPolygon_conversion(inundation_reclass, inundation_poly, "NO_SIMPLIFY", "VALUE")
+        else:
+            print 'inundation raster already converted to polygon'
+
+        # Process: Select...
+        print 'select by attribute'
+        gp.Select_analysis(inundation_poly, inundation_less, "\"GRIDCODE\" = 0")
+
+        # Process: Create layer...
+        print 'creating layers'
+        gp.MakeFeatureLayer(batemans_bay_SMARTLINE,'smartline_layer')
+        gp.MakeFeatureLayer(inundation_less,'inundation_layer')
+
+        # Process: Select Layer By Location...
+        print 'select by location'
+        gp.SelectLayerByLocation_management('inundation_layer', "INTERSECT", 'smartline_layer', "", "NEW_SELECTION")
+        print 'joining'
+        gp.SpatialJoin_analysis('inundation_layer',inundation_area1, inundation_less_final,"JOIN_ONE_TO_ONE","","","INTERSECTS")
+
+        print 'dissolving fields'
+        gp.Dissolve_management(inundation_less_final,inundation_less_final_dis,'inundation_ID')
+
+    ##########################################################
+    # Compare areas
+    ##########################################################
+    
     # Search feature class for areas
-    print 'get areas'
+    print 'get Madsen areas'
     analytical_area_dict = {}
     #analytical_areas = []
-    cur = gp.SearchCursor(elevation_less_final)
+    cur = gp.SearchCursor(elevation_less_final_dis)
     sRow = cur.Next()
     while sRow:
@@ -231 +329 @@
 
     # Search feature class for areas
-    print 'get areas'
-    anuga_area_dict = {}
-    #anuga_areas = []
-    cur = gp.SearchCursor(inundation_less_final)
+    print 'get Energy areas'
+    energy_area_dict = {}
+    #analytical_areas = []
+    cur = gp.SearchCursor(energy_less_final_dis)
     sRow = cur.Next()
     while sRow:
+        if not(sRow.GetValue("inundation_ID")in energy_area_dict):
+            energy_area_dict[sRow.GetValue("inundation_ID")] = sRow.GetValue("Shape_Area")
+        else:
+            energy_area_dict[sRow.GetValue("inundation_ID")] = (energy_area_dict[sRow.GetValue("inundation_ID")]+sRow.GetValue("Shape_Area"))
+        #analytical_areas.append(sRow.GetValue("Shape_Area"))
+        sRow = cur.Next()
+    #print analytical_areas
+    print energy_area_dict
+
+    # Search feature class for areas
+    print 'get ANUGA areas'
+    anuga_area_dict = {}
+    anuga_sum_areas[event_id] = 0
+    #anuga_areas = []
+    cur = gp.SearchCursor(inundation_less_final_dis)
+    sRow = cur.Next()
+    while sRow:
+        anuga_sum_areas[event_id] = anuga_sum_areas[event_id]+sRow.GetValue("Shape_Area")
         if not(sRow.GetValue("inundation_ID") in anuga_area_dict):
             anuga_area_dict[sRow.GetValue("inundation_ID")]=sRow.GetValue("Shape_Area")
@@ -247 +363 @@
 
     for key in anuga_area_dict:
+        area_total_anuga[key].append(anuga_area_dict[key])
+        
         if not key in analytical_area_dict:
-            analytical_area_dict[key] = 0.
-        diff = anuga_area_dict[key]-analytical_area_dict[key]
-        percent_diff = 100*diff/anuga_area_dict[key]
-        area_comp[key].append(diff)
-        area_percent[key].append(percent_diff)
-print 'area_comp', area_comp
-print 'area_percent', area_percent
-
-##csv_dict = csv.DictWriter(open(out_file,'w'),[1,2,3,4,5,6,7,8,9])
-##csv_dict.writerow(dict(zip([1,2,3,4,5,6,7,8,9],[1,2,3,4,5,6,7,8,9])))
-##csv_dict.writerow(area_percent)
-
-csv_out = csv.writer(open(out_file,'w'))
-csv_out.writerow([1,2,3,4,5,6,7,8,9])
-for i in range(len(area_percent[1])):
-    value_list =[]
-    for key in area_percent:
-        value_list.append(area_percent[key][i])
-    csv_out.writerow(value_list)
-     
-out_file.close()    
-##for key, value in area_percent:
-##    key_list = []
-##    for val in value:
-##        key_list.append(key)
-##    pylab.scatter(key_list,value)
-        
+            #analytical_area_dict[key] = None
+            area_comp_madsen[key].append(None)
+            area_percent_madsen[key].append(None)
+        else:
+            diff_madsen = anuga_area_dict[key]-analytical_area_dict[key]
+            percent_diff_madsen = 100*diff_madsen/anuga_area_dict[key]
+            area_comp_madsen[key].append(diff_madsen)
+            area_percent_madsen[key].append(percent_diff_madsen)
+            
+        if not key in energy_area_dict:
+            area_comp_energy[key].append(None)
+            area_percent_energy[key].append(None)
+        else:
+            diff_energy = anuga_area_dict[key]-energy_area_dict[key]
+            percent_diff_energy = 100*diff_energy/anuga_area_dict[key]
+            area_comp_energy[key].append(diff_energy)
+            area_percent_energy[key].append(percent_diff_energy)    
+           
+print 'area_comp', area_comp_madsen
+print 'area_percent', area_percent_madsen
+
+
+
+csv_anuga = csv.writer(open(out_file_anuga,'w'))
+csv_anuga_sum = csv.writer(open(out_file_anuga_sum,'w'))
+csv_madsen = csv.writer(open(out_file_madsen,'w'))
+csv_energy = csv.writer(open(out_file_energy,'w'))
+
+csv_anuga.writerow([1,2,3,4,5,6,7,8,9])
+csv_madsen.writerow([1,2,3,4,5,6,7,8,9])
+csv_energy.writerow([1,2,3,4,5,6,7,8,9])
+
+for key, value in anuga_sum_areas.iteritems():
+    write_list = [key,value]
+    csv_anuga_sum.writerow(write_list)
+
+for i in range(len(area_total_anuga[1])):
+    value_list_anuga =[]
+    for key in area_total_anuga:
+        try:
+            area_total_anuga[key][i]
+        except NameError:
+            value_list_anuga.append(None)
+        else:
+            value_list_anuga.append(area_total_anuga[key][i])  
+    csv_anuga.writerow(value_list_anuga)
+
+for i in range(len(area_percent_madsen[1])):
+    value_list_madsen =[]
+    for key in area_percent_madsen:
+        try:
+            area_percent_madsen[key][i]
+        except NameError:
+            value_list_madsen.append(None)
+        else:
+            value_list_madsen.append(area_percent_madsen[key][i])
+    csv_madsen.writerow(value_list_madsen)
+    
+for i in range(len(area_percent_energy[1])):
+    value_list_energy =[]
+    for key in area_percent_energy:
+        try:
+            area_percent_energy[key][i]
+        except NameError:
+            value_list_energy.append(None)
+        else:
+            value_list_energy.append(area_percent_energy[key][i])  
+    csv_energy.writerow(value_list_energy)
 
 

anuga_work/production/new_south_wales/batemans_bay/export_results_max.py

@@ -23 +23 @@
 
 #Specify output directories
-time_dir1 = '20090529_143527_run_final_0.0_51424_jgriffin'
-time_dir2 = '20090529_143458_run_final_0.0_58346_jgriffin'
+time_dir1 = '20090601_172248_run_final_0.0_58284__250m_jgriffin'
+##time_dir2 = '20090529_143458_run_final_0.0_58346_jgriffin'
 
-time_dirs = [time_dir1, time_dir2]   
+time_dirs = [time_dir1]#, time_dir2]   
 
 # sww filename extensions ie. if batemans_bay_time_37860_0.sww, input into list 37860
 # make sure numbers are in sequential order
-times = [37860]
+times = []
 
 #Modify the cellsize value to set the size of the raster you require
 #Take into account mesh size when aplying this paramater
-cellsize = 20   #dependent on data resolution in area of interest.
+cellsize = 250   #dependent on data resolution in area of interest.
 
 #Now set the timestep at which you want the raster generated.
@@ -61 +61 @@
 # one or more key strings from var_equations above
 #var = ['depth', 'speed','stage']
-var = ['elevation']
+var = ['stage','speed','elevation']
 ######
 # Start script, running through variables, area, folder, sww file (determine by times)

anuga_work/production/new_south_wales/batemans_bay/get_timeseries.py

@@ -18 +18 @@
 directory = project.output_folder
 
-time_dir1 = '20090529_143527_run_final_0.0_51424_jgriffin'
-#time_dir2 = '20090529_143442_run_final_0.0_51347_jgriffin'
+time_dir1 = '20090601_172248_run_final_0.0_58284__250m_jgriffin'
+time_dir2 = '20090520_145616_run_final_0.0_58284_jgriffin'
 
-time_dirs = [time_dir1]#, time_dir2]
+time_dirs = [time_dir1, time_dir2]
 
 

anuga_work/production/new_south_wales/batemans_bay/project.py

@@ -112 +112 @@
 # Used in get_timeseries.py.  
 # Format easting,northing,name,elevation (with header)
-gauges_filename = 'gauges.csv'
+gauges_filename = 'phase2_comp.csv'
 
 # BUILDINGS EXPOSURE - for identifying inundated houses
@@ -131 +131 @@
 # Thinned ordering file from Hazard Map (geographic)
 # Format is index,latitude,longitude (with header)
-urs_order_filename = 'thinned_boundary_ordering_extend.csv'
+urs_order_filename = 'urs_order.csv'
 
 # Landward bounding points
 # Format easting,northing (no header)
-landward_boundary_filename = 'landward_boundary_extend.csv'
+landward_boundary_filename = 'landward_boundary.csv'
 
 # MUX input filename.