Changeset 6975


Ignore:
Timestamp:
May 5, 2009, 6:51:54 PM (11 years ago)
Author:
ole
Message:

Removed accidental copying of the 'gulf' scenario onto 'bamaga.'
This reverted all changesets from 6895 to the current (6972).
The command used on bamaga was

svn merge -r HEAD:6894 .

Location:
anuga_work/production/australia_ph2/bamaga
Files:
2 deleted
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • anuga_work/production/australia_ph2/bamaga/build_elevation.py

    r6895 r6975  
    5959        dem2pts(absolute_filename, use_cache=True, verbose=True)
    6060
    61         G_grid = Geospatial_data(file_name=absolute_filename+'.pts',
     61        geospatial_data[filename] = Geospatial_data(file_name=absolute_filename+'.pts',
    6262                                                    verbose=True)
    63         print 'Clip geospatial object'
    64         geospatial_data[filename] = G_grid.clip(project.bounding_polygon)
    6563
    6664# Create Geospatial data from TXT files
     
    6866    for filename in project.point_filenames:
    6967        absolute_filename = join(project.topographies_folder, filename)
    70         G_points = Geospatial_data(file_name=absolute_filename,
     68        geospatial_data[filename] = Geospatial_data(file_name=absolute_filename,
    7169                                                    verbose=True)
    72         print 'Clip geospatial object'
    73         geospatial_data[filename] = G_points.clip(project.bounding_polygon)
    7470
    7571#-------------------------------------------------------------------------------
     
    8682    G += geospatial_data[key]
    8783       
    88 #print 'Clip combined geospatial data'
     84print 'Clip combined geospatial data'
    8985##G_clip = G.clip_outside(project.poly_aoi1)
    9086##G_all = G_clip + geospatial_data[project.point_filenames[4]]
    9187#G_clipped = G_all.clip(project.poly_all)
    92 #G_clip = G.clip(project.bounding_polygon)
     88G_clip = G.clip(project.bounding_polygon)
    9389
    9490
    9591print 'Export combined DEM file'
    96 G.export_points_file(project.combined_elevation + '.pts')
     92G_clip.export_points_file(project.combined_elevation + '.pts')
    9793print 'Do txt version too'
    9894# Use for comparision in ARC
    99 G.export_points_file(project.combined_elevation + '.txt')
     95G_clip.export_points_file(project.combined_elevation + '.txt')
    10096
  • anuga_work/production/australia_ph2/bamaga/export_results_max.py

    r6939 r6975  
    2222directory = project.output_folder
    2323
    24 ##time_dir1 = '20090408_152655_run_final_0_31975_2000_Tb__mhingee'
    25 ##time_dir2 = '20090409_123239_run_final_0_51390_2000_Tb__mhingee'
    26 ##time_dir3 = '20090410_110658_run_final_0_63735_2000_Tb__mhingee'
     24time_dir1 = '20090408_152655_run_final_0_31975_2000_Tb__mhingee'
     25time_dir2 = '20090409_123239_run_final_0_51390_2000_Tb__mhingee'
     26time_dir3 = '20090410_110658_run_final_0_63735_2000_Tb__mhingee'
    2727
    28 time_dir1 = '20090421_135412_run_final_0_31975_2000_Tb_internal_lfountai'
    29 
    30 time_dirs = [time_dir1]#, time_dir2, time_dir3]
     28time_dirs = [time_dir1, time_dir2, time_dir3]
    3129
    3230cellsize = 250
     
    8482
    8583            name1 = join(directory, time_dir, project.scenario_name)
    86 ##            name2 = join(directory, time_dir, project.scenario_name)+'_time_37920_0'
    87             name2 = join(directory, time_dir, project.scenario_name)+'_time_37860_0'
    88            
     84            name2 = join(directory, time_dir, project.scenario_name)+'_time_37920_0'
     85
    8986            names = [name1, name2]
    9087
  • anuga_work/production/australia_ph2/bamaga/run_model.py

    r6911 r6975  
    8787# Number of boundary segments
    8888num_ocean_segments = len(event_sts) - 1
    89 print num_ocean_segments
    9089# Number of landward_boundary points
    9190num_land_points = file_length(project.landward_boundary)
    92 print num_land_points
     91
    9392# Boundary tags refer to project.landward_boundary
    9493# 4 points equals 5 segments start at N
    95 boundary_tags={'back': range(num_ocean_segments+2,
    96                              num_ocean_segments+5),
     94boundary_tags={'back': range(num_ocean_segments+1,
     95                             num_ocean_segments+num_land_points),
    9796               'side': [num_ocean_segments,
    98                         num_ocean_segments+1,
    99                         num_ocean_segments+5,
    100                         num_ocean_segments+6,
    101                         num_ocean_segments+7,
    102                         num_ocean_segments+8,
    103                         num_ocean_segments+9],
     97                        num_ocean_segments+num_land_points],
    10498               'ocean': range(num_ocean_segments)}
    105 ##boundary_tags = {'back':[3],
    106 ##                 'side':[2,4],
    107 ##                 'ocean':[0,1,5]}
    108 
    109 print 'boundary tags', boundary_tags
    11099
    111100# Build mesh and domain
Note: See TracChangeset for help on using the changeset viewer.