Changeset 6256


Ignore:
Timestamp:
Feb 2, 2009, 12:13:18 AM (10 years ago)
Author:
ole
Message:

Work on busselton for modelling style guide.

Location:
anuga_work/production/busselton/standardised_version
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • anuga_work/production/busselton/standardised_version/project.py

    r6254 r6256  
    256256
    257257# Combined all regions, must check that all are included!
    258 interior_regions = [[poly_aoi1,res_aoi1],[poly_aoi2,res_aoi2]
    259                      ,[poly_aos1,res_aos1],[poly_aos2,res_aos2]
    260                      ,[poly_aos3,res_aos3],[poly_aos4,res_aos4]
    261                      ,[poly_sw1,res_sw1]]
     258interior_regions = [[poly_aoi1,res_aoi1],[poly_aoi2,res_aoi2],
     259                    [poly_aos1,res_aos1],[poly_aos2,res_aos2],
     260                    [poly_aos3,res_aos3],[poly_aos4,res_aos4],
     261                    [poly_sw1,res_sw1]]
    262262
    263263   
  • anuga_work/production/busselton/standardised_version/run_busselton.py

    r6255 r6256  
    1515Ole Nielsen, Jane Sexton and Kristy Van Putten - 2008
    1616"""
     17
     18# Note repeated use of domain id
     19# Note naming of fundamental datasets and directories
     20
    1721
    1822#------------------------------------------------------------------------------
     
    4145from anuga_parallel.parallel_abstraction import get_processor_name
    4246from anuga.caching import myhash
    43 from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
     47#from anuga.damage_modelling.inundation_damage import add_depth_and_momentum2csv, inundation_damage
    4448from anuga.fit_interpolate.benchmark_least_squares import mem_usage
    4549from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
     
    104108
    105109    # FIXME(Ole): Introduce create_domain_from_regions: Simpler and caches well
    106     print 'start create mesh from regions'
     110    print 'Start create mesh from regions'
    107111
    108112    create_mesh_from_regions(bounding_polygon,
     
    120124
    121125    domain = Domain(project.meshes_dir_name, use_cache=False, verbose=True)
    122     print 'memory usage before del domain',mem_usage()
    123        
    124126    print domain.statistics()
    125     print 'triangles',len(domain)
    126    
    127127
    128128
     
    141141    domain.set_quantity('friction', project.friction)
    142142   
    143     print 'Start Set quantity',kwargs['elevation_file']
     143    print 'Start set quantity', kwargs['elevation_file']
    144144
    145145    domain.set_quantity('elevation',
     
    160160    # Set domain parameters
    161161    #------------------------------------------------------
    162     print 'domain id', id(domain)
    163162    domain.set_name(project.scenario_name)
    164     domain.set_datadir(kwargs['output_dir'])
     163    domain.set_datadir(kwargs['output_dir'])    # FIXME: Use project.output_run_time_dir
    165164    domain.set_default_order(2)                 # Apply second order scheme
    166165    domain.set_minimum_storable_height(0.01)    # Don't store anything less than 1cm
    167     domain.set_store_vertices_uniquely(False)
    168     domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
    169     domain.tight_slope_limiters = 1
    170     print 'domain id', id(domain)
     166    #domain.set_store_vertices_uniquely(False)
     167    #domain.set_quantities_to_be_stored(['stage', 'xmomentum', 'ymomentum'])
     168    #domain.tight_slope_limiters = 1
    171169
    172170    #-------------------------------------------------------------------------
     
    174172    #-------------------------------------------------------------------------
    175173    print 'Available boundary tags', domain.get_boundary_tags()
    176     print 'domain id', id(domain)
    177174   
    178175    boundary_urs_out=project.boundaries_dir_event + sep + project.scenario_name
     
    182179   
    183180    print 'Available boundary tags', domain.get_boundary_tags()
    184     Bf = Field_boundary(boundary_urs_out+'.sts',  # Change from file_boundary
    185                    domain, mean_stage= project.tide,
    186                    time_thinning=1,
    187                    default_boundary=Bd,
    188                    use_cache=True,
    189                    verbose = True,
    190                    boundary_polygon=bounding_polygon)
     181    Bf = Field_boundary(boundary_urs_out+'.sts',
     182                        domain, mean_stage= project.tide,
     183                        time_thinning=1,
     184                        default_boundary=Bd,
     185                        use_cache=True,
     186                        verbose = True,
     187                        boundary_polygon=bounding_polygon)
    191188
    192189    domain.set_boundary({'back': Br,
     
    195192
    196193
    197     print'finish set boundary'
     194    print 'Finish set boundary'
    198195
    199196    #----------------------------------------------------------------------------
     
    216213
    217214
    218     kwargs['completed']=str(time.time()-t0)
    219215     
    220     store_parameters(**kwargs)
     216
    221217
    222218   
Note: See TracChangeset for help on using the changeset viewer.