Changeset 4564


Ignore:
Timestamp:
Jun 27, 2007, 10:33:33 AM (17 years ago)
Author:
nick
Message:

update Broome

Location:
anuga_work/production/broome_2006
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • anuga_work/production/broome_2006/build_broome.py

    r4559 r4564  
    6868offshore_dir_name1 = project_urs.offshore_dir_name1
    6969offshore_dir_name2 = project_urs.offshore_dir_name2
    70 
     70'''
    7171# creates DEM from asc data
    7272print "creates DEMs from asc data"
     
    102102
    103103print'clip combined geospatial object by bounding polygon'
    104 G_clipped = G.clip(project_urs.poly_all)
     104#G_clipped = G.clip(project_urs.poly_all)
    105105#FIXME: add a clip function to pts
    106106#print'shape of clipped data', G_clipped.get_data_points().shape
     
    113113
    114114print'split'
    115 G_small, G_other = G_clipped.split(.10,verbose=True)
     115G_small, G_other = G.split(.10,verbose=True)
    116116
    117117
    118118print 'export',project_urs.combined_dir_name + '.txt'
    119 G_clipped.export_points_file(project_urs.combined_dir_name + '.txt')
     119G.export_points_file(project_urs.combined_dir_name + '.txt')
    120120print 'export', project_urs.combined_small_dir_name + '.txt'
    121121G_small.export_points_file(project_urs.combined_small_dir_name + '.txt')
    122122#G_clipped.export_points_file(project_urs.combined_dir_name + '.xya')
     123'''
    123124
    124125
    125 '''
    126 print'project_urs.combined_dir_name + 1.xya',project_urs.combined_dir_name + '1.xya'
    127 G_all=Geospatial_data(file_name = project_urs.combined_dir_name + '1.xya')
     126print'export',project_urs.combined_dir_name+ '.txt'
     127G_all=Geospatial_data(file_name = project_urs.combined_dir_name+ '.txt')
    128128print'split'
    129129G_all_1, G_all_2 = G_all.split(.10)
    130130print'export 1'
    131 G_all_1.export_points_file(project_urs.combined_dir_name+'_small1' + '.xya')
     131G_all_1.export_points_file(project_urs.combined_dir_name+'_small' + '.xya')
    132132print'export 2'
    133133G_all_2.export_points_file(project_urs.combined_dir_name+'_other1' + '.xya')
    134 
     134'''
    135135
    136136#-------------------------------------------------------------------------
  • anuga_work/production/broome_2006/project_urs.py

    r4559 r4564  
    3232
    3333#tide = -5.3
    34 tide = 0
    35 #tide = 4.9
     34#tide = 0
     35tide = 4.9
    3636
    3737#Maybe will try to make project a class to allow these parameters to be passed in.
     
    4141finaltime=25000
    4242setup='final'
    43 source='onslow'
     43source='exmouth'
    4444
    4545if setup =='trial':
     
    7070
    7171#final topo name
    72 combined_name ='broome_combined_elevation_z51'
     72combined_name ='broome_combined_elevation_z51_original'
    7373combined_name1 ='broome_combined_elevation1'
    7474combined_name_unclipped1 ='broome_combined_elevation_unclipped1'
     
    124124output_dir = anuga_dir+'outputs'+sep
    125125output_build_time_dir = output_dir+build_time+'_'+source+sep
    126 #output_run_time_dir = output_dir +run_time+dir_comment+sep
    127 output_run_time_dir = output_dir +'20070622_004008_run_final_0_onslow_nbartzis'+sep
     126output_run_time_dir = output_dir +run_time+dir_comment+sep
     127#output_run_time_dir = output_dir +'20070622_004008_run_final_0_onslow_nbartzis'+sep
    128128output_run_time_dir_name = output_run_time_dir + scenario_name  #Used by post processing
    129129
  • anuga_work/production/broome_2006/run_broome_urs.py

    r4559 r4564  
    6363   
    6464    kwargs['output_dir']=project_urs.output_run_time_dir
    65     kwargs['bathy_file']=project_urs.combined_dir_name_unclipped1+'.txt'
     65    kwargs['bathy_file']=project_urs.combined_dir_name+'.txt'
    6666#    kwargs['bathy_file']=project_urs.combined_small_dir_name + '.pts'
    6767    kwargs['boundary_file']=project_urs.boundaries_in_dir_name + '.sww'
    6868   
    69     start_screen_catcher(kwargs['output_dir'], myid, numprocs,extra_info='export',print_to_screen=True)
    70     '''
    7169    print 'output_dir',kwargs['output_dir']
    7270    if myid == 0:
     
    143141        domain.set_quantity('friction', kwargs['friction'])
    144142       
    145         print 'Start Set quantity'
     143        print 'Start Set quantity',kwargs['bathy_file']
    146144
    147145        domain.set_quantity('elevation',
     
    230228    kwargs['completed']=str(time.time()-t0)
    231229   
    232     '''
    233     if myid == 0:
    234 #        store_parameters(**kwargs)
     230    if myid == 0:
     231        store_parameters(**kwargs)
    235232       
    236233        print 'memory usage before del domain',mem_usage()
    237         #del domain
     234        del domain
    238235        print 'memory usage after del domain',mem_usage()
    239236   
     
    254251                verbose = False,
    255252                origin = None,
    256                 datum = 'WGS84',
     253                datum = 'GDA94',
    257254                format = 'asc')
    258255   
Note: See TracChangeset for help on using the changeset viewer.