Changeset 6984


Ignore:
Timestamp:
May 6, 2009, 12:10:16 PM (11 years ago)
Author:
kristy
Message:
 
Location:
anuga_work/production
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • anuga_work/production/busselton/busselton_rerun/Arc_asc2raster_GDA94z50.py

    r6678 r6984  
    3232time_dir6 = '20090330_120458_run_final_0_27283_Bt_kvanputt'
    3333
    34 time_dirs = [time_dir5] #, time_dir4, time_dir5]
     34time_dirs = [time_dir6] #1, time_dir2, time_dir3, time_dir4, time_dir5]
    3535   
    3636for time_dir in time_dirs:
     
    5757
    5858    generate_filename = []
    59     input_ascii = glob.glob(folder + '*n_depth_max.asc')
     59    input_ascii = glob.glob(folder + '*depth_max.asc')
    6060
    6161    for infile in input_ascii:
  • anuga_work/production/busselton/busselton_rerun/Arc_txt2feature_class.py

    r6678 r6984  
    2626time_dir6 = '20090330_120458_run_final_0_27283_Bt_kvanputt'
    2727
    28 time_dirs = [time_dir1, time_dir2] #, time_dir5] #4, time_dir5, time_dir6]
     28time_dirs = [time_dir6] #1, time_dir2] #, time_dir5] #4, time_dir5, time_dir6]
    2929
    3030for time_dir in time_dirs:
  • anuga_work/production/busselton/busselton_rerun/Arc_txt2feature_class_res.py

    r6678 r6984  
    2727time_dir6 = '20090330_120458_run_final_0_27283_Bt_kvanputt'
    2828
    29 time_dirs = [time_dir1]
     29time_dirs = [time_dir2, time_dir3, time_dir4, time_dir5, time_dir6]
    3030
    3131def replace_in_file(filename, instr, repstr):
  • anuga_work/production/busselton/busselton_rerun/export_results_max.py

    r6678 r6984  
    3030time_dir6 = '20090330_120458_run_final_0_27283_Bt_kvanputt'
    3131
    32 time_dirs = [time_dir1,time_dir2, time_dir3, time_dir4, time_dir5]
     32time_dirs = [time_dir6] #1,time_dir2, time_dir3, time_dir4, time_dir5]
    3333 
    3434
  • anuga_work/production/busselton/busselton_rerun/get_runup.py

    r6678 r6984  
    2424time_dir6 = '20090330_120458_run_final_0_27283_Bt_kvanputt'
    2525
    26 time_dirs = [time_dir3, time_dir4, time_dir5]
     26time_dirs = [time_dir6] #3, time_dir4, time_dir5]
    2727
    2828interior_region = []
  • anuga_work/production/busselton/busselton_rerun/project.py

    r6716 r6984  
    2626# Model specific parameters.
    2727# One or all can be changed each time the run_model script is executed
    28 tide = 0              # difference between MSL and HAT in metres
     28tide = 0.6              # difference between MSL and HAT in metres
    2929zone = 50               # specify zone of model
    30 event_number = 27283    # the event number or the mux file name
     30event_number = 27255    # the event number or the mux file name
    3131alpha = 0.1             # smoothing parameter for mesh
    3232friction=0.01           # manning's friction coefficient
     
    6060# Format for ascii grids, as produced in ArcGIS + a projection file
    6161ascii_grid_filenames = ['busselton_v2',   # Topo
    62                         'grid_250m_clip'] # Busselton Topo
     62                        'grid_250m_clip',
     63                        'grid_250m_clip2'] # Busselton Topo
    6364
    6465# Format for point is x,y,elevation (with header)
     
    8182# Used in build_elevation.py
    8283# Format for points easting,northing (no header)
    83 bounding_polygon_filename = 'bounding_polygon.csv'
     84bounding_polygon_filename = 'bounding_polygon_new.csv'
    8485bounding_polygon_maxarea = 100000
    8586
     
    9798# LAND - used to set the initial stage/water to be offcoast only
    9899# Used in run_model.py.  Format for points easting,northing (no header)
    99 land_initial_conditions_filename = [['initial_condition_extend.csv', 0],
     100land_initial_conditions_filename = [['initial_condition_new.csv', 0],
    100101                                    ['initial_condition_marina.csv', 0]]
    101102
     
    121122# Landward bounding points
    122123# Format easting,northing (no header)
    123 landward_boundary_filename = 'landward_boundary_extend.csv'
     124landward_boundary_filename = 'landward_boundary_new.csv'
    124125
    125126# MUX input filename.
  • anuga_work/production/busselton/busselton_rerun/run_building_inundation.py

    r6678 r6984  
    3333time_dir6 = '20090330_120458_run_final_0_27283_Bt_kvanputt'
    3434
    35 time_dirs = [time_dir3, time_dir4, time_dir5]
     35time_dirs = [time_dir6] #, time_dir3, time_dir4, time_dir5, time_dir6]
    3636
    3737buildings = project.building_exposure
     
    3939for time_dir in time_dirs:
    4040   
    41     time_dir_name = time_dir[-25:][:-18]
     41    time_dir_name = time_dir[-20:][:-12]
     42    print time_dir_name
    4243       
    4344    building_marker = '_m_'+ time_dir_name
  • anuga_work/production/carnarvon/carnarvon_rerun/Arc_asc2raster_GDA94z49.py

    r6681 r6984  
    3232time_dir6 = '20090327_160753_run_final_0_27283_Bt_kvanputt'
    3333
    34 time_dirs = [time_dir6] #, time_dir3, time_dir4]   
     34time_dirs = [time_dir1, time_dir2, time_dir3, time_dir4, time_dir5, time_dir6]   
    3535
    3636for time_dir in time_dirs:
     
    8383        output_extract = output_DEM + '_E'
    8484        print 'Output Extract ',output_extract
    85         gp.ExtractByMask_sa(output_DEM, ocean, output_extract)
     85        gp.ExtractByMask_sa(output_DEM, land, output_extract)
    8686
    8787
  • anuga_work/production/hobart_2009/build_urs_boundary.py

    r6457 r6984  
    140140                weights=mux_weights,
    141141                zone=project.zone,
    142                 mean_stage=project.tide,
    143142                verbose=True)
    144143    else:                           # a single mux stem file, assume 1.0 weight
     
    158157                ordering_filename=order_filename,
    159158                weights=mux_weights,
    160                 mean_stage=project.tide,
    161159                verbose=True)
    162160
  • anuga_work/production/hobart_2009/export_results_max.py

    r6457 r6984  
    2121
    2222directory = project.output_folder
     23time_dir1 = '20090420_153539_run_final_0_58274_kvanputt'
     24time_dir2 = '20090420_153654_run_final_0_58279_kvanputt'
     25time_dir3 = '20090420_153739_run_final_0_58281_kvanputt'
     26time_dir4 = '20090420_153826_run_final_0_58078_kvanputt'
     27time_dir5 = '20090330_093828_run_final_0_58292_kvanputt'
     28time_dir6 = '20090504_123724_run_final_0_58282_small_kvanputt'
     29time_dir7 = '20090504_124158_run_final_0_58068_small_kvanputt'
    2330
    24 ##time_dir1 = '20081217_101310_run_final_0_27283_250m_none_dt_kvanputt'
    25 ##time_dir2 = '20081217_115336_run_final_0_27283_250m_none_dp_kvanputt'
    26 ###time_dir1 = '20080924_123626_run_final_0_27283_250m_all_kvanputt' # This uses the 250m bathymetry with all interior polygons
    27 ###time_dir2 = '20080912_154716_run_final_0_27283_alpha0.1_kvanputt' # This uses original bathyemetry data
    28 ###time_dir3 = '20080924_123601_run_final_0_27283_250m_none_kvanputt' # This uses the 250m bathymetry without any interior polygons
    29 ##time_dirs = [time_dir1, time_dir2]#, time_dir3]
    30 
    31 time_dir1 = '20090130_165532_run_final_0.6_27255_extend_dt_kvanputt'
    32 ##time_dir2 = '20081211_162311_run_final_0_27255_alpha0.1_kvanputt'
    33 ##time_dir3 = '20081211_162346_run_final_0_68693_alpha0.1_kvanputt'
    34 ##time_dir4 = '20081211_162433_run_final_0.6_68693_alpha0.1_kvanputt'
    35 ##time_dir5 = '20081211_162656_run_final_0.6_27283_alpha0.1_kvanputt'
    36 ##time_dir6 = '20081211_162744_run_final_0_27283_alpha0.1_kvanputt'
    37 ##
    38 time_dirs = [time_dir1] #5, time_dir4]# , time_dir4, time_dir5, time_dir6]
     31time_dirs = [time_dir6, time_dir7]
     32#time_dirs = [time_dir1, time_dir2, time_dir3, time_dir4, time_dir5]
    3933 
    4034
    41 cellsize = 250
    42 ##cellsize = 5
     35#cellsize = 250
     36cellsize = 20
    4337
    44 #timestep = None    # None means no timestep!
    45 timestep = 0
     38timestep = None    # None means no timestep!
     39#timestep = 0
    4640
    4741######
     
    4943######
    5044
    51 #area = ['Bunbury', 'Busselton']  # strings must match keys in var_equations below
    52 area = ['All']      # 'All' means no special areas - the whole thing
     45area = ['SArms', 'Bruny']  # strings must match keys in var_equations below
     46#area = ['All']      # 'All' means no special areas - the whole thing
    5347
    5448######
     
    6357
    6458# one or more key strings from var_equations above
    65 var = ['elevation']
     59var = ['depth', 'speed']
    6660
    6761######
     
    9185
    9286        for time_dir in time_dirs:
    93 
    9487            name1 = join(directory, time_dir, project.scenario_name)
    95             #name2 = join(directory, time_dir, project.scenario_name)+'_time_39600_0'
    96             #name3 = join(directory, time_dir, project.scenario_name)+'_time_79200_0'
    97 
    98             names = [name1] #, name2]#, name3]
     88            name2 = join(directory, time_dir, project.scenario_name)+'_time_22680_0'
     89            name3 = join(directory, time_dir, project.scenario_name)+'_time_45360_0'
     90            name4 = join(directory, time_dir, project.scenario_name)+'_time_68040_0'
     91           
     92            names = [name1] #, name2, name3, name4]
    9993     
    100            # asc_name = []   
     94##            asc_name = []   
    10195               
    10296            for name in names:
  • anuga_work/production/hobart_2009/project.py

    r6499 r6984  
    99from os.path import join, exists
    1010
     11#-------------------------------------------------------------------------------
     12# Fitting Scenario
     13#-------------------------------------------------------------------------------
     14
     15extent = None #'small' #None #'sw' # 'aos1' ##'aos1'
     16extent_maxarea = 30000
    1117
    1218#-------------------------------------------------------------------------------
     
    2733# One or all can be changed each time the run_model script is executed
    2834tide = 0                # difference between MSL and HAT in metres
    29 zone = 55               # specify zone of model
    30 event_number = 58364    # the event number or the mux file name
     35zone = 55               # specify UTM zone of model
     36event_number = 64477    # 58280, 64477 the event number or the mux file name
    3137alpha = 0.1             # smoothing parameter for mesh
    3238friction=0.01           # manning's friction coefficient
    3339starttime=0             # start time for simulation
    34 finaltime=1000         # final time for simulation
     40finaltime=65000         # final time for simulation
    3541
    3642setup = 'final'         # This can be one of three values
     
    5056#-------------------------------------------------------------------------------
    5157
    52 output_comment = [setup, tide, event_number]
     58output_comment = [setup, tide, event_number, extent]
    5359
    5460#-------------------------------------------------------------------------------
     
    5864# ELEVATION DATA
    5965# Used in build_elevation.py
    60 # Format for ascii grids, as produced in ArcGIS + a projection file
    61 ascii_grid_filenames = ['hob3_pro_extract', 'grid_250m_project', 'ldr_bbay',
    62                         'ldr_bellerive', 'ldr_brunyislandneck',
    63                         'ldr_calvertsbeach', 'ldr_carltonbeach',
    64                         'ldr_connelly', 'ldr_cremorne', 'ldr_dodge1',
    65                         'ldr_dodge2', 'ldr_kingston', 'ldr_lauderdale',
    66                         'ldr_linersfarne', 'ldr_oppossumbay', 'ldr_primrose',
    67                         'ldr_rosny', 'ldr_sandybay', 'ldr_selfspoint',
    68                         'ldr_sevenmile', 'ldr_southarm1', 'ldr_southarm2',
    69                         'ldr_sullivanscove', 'ldr_tranmere', 'tasdem_mask']
    70 
    71 # Format for point is x,y,elevation (with header)
    72 point_filenames = ['tasmania_data.txt',    # The data from Tasmania
    73                    'hydro_data.txt']       # Data from Hydro
     66if extent == None:
     67    ascii_grid_filenames = ['topo_grid_notsw', 'fitting_problem_sw_elevation']
     68    point_filenames = []
     69elif extent == 'sw':
     70    # Format for ascii grids, as produced in ArcGIS + a projection file
     71    ascii_grid_filenames = ['hob3_pro_extract', 'grid_250m_project', 'ldr_bbay',
     72                            'ldr_bellerive', 'ldr_brunyislandneck',
     73                            'ldr_calvertsbeach', 'ldr_carltonbeach',
     74                            'ldr_connelly', 'ldr_cremorne', 'ldr_dodge1',
     75                            'ldr_dodge2', 'ldr_kingston', 'ldr_lauderdale',
     76                            'ldr_linersfarne', 'ldr_oppossumbay', 'ldr_primrose',
     77                            'ldr_rosny', 'ldr_sandybay', 'ldr_selfspoint',
     78                            'ldr_sevenmile', 'ldr_southarm1', 'ldr_southarm2',
     79                            'ldr_sullivanscove', 'ldr_tranmere', 'tasdem_mask']
     80
     81    # Format for point is x,y,elevation (with header)
     82    point_filenames = ['Topo_1.txt','Topo_2.txt','Topo_3.txt',
     83                       'tasmania_data.txt',    # The data from Tasmania
     84                       'hydro_data.txt']       # Data from Hydro
    7485
    7586### Add csv header list to all files in point_filenames
     
    8798# Used in run_model.py
    8899# Format for points easting,northing (no header)                   
    89 interior_regions_data = [['aos1.csv', 1500],
    90                          ['aos2.csv', 1500],
    91                          ['sw.csv', 30000]]
    92 PriorityArea_filename = 'PriorityAreas.csv'
    93 
     100if extent == 'sw':
     101    interior_regions_data = [['aos1.csv', 1500],
     102                             ['aos2.csv', 1500]]
     103    PriorityArea_filename = 'PriorityAreas.csv'
     104elif extent == 'aos1':
     105    interior_regions_data = []
     106    PriorityArea_filename = 'PriorityAreas_aos1.csv'
     107elif extent == 'aos2':
     108    interior_regions_data = []
     109    PriorityArea_filename = 'PriorityAreas_aos2.csv'
     110elif extent == 'small':
     111    interior_regions_data = [['aoi_bruny.csv', 500],
     112                             ['aoi_S_arms.csv', 500],
     113                             ['aos1_small.csv', 1500],
     114                             ['aos2.csv', 1500],
     115                             ['sw.csv', 30000]]
     116    PriorityArea_filename = None
     117elif extent == None:
     118    interior_regions_data = [['aos1.csv', 1500],
     119                             ['aos2.csv', 1500],
     120                             ['sw.csv', 30000]]
     121    PriorityArea_filename = 'PriorityAreas.csv'
     122   
    94123# LAND - used to set the initial stage/water to be offcoast only
    95124# Used in run_model.py.  Format for points easting,northing (no header)
     
    99128# Used in get_timeseries.py. 
    100129# Format easting,northing,name,elevation (with header)
    101 gauges_filename = 'gauges.csv'
     130gauges_filename = 'tsunamipointsMGA.csv'
    102131
    103132# BUILDINGS EXPOSURE - for identifying inundated houses
     
    133162#-------------------------------------------------------------------------------
    134163
    135 # ASCII export grid for Busselton
    136 xminBusselton = 340000
    137 xmaxBusselton = 352000
    138 yminBusselton = 6271500
    139 ymaxBusselton = 6280000
    140 
    141 # ASCII export grid for Bunbury
    142 xminBunbury = 369000
    143 xmaxBunbury = 381000
    144 yminBunbury = 6308000
    145 ymaxBunbury = 6316500
     164# ASCII export grid for Bruny
     165xminBruny = 523900
     166xmaxBruny = 533200
     167yminBruny = 5204300
     168ymaxBruny = 5213100
     169
     170# ASCII export grid for South Arms
     171xminSArms = 532497
     172xmaxSArms = 534326
     173yminSArms = 5237028
     174ymaxSArms = 5238465
     175
    146176
    147177################################################################################
     
    193223output_folder = join(anuga_folder, 'outputs')
    194224gauges_folder = join(anuga_folder, 'gauges')
    195 meshes_folder = join(anuga_folder, 'meshes')
    196225event_folder = join(boundaries_folder, str(event_number))
    197226
     
    210239# The absolute pathname of the all elevation, generated in build_elevation.py
    211240combined_elevation = join(topographies_folder, combined_elevation_basename)
    212 
    213 # The absolute pathname of the mesh, generated in run_model.py
    214 meshes = join(meshes_folder, scenario_name) + '.msh'
    215241
    216242# The pathname for the urs order points, used within build_urs_boundary.py
     
    234260output_run_time = join(output_run, scenario_name)
    235261
     262# The absolute pathname of the mesh, generated in run_model.py
     263meshes = join(output_run, scenario_name) + '.msh'
     264
    236265# The absolute pathname for the gauges file
    237266# Used for get_timeseries.py
     
    248277
    249278#Multiple polygons in one CSV file to make internal polygons
    250 PriorityAreas = join(polygons_folder, PriorityArea_filename)
    251 
    252 
     279if not PriorityArea_filename == None:
     280    PriorityAreas = join(polygons_folder, PriorityArea_filename)
     281
     282
  • anuga_work/production/hobart_2009/run_model.py

    r6457 r6984  
    147147
    148148domain.set_boundary({'back': Br,
    149                      'side': Bd,
     149                     'side': Bt,
    150150                     'ocean': Bf})
    151151
  • anuga_work/production/hobart_2009/setup_model.py

    r6499 r6984  
    8585    sanity_error = True
    8686
    87 if not exists(project.meshes_folder):
    88     print "Sorry, meshes directory '%s' doesn't exist" % project.meshes_folder
    89     sanity_error = True
    90 
    9187if not exists(project.mux_data_folder):
    9288    print "Sorry, mux data directory '%s' doesn't exist" % project.mux_data_folder
     
    158154project.interior_regions = []
    159155
    160 polygons, maxareas = csv2polygons(project.PriorityAreas)
    161 print 'Creating %d internal polygons' % len(polygons)
    162 #def create_polygon_function(polygons, geo_reference=None):
    163 project.interior_regions = []
    164 for i, key in enumerate(polygons):
    165     if i%100==0: print i
    166     poly = polygons[key]
    167     maxarea = float(maxareas[key])
    168     project.interior_regions.append([poly,
    169                                      maxarea*project.scale_factor])
     156if not project.PriorityArea_filename == None:
     157    polygons, maxareas = csv2polygons(project.PriorityAreas)
     158    print 'Creating %d internal polygons' % len(polygons)
     159    #def create_polygon_function(polygons, geo_reference=None):
     160    project.interior_regions = []
     161    for i, key in enumerate(polygons):
     162        if i%100==0: print i
     163        poly = polygons[key]
     164        maxarea = float(maxareas[key])
     165        project.interior_regions.append([poly,
     166                                         maxarea*project.scale_factor])
    170167
    171168for filename, maxarea in project.interior_regions_data:
  • anuga_work/production/onslow_2009/project.py

    r6771 r6984  
    9696# LAND - used to set the initial stage/water to be offcoast only
    9797# Used in run_model.py.  Format for points easting,northing (no header)
    98 land_initial_conditions_filename = [['initial_condition_mainland.csv', 0]]
     98land_initial_conditions_filename = [['initial_conditions_mainland.csv', 0]]
    9999
    100100# GAUGES - for creating timeseries at a specific point
  • anuga_work/production/patong/asc2raster_WGS84z47N.py

    r6686 r6984  
    2626
    2727
    28 time_dir1 = '20090323_192017_run_final_0.8_mux_small_final_onielsen'
    29 #time_dir2 = '20090204_143421_run_final_0.8_buildings_transmissive_onielsen'
     28time_dir1 = '20090408_090633_run_final_0.8_mux_small_final_onielsen'
     29time_dir2 = '20090407_171956_run_final_0.8_mux_small_no_buildings_onielsen'
     30time_dir3 = '20090407_172311_run_final_0.8_mux_small_f0.0003_onielsen'
     31time_dir4 = '20090407_172145_run_final_0.8_mux_small_f0.03_onielsen'
     32time_dir5 = '20090408_090831_run_final_0.8_mux_small_plus10cm_onielsen'
     33time_dir6 = '20090408_092934_run_final_0.8_mux_small_minus10cm_onielsen'
     34time_dir7 = '20090401_104100_run_final_0.8_mux_small_viz_onielsen'
    3035
    31 time_dirs = [time_dir1] #, time_dir2]
     36
     37time_dirs = [time_dir7] #1, time_dir2,time_dir3, time_dir4,time_dir5, time_dir6, time_dir7]
    3238 
    3339for time_dir in time_dirs:
     
    5056
    5157    generate_filename = []
    52     input_ascii = glob.glob(folder + '*speed.asc')
     58    input_ascii = glob.glob(folder + '*speed_max.asc')
    5359
    5460    for infile in input_ascii:
  • anuga_work/production/patong/new_version/export_results_max.py

    r6685 r6984  
    2323
    2424
    25 time_dir1 = '20090323_192017_run_final_0.8_mux_small_final_onielsen'
    26 time_dir2 = '20090318_110049_run_final_0.8_mux_small_ultimate_onielsen'
     25time_dir1 = '20090408_090633_run_final_0.8_mux_small_final_onielsen'
     26time_dir2 = '20090407_171956_run_final_0.8_mux_small_no_buildings_onielsen'
     27time_dir3 = '20090407_172311_run_final_0.8_mux_small_f0.0003_onielsen'
     28time_dir4 = '20090407_172145_run_final_0.8_mux_small_f0.03_onielsen'
     29time_dir5 = '20090408_090831_run_final_0.8_mux_small_plus10cm_onielsen'
     30time_dir6 = '20090408_092934_run_final_0.8_mux_small_minus10cm_onielsen'
     31time_dir7 = '20090401_104100_run_final_0.8_mux_small_viz_onielsen'
    2732
    28 time_dirs = [time_dir1] #, time_dir2]
     33
     34time_dirs = [time_dir7] #, time_dir2,time_dir3, time_dir4,time_dir5, time_dir6, time_dir7]
    2935 
    3036
     
    8389
    8490            name1 = join(directory, time_dir, project.scenario_name)
    85 ##            name2 = join(directory, time_dir, project.scenario_name)+'_time_10270_0'
    86 ##            name3 = join(directory, time_dir, project.scenario_name)+'_time_14555_0'
     91            name2 = join(directory, time_dir, project.scenario_name)+'_time_10270_0'
     92            name3 = join(directory, time_dir, project.scenario_name)+'_time_14555_0'
    8793
    88             names = [name1] #, name2, name3]
     94            names = [name1, name2, name3]
    8995     
    90 ##            asc_name = []   
     96            asc_name = []   
    9197               
    9298            for name in names:
     
    109115                            format = 'asc')
    110116
    111 ##                asc_name.append(outname + '.asc')
    112 ##   
    113 ##            maxasc_outname = join(directory, time_dir, project.scenario_name)+'_'+which_area+'_'+which_var+'_max.asc'
    114 ##
    115 ##            print 'max asc outname ', maxasc_outname
    116 ##            print 'asc_name ', str(asc_name)
    117 ##           
    118 ##            MaxAsc(maxasc_outname, asc_name)
     117                asc_name.append(outname + '.asc')
     118   
     119            maxasc_outname = join(directory, time_dir, project.scenario_name)+'_'+which_area+'_'+which_var+'_max.asc'
     120
     121            print 'max asc outname ', maxasc_outname
     122            print 'asc_name ', str(asc_name)
     123           
     124            MaxAsc(maxasc_outname, asc_name)
  • anuga_work/production/patong/new_version/project.py

    r6751 r6984  
    107107# Used in get_timeseries.py. 
    108108# Format easting,northing,name,elevation (with header)
    109 gauges_filename = 'gauges.csv'
     109gauges_filename = 'gauges_h.csv'
    110110
    111111# BUILDINGS POLYOGN - for elevation of buildings
  • anuga_work/production/perth/Arc_asc2raster_GDA94z50.py

    r6770 r6984  
    3232time_dir6 = '20090327_155803_run_final_0_68693_Bt_kvanputt'
    3333
    34 time_dirs = [time_dir4, time_dir5, time_dir6] #time_dir1, time_dir2, time_dir3,
     34time_dirs = [time_dir1] #time_dir1, time_dir2, time_dir3,
    3535 
    3636for time_dir in time_dirs:
     
    5757
    5858    generate_filename = []
    59     input_ascii = glob.glob(folder + '*speed_max.asc')
     59    input_ascii = glob.glob(folder + '*ham_speed_max.asc')
    6060    print time_dir
    6161
Note: See TracChangeset for help on using the changeset viewer.