Changeset 6192


Ignore:
Timestamp:
Jan 19, 2009, 6:49:40 AM (10 years ago)
Author:
ole
Message:

Work on Patong and some diagnostic output

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

    r6189 r6192  
    392392
    393393        if boundary_polygon is not None:
    394             #removes sts points that do not lie on boundary
     394            # Remove sts points that do not lie on boundary
    395395            # FIXME(Ole): Why don't we just remove such points from the list of points and associated data?
    396396            # I am actually convinced we can get rid of neighbour_gauge_id altogether as the sts file is produced using the ordering file.
     
    404404            for i in range(len(boundary_polygon)):
    405405                for j in range(len(x)):
    406                     if num.allclose(vertex_coordinates[j],boundary_polygon[i],1e-4):
     406                    if num.allclose(vertex_coordinates[j],
     407                                    boundary_polygon[i], 1e-4):
    407408                        #FIXME:
    408409                        #currently gauges lat and long is stored as float and
     
    475476        if boundary_polygon is not None:
    476477            #removes sts points that do not lie on boundary
    477             quantities[name] = num.take(quantities[name],gauge_id,1)
     478            quantities[name] = num.take(quantities[name], gauge_id, 1)
    478479           
    479480    # Close sww, tms or sts netcdf file         
     
    488489        #vertex coordinates is position of urs gauges
    489490
     491    if verbose:
     492        print 'Call interpolation function'
    490493    # Return Interpolation_function instance as well as
    491494    # starttime for use to possible modify that of domain
  • anuga_work/production/patong/project.py

    r6178 r6192  
    4848finaltime=15000         # final time for simulation 15000
    4949
    50 setup='trial'  # Final can be replaced with trial or basic.
     50setup='final'  # Final can be replaced with trial or basic.
    5151               # Either will result in a coarser mesh that will allow a
    5252               # faster, but less accurate, simulation.
     
    6666    res_factor=1
    6767    time_thinning=4
     68    #time_thinning=48   
    6869    yieldstep=60
    6970
     
    174175# Area of Interest 1 elevation from -10m to 20m
    175176poly_aoi1 = read_polygon(polygons_dir+'aoi.csv')
    176 res_aoi1 = 500*res_factor
     177res_aoi1 = 800*res_factor
    177178
    178179# Area of Significance 1 elevation from -20m to a 200m buffer of the 20m contour
     
    184185res_sw = 2000*res_factor
    185186
     187
     188# Area of buildings
     189building_main = read_polygon(polygons_dir+'building_main.csv')
     190building_main_small = read_polygon(polygons_dir+'building_main_small.csv')
     191building_main_south = read_polygon(polygons_dir+'building_main_south.csv')
     192building_saddle = read_polygon(polygons_dir+'building_saddle.csv')
     193bld_res = 100*res_factor
     194
     195
     196
     197
    186198# Combined all regions, must check that all are included!
    187 interior_regions = [[poly_aoi1,res_aoi1],[poly_aos1,res_aos1]
    188                     ,[poly_sw,res_sw]]
     199interior_regions = [[poly_aoi1,res_aoi1],
     200                    [poly_aos1,res_aos1],
     201                    [poly_sw,res_sw],
     202                    [building_main, bld_res],
     203                    [building_main_small, bld_res],                   
     204                    [building_main_south, bld_res],
     205                    [building_saddle, bld_res]]
    189206                 
    190207   
  • anuga_work/production/patong/run_patong.py

    r6190 r6192  
    5959
    6060#copy_code_files(output_dir,__file__,
    61 #         dirname(project.__file__)+sep+ project.__name__+'.py' )
     61#                dirname(project.__file__)+sep+ project.__name__+'.py' )
    6262
    6363#start_screen_catcher(output_dir, myid, numprocs)
     
    122122
    123123# Add buildings from file
    124 print 'Creating building polygons'   
     124print 'Reading building polygons'   
    125125building_polygons, building_heights = csv2building_polygons(project.building_polygon_file)
    126126
     127print 'Creating building polygons'   
    127128L = []
    128129for key in building_polygons:
     
    180181    print domain.timestepping_statistics()
    181182    print domain.boundary_statistics(tags='ocean')
    182 
     183   
    183184print 'Simulation took %.2f seconds' %(time.time()-t0)
    184185     
Note: See TracChangeset for help on using the changeset viewer.