Changeset 4544


Ignore:
Timestamp:
Jun 15, 2007, 4:47:03 PM (17 years ago)
Author:
nick
Message:

update model scripts

Location:
anuga_work/production
Files:
10 edited

Legend:

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

    r4542 r4544  
    4141finaltime=25000
    4242setup='final'
    43 extra='exmouth'
     43source='dampier'
    4444
    4545if setup =='trial':
     
    5959    yieldstep=60
    6060
    61 dir_comment='_'+setup+'_'+str(tide)+'_'+str(extra)+'_'+str(user)
     61dir_comment='_'+setup+'_'+str(tide)+'_'+str(source)+'_'+str(user)
    6262
    6363# onshore data from 30m DTED level 2
     
    105105tide_dir = anuga_dir+'tide_data'+sep
    106106
    107 #boundaries locations
    108 #boundaries_name = 'broome_3854_17042007' #dampier
    109 boundaries_name = 'broome_3103_18052007' #exmouth
    110 #boundaries_name = 'broome_3859_16052007' #onslow
     107if source =='dampier':
     108    boundaries_name = 'broome_3854_17042007' #Dampier gun
     109    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'dampier'+sep+'1_10000'+sep
    111110
    112 #boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'1_10000'+sep
    113 #boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'dampier'+sep+'1_10000'+sep
    114 boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'exmouth'+sep+'1_10000'+sep
    115 #boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'onslow_hedland_broome'+sep+'1_10000'+sep
     111if source=='onslow':
     112    boundaries_name = 'broome_3859_16052007' #onslow_hedland_broome gun
     113    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'onslow_hedland_broome'+sep+'1_10000'+sep
     114   
     115if source=='exmouth':
     116    boundaries_name = 'broome_3103_18052007' #exmouth gun
     117    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'exmouth'+sep+'1_10000'+sep
     118   
    116119boundaries_in_dir_name = boundaries_in_dir + boundaries_name
    117120boundaries_dir = anuga_dir+'boundaries'+sep
     
    120123#output locations
    121124output_dir = anuga_dir+'outputs'+sep
    122 output_build_time_dir = output_dir+build_time+sep
     125output_build_time_dir = output_dir+build_time+'_'+source+sep
    123126output_run_time_dir = output_dir +run_time+dir_comment+sep
    124 output_run_time_dir = output_dir +'20070605_234438_run_final_0_exmouth_nbartzis'+sep
    125 #output_run_time_dir_name = output_run_time_dir + scenario_name  #Used by post processing
     127#output_run_time_dir = output_dir +'20070605_234438_run_final_0_exmouth_nbartzis'+sep
     128output_run_time_dir_name = output_run_time_dir + scenario_name  #Used by post processing
    126129
    127130#gauges
     
    155158res_1 = 5000*res_factor
    156159
    157 poly_2 = read_polygon(polygons_dir+'broome_south_coast_inside_extent.csv')
     160#poly_2 = read_polygon(polygons_dir+'broome_south_coast_inside_extent.csv')
     161poly_2 = read_polygon(polygons_dir+'broome_south_coast_not_town_pts_new.csv')
    158162res_2 = 5000*res_factor
    159163
    160 poly_3 = read_polygon(polygons_dir+'Broome_town_pts.csv')
     164#poly_3 = read_polygon(polygons_dir+'Broome_town_pts.csv')
     165poly_3 = read_polygon(polygons_dir+'broome_town_new_pts.csv')
    161166res_3 = 2000*res_factor
    162167
    163 poly_4 = read_polygon(polygons_dir+'Broome_inner_town_pts.csv')
     168#poly_4 = read_polygon(polygons_dir+'Broome_inner_town_pts.csv')
     169poly_4 = read_polygon(polygons_dir+'broome_inner_town_pts.csv')
    164170res_4 = 500*res_factor
    165171
  • anuga_work/production/broome_2006/run_broome_urs.py

    r4542 r4544  
    4444def run_model(**kwargs):
    4545   
    46     tide = kwargs['tide']
    47     alpha = kwargs['alpha']
    48     friction = kwargs['friction']
    49     time_thinning = kwargs['time_thinning']
    50     scenario_name = kwargs['aa_scenario_name']
     46#    tide = kwargs['tide']
     47#    alpha = kwargs['alpha']
     48#    friction = kwargs['friction']
     49#    time_thinning = kwargs['time_thinning']
     50#    scenario_name = kwargs['aa_scenario_name']
    5151   
    5252   
     
    5858
    5959    #copy script must be before screen_catcher
    60     print 'tide',tide
     60    print 'tide',kwargs['tide']
    6161    kwargs['est_num_trigs']=project_urs.trigs_min
    6262    kwargs['num_cpu']=numprocs
     
    141141        from polygon import Polygon_function
    142142        #following sets the stage/water to be offcoast only
    143         IC = Polygon_function( [(project_urs.poly_mainland, -1.0)], default = tide,
     143        IC = Polygon_function( [(project_urs.poly_mainland, -1.0)], default = kwargs['tide'],
    144144                                 geo_reference = domain.geo_reference)
    145145        domain.set_quantity('stage', IC)
    146         domain.set_quantity('friction', friction)
     146        domain.set_quantity('friction', kwargs['friction'])
    147147       
    148148        print 'Start Set quantity'
     
    152152                            use_cache = True,
    153153                            verbose = True,
    154                             alpha = alpha)
     154                            alpha = kwargs['alpha'])
    155155        print 'Finished Set quantity'
    156156    barrier()
     
    168168    #------------------------------------------------------
    169169    print 'domain id', id(domain)
    170     domain.set_name(scenario_name)
     170    domain.set_name(kwargs['aa_scenario_name'])
    171171    domain.set_datadir(kwargs['output_dir'])
    172172    domain.set_default_order(2) # Apply second order scheme
     
    187187
    188188    Bf = Field_boundary(kwargs['boundary_file'],
    189                     domain, time_thinning=time_thinning, mean_stage=tide,
     189                    domain, time_thinning=kwargs['time_thinning'], mean_stage=kwargs['tide'],
    190190                    use_cache=True, verbose=True)
    191191                   
     
    195195
    196196    Br = Reflective_boundary(domain)
    197     Bd = Dirichlet_boundary([tide,0,0])
     197    Bd = Dirichlet_boundary([kwargs['tide'],0,0])
    198198
    199199    print'set_boundary'
  • anuga_work/production/dampier_2006/build_dampier.py

    r4357 r4544  
    3636
    3737# Application specific imports
    38 import project   # Definition of file names and polygons
     38import project_urs   # Definition of file names and polygons
    3939
    4040#------------------------------------------------------------------------------
     
    4242# output to file
    4343#------------------------------------------------------------------------------
    44 copy_code_files(project.output_build_time_dir,__file__,
    45                dirname(project.__file__)+sep+ project.__name__+'.py' )
     44copy_code_files(project_urs.output_build_time_dir,__file__,
     45               dirname(project_urs.__file__)+sep+ project_urs.__name__+'.py' )
    4646
    47 start_screen_catcher(project.output_build_time_dir)
     47start_screen_catcher(project_urs.output_build_time_dir)
    4848print "Processor Name:",get_processor_name()
    4949
    50 print 'USER:    ', project.user
     50print 'USER:    ', project_urs.user
    5151
    5252#-------------------------------------------------------------------------------
     
    5757# Fine pts file to be clipped to area of interest
    5858#-------------------------------------------------------------------------------
    59 print"project.combined_dir_name",project.combined_dir_name
     59print"project_urs.combined_dir_name",project_urs.combined_dir_name
    6060
    6161# topography directory filenames
    62 onshore_in_dir_name = project.onshore_in_dir_name
    63 coast_in_dir_name = project.coast_in_dir_name
    64 offshore_in_dir_name = project.offshore_in_dir_name
    65 offshore1_in_dir_name = project.offshore1_in_dir_name
    66 offshore2_in_dir_name = project.offshore2_in_dir_name
     62onshore_in_dir_name = project_urs.onshore_in_dir_name
     63coast_in_dir_name = project_urs.coast_in_dir_name
     64offshore_in_dir_name = project_urs.offshore_in_dir_name
     65offshore1_in_dir_name = project_urs.offshore1_in_dir_name
     66offshore2_in_dir_name = project_urs.offshore2_in_dir_name
    6767
    68 onshore_dir_name = project.onshore_dir_name
    69 coast_dir_name = project.coast_dir_name
    70 offshore_dir_name = project.offshore_dir_name
    71 offshore1_dir_name = project.offshore1_dir_name
    72 offshore2_dir_name = project.offshore2_dir_name
     68onshore_dir_name = project_urs.onshore_dir_name
     69coast_dir_name = project_urs.coast_dir_name
     70offshore_dir_name = project_urs.offshore_dir_name
     71offshore1_dir_name = project_urs.offshore1_dir_name
     72offshore2_dir_name = project_urs.offshore2_dir_name
    7373'''
    7474# creates DEM from asc data
     
    113113
    114114print'clip combined geospatial object by bounding polygon'
    115 G_clipped = G.clip(project.poly_all)
     115G_clipped = G.clip(project_urs.poly_all)
    116116#FIXME: add a clip function to pts
    117117#print'shape of clipped data', G_clipped.get_data_points().shape
    118118
    119119print'export combined DEM file'
    120 if access(project.topographies_dir,F_OK) == 0:
    121     mkdir (project.topographies_dir)
    122 G_clipped.export_points_file(project.combined_dir_name + '.pts')
    123 #G_clipped.export_points_file(project.combined_dir_name + '.txt')
     120if access(project_urs.topographies_dir,F_OK) == 0:
     121    mkdir (project_urs.topographies_dir)
     122G_clipped.export_points_file(project_urs.combined_dir_name + '.pts')
     123#G_clipped.export_points_file(project_urs.combined_dir_name + '.txt')
    124124
    125125print'split combined data set'
     
    127127
    128128print'export split DEM file'
    129 G_small.export_points_file(project.combined_dir_name + '_small' + '.pts')
    130 G_other.export_points_file(project.combined_dir_name + '_other' + '.pts')
     129G_small.export_points_file(project_urs.combined_dir_name + '_small' + '.pts')
     130G_other.export_points_file(project_urs.combined_dir_name + '_other' + '.pts')
    131131
    132 print 'start reading:',project.combined_smaller_dir_name + '.txt'
    133 G = Geospatial_data(file_name = project.combined_smaller_dir_name + '.txt')
     132print 'start reading:',project_urs.combined_smaller_dir_name + '.txt'
     133G = Geospatial_data(file_name = project_urs.combined_smaller_dir_name + '.txt')
    134134print 'start split'
    135135G_smallest, G_other = G.split(0.1,True)
    136136
    137 print 'start export',project.combined_smallest_dir_name + '.txt'
    138 #G.export_points_file(project.combined_smaller_dir_name + '.txt')
    139 #G_smallest.export_points_file(project.combined_smallest_dir_name + '.txt')
     137print 'start export',project_urs.combined_smallest_dir_name + '.txt'
     138#G.export_points_file(project_urs.combined_smaller_dir_name + '.txt')
     139#G_smallest.export_points_file(project_urs.combined_smallest_dir_name + '.txt')
    140140'''
    141141#-------------------------------------------------------------------------
    142142# Convert URS to SWW file for boundary conditions
    143143#-------------------------------------------------------------------------
     144'''
    144145print 'starting to create boundary conditions'
    145 boundaries_in_dir_name = project.boundaries_in_dir_name
     146boundaries_in_dir_name = project_urs.boundaries_in_dir_name
    146147
    147148from anuga.shallow_water.data_manager import urs2sww
    148149
    149 print 'minlat=project.north_boundary, maxlat=project.south_boundary',project.north_boundary, project.south_boundary
    150 print 'minlon= project.west_boundary, maxlon=project.east_boundary',project.west_boundary, project.east_boundary
     150print 'minlat=project_urs.north_boundary, maxlat=project_urs.south_boundary',project_urs.north_boundary, project_urs.south_boundary
     151print 'minlon= project_urs.west_boundary, maxlon=project_urs.east_boundary',project_urs.west_boundary, project_urs.east_boundary
    151152
    152153#import sys; sys.exit()
    153154
    154 #if access(project.boundaries_dir,F_OK) == 0:
    155 #    mkdir (project.boundaries_dir)
     155#if access(project_urs.boundaries_dir,F_OK) == 0:
     156#    mkdir (project_urs.boundaries_dir)
    156157
    157158from caching import cache
    158159cache(urs2sww,
    159160      (boundaries_in_dir_name,
    160        project.boundaries_dir_name+'a'),
     161       project_urs.boundaries_dir_name+'a'),
    161162      {'verbose': True,
    162        'minlat': project.south_boundary,
    163        'maxlat': project.north_boundary,
    164        'minlon': project.west_boundary,
    165        'maxlon': project.east_boundary,
     163       'minlat': project_urs.south_boundary,
     164       'maxlat': project_urs.north_boundary,
     165       'minlon': project_urs.west_boundary,
     166       'maxlon': project_urs.east_boundary,
    166167       'mint': 5000, 'maxt': 35000,
    167168#       'origin': domain.geo_reference.get_origin(),
    168 #       'mean_stage': project.tide,
     169#       'mean_stage': project_urs.tide,
    169170       'zscale': 1,                 #Enhance tsunami
    170171       'fail_on_NaN': False},
    171172       verbose = True,
    172173       )
    173 #       dependencies = source_dir + project.boundary_basename + '.sww')
     174#       dependencies = source_dir + project_urs.boundary_basename + '.sww')
     175'''
     176print 'starting to create boundary conditions'
     177from anuga.shallow_water.data_manager import urs2sww, urs_ungridded2sww
     178
     179print 'boundaries_in_dir_name',project_urs.boundaries_in_dir_name
     180
     181urs_ungridded2sww(project_urs.boundaries_in_dir_name, project_urs.boundaries_in_dir_name,
     182                  verbose=True, mint=4000, maxt=35000, zscale=1)
    174183
    175184
    176185
    177186
    178 
  • anuga_work/production/dampier_2006/project_urs.py

    r4542 r4544  
    2525
    2626#tide = -2.5
    27 #tide = 0.0
    28 tide = 2.4
     27tide = 0.0
     28#tide = 2.4
    2929
    3030#Maybe will try to make project a class to allow these parameters to be passed in.
     
    3434finaltime=25000
    3535setup='final'
    36 source='onslow'
     36source='exmouth'
    3737
    3838if setup =='trial':
     
    113113
    114114if source =='dampier':
    115     boundaries_name = 'pt_hedland_3854_17042007' #Dampier gun
     115    boundaries_name = 'dampier' #Dampier gun
    116116    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'dampier'+sep+'1_10000'+sep
    117117
    118118if source=='onslow':
    119     boundaries_name = 'pt_hedland_3859_16052007' #onslow_hedland_broome gun
     119    boundaries_name = 'dampier_3859_16052007' #onslow_hedland_broome gun
    120120    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'onslow_hedland_broome'+sep+'1_10000'+sep
    121121   
    122122if source=='exmouth':
    123     boundaries_name = 'pt_hedland_3103_18052007' #exmouth gun
     123    boundaries_name = 'dampier_3103_18052007' #exmouth gun
    124124    boundaries_in_dir = anuga_dir+'boundaries'+sep+'urs'+sep+'exmouth'+sep+'1_10000'+sep
    125125
  • anuga_work/production/exmouth_2006/project.py

    r4542 r4544  
    3838starttime=3600
    3939finaltime=25000
    40 setup='store'
     40setup='final'
    4141extra='dampier'
    4242
     
    157157
    158158
    159 poly_coast = read_polygon(polygons_dir+'pts_coast.csv')
     159poly_coast = read_polygon(polygons_dir+'coast_new_pts.csv')
     160#poly_coast = read_polygon(polygons_dir+'pts_coast.csv')
    160161res_coast = 10000*res_factor
    161162
     
    163164#res_0 = 20000*res_factor
    164165
    165 poly_coast2 = read_polygon(polygons_dir+'pts_coast2.csv')
     166poly_coast2 = read_polygon(polygons_dir+'coast2_new_pts.csv')
     167#poly_coast2 = read_polygon(polygons_dir+'pts_coast2.csv')
    166168#res_0 = 20000*res_factor
    167169
     
    169171#res_0 = 20000*res_factor
    170172
    171 poly_exmouth = read_polygon(polygons_dir+'pts_exmouth.csv')
     173poly_exmouth = read_polygon(polygons_dir+'exmouth_new_pts.csv')
     174#poly_exmouth = read_polygon(polygons_dir+'pts_exmouth.csv')
    172175res_exmouth = 500*res_factor
     176
     177poly_exmouth_south = read_polygon(polygons_dir+'exmouth_south_pts.csv')
     178#res_exmouth = 500*res_factor
     179
     180poly_carpark1 = read_polygon(polygons_dir+'carpark1_pts.csv')
     181#res_exmouth = 500*res_factor
     182
     183poly_carpark2 = read_polygon(polygons_dir+'carpark2_pts.csv')
     184#res_exmouth = 500*res_factor
     185
     186poly_carpark3 = read_polygon(polygons_dir+'carpark3_pts.csv')
     187#res_exmouth = 500*res_factor
    173188
    174189poly_nth_defence = read_polygon(polygons_dir+'pts_nth_defence.csv')
    175190res_nth_defence = 5000*res_factor
    176191
    177 poly_middle = read_polygon(polygons_dir+'pts_middle.csv')
     192poly_middle = read_polygon(polygons_dir+'middle_new_pts.csv')
     193#poly_middle = read_polygon(polygons_dir+'pts_middle.csv')
    178194res_middle = 30000*res_factor
    179195
     
    183199interior_regions = [[poly_coast,res_coast],[poly_coast1,res_coast],[poly_coast2,res_coast]
    184200                   ,[poly_coast3,res_coast],[poly_middle,res_middle],[poly_exmouth,res_exmouth]
    185                    ,[poly_nth_defence,res_nth_defence],[poly_airport,res_airport]]
     201                   ,[poly_exmouth_south,res_exmouth],[poly_carpark1,res_exmouth],[poly_carpark2,res_exmouth]
     202                   ,[poly_carpark3,res_exmouth],[poly_nth_defence,res_nth_defence],[poly_airport,res_airport]]
    186203
    187204trigs_min = number_mesh_triangles(interior_regions, poly_all, res_poly_all)
  • anuga_work/production/onslow_2006/project_urs.py

    r4542 r4544  
    142142#output locations
    143143output_dir = anuga_dir+'outputs'+sep
    144 output_build_time_dir = output_dir+build_time+sep
     144output_build_time_dir = output_dir+build_time+'_'+source+sep
    145145output_run_time_dir = output_dir +run_time+dir_comment+sep
    146 #output_run_time_dir = output_dir +'20070608_062811_run_final_1.5_exmouth_nbartzis'+sep
     146#output_run_time_dir = output_dir +'20070613_034754_run_final_1.5_dampier_nbartzis'+sep
    147147output_run_time_dir_name = output_run_time_dir + scenario_name  #Used by post processing
    148148
  • anuga_work/production/onslow_2006/run_onslow_urs.py

    r4542 r4544  
    4545def run_model(**kwargs):
    4646   
    47     scenario_name = kwargs['aa_scenario_name']
     47#    scenario_name = kwargs['aa_scenario_name']
    4848   
    4949    #------------------------------------------------------------------------------
     
    6666#    kwargs['bathy_file']=project_urs.combined_small_dir_name + '.txt'
    6767    kwargs['boundary_file']=project_urs.boundaries_in_dir_name + '.sww'
    68    
     68    '''
     69    start_screen_catcher(kwargs['output_dir'], myid, numprocs)
     70       
    6971    print 'output_dir',kwargs['output_dir']
    7072    if myid == 0:
     
    7577
    7678    barrier()
    77 
    78     start_screen_catcher(kwargs['output_dir'], myid, numprocs)
    7979
    8080    print "Processor Name:",get_processor_name()
     
    224224   
    225225    kwargs['completed']=str(time.time()-t0)
    226    
    227     if myid == 0:
    228         store_parameters(**kwargs)
     226    '''
     227 #   if myid == 0:
     228#        store_parameters(**kwargs)
    229229   
    230230   
    231231    swwfile = kwargs['output_dir']+kwargs['aa_scenario_name']
    232232    print 'swwfile',swwfile
     233    '''
    233234    export_grid(swwfile, extra_name_out = 'town',
    234235#                quantities = ['depth'], # '(xmomentum**2 + ymomentum**2)**0.5' defaults to elevation
     
    246247                datum = 'WGS84',
    247248                format = 'asc')
    248    
     249    '''
    249250    buildings_filename = project_urs.buildings_filename
    250251    buildings_filename_out = project_urs.buildings_filename_out
  • anuga_work/production/pt_hedland_2006/project_urs.py

    r4542 r4544  
    3838finaltime=25000
    3939setup='final'
    40 source='onslow'
     40source='exmouth'
    4141
    4242if setup =='trial':
  • anuga_work/production/pt_hedland_2006/run_pt_hedland_urs.py

    r4542 r4544  
    4343def run_model(**kwargs):
    4444   
    45     tide = kwargs['tide']
    46     alpha = kwargs['alpha']
    47     friction = kwargs['friction']
    48     time_thinning = kwargs['time_thinning']
    49     scenario_name = kwargs['aa_scenario_name']
    50    
    51     #------------------------------------------------------------------------------
    52     # Copy scripts to time stamped output directory and capture screen
    53     # output to file
    54     #------------------------------------------------------------------------------
    55 
    56     #copy script must be before screen_catcher
    57     print 'tide',tide
     45    print 'tide',kwargs['tide']
    5846    kwargs['est_num_trigs']=project_urs.trigs_min
    5947    kwargs['num_cpu']=numprocs
     
    6654    kwargs['output_dir']=project_urs.output_run_time_dir
    6755    kwargs['bathy_file']=project_urs.combined_dir_name + '.txt'
    68 #    kwargs['bathy_file']=project_urs.combined_small_dir_name + '.pts'
    6956    kwargs['boundary_file']=project_urs.boundaries_in_dir_name + '.sww'
    70 #    kwargs['Completed']=''
     57
     58    #------------------------------------------------------------------------------
     59    # Copy scripts to time stamped output directory and capture screen
     60    # output to file
     61    #------------------------------------------------------------------------------
    7162
    7263    start_screen_catcher(kwargs['output_dir'], myid, numprocs)
     
    133124        from polygon import Polygon_function
    134125        #following sets the stage/water to be offcoast only
    135         IC = Polygon_function( [(project_urs.poly_mainland, -1.0)], default = tide,
     126        IC = Polygon_function( [(project_urs.poly_mainland, -1.0)], default = kwargs['tide'],
    136127                                 geo_reference = domain.geo_reference)
    137128        domain.set_quantity('stage', IC)
    138         domain.set_quantity('friction', friction)
     129        domain.set_quantity('friction', kwargs['friction'])
    139130       
    140131        print 'Start Set quantity'
     
    144135                            use_cache = True,
    145136                            verbose = True,
    146                             alpha = alpha)
     137                            alpha = kwargs['alpha'])
    147138        print 'Finished Set quantity'
    148139    barrier()
     
    159150    #------------------------------------------------------
    160151    print 'domain id', id(domain)
    161     domain.set_name(scenario_name)
     152    domain.set_name(kwargs['aa_scenario_name'])
    162153    domain.set_datadir(kwargs['output_dir'])
    163154    domain.set_default_order(2) # Apply second order scheme
     
    165156    domain.set_store_vertices_uniquely(False)
    166157    domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
    167     domain.set_maximum_allowed_speed(0.1) # Allow a little runoff (0.1 is OK)
    168     print 'domain id', id(domain)
    169     domain.beta_h = 0
    170     #domain.limit2007 = 1
     158#    domain.set_maximum_allowed_speed(0.1) # Allow a little runoff (0.1 is OK)
     159    domain.beta_h = 0 #sets the surface of the triangle to follow the bathy
     160    #domain.H0=0.01 #controls the flux limiter (limiter2007)
     161    #domain.limit2007 = 1 #minimises creep
    171162
    172163    #-------------------------------------------------------------------------
     
    178169
    179170    Bf = Field_boundary(kwargs['boundary_file'],
    180                     domain, time_thinning=time_thinning, mean_stage=tide,
     171                    domain, time_thinning=kwargs['time_thinning'], mean_stage=kwargs['tide'],
    181172                    use_cache=True, verbose=True)
    182173                   
     
    186177
    187178    Br = Reflective_boundary(domain)
    188     Bd = Dirichlet_boundary([tide,0,0])
     179    Bd = Dirichlet_boundary([kwargs['tide'],0,0])
    189180
    190181    print'set_boundary'
Note: See TracChangeset for help on using the changeset viewer.