Changeset 6203


Ignore:
Timestamp:
Jan 19, 2009, 12:07:31 PM (10 years ago)
Author:
kristy
Message:
 
Location:
anuga_work/production/patong
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • anuga_work/production/patong/build_patong2.py

    r6202 r6203  
    7575
    7676print 'add G1 + G2'
    77 G5 = G1+G2
     77G5 = G1 + G2
    7878
    7979#-------------------------------------------------------------------------------
     
    8181#-------------------------------------------------------------------------------
    8282
     83<<<<<<< .mine
     84##print 'clipping outside extents'
     85##G1_clip = G1.clip(project.extent_elev_dir4, verbose=True)
     86##G3_clip1 = G3.clip_outside(project.extent_elev_dir4, verbose=True)
     87##G3_clip2 =G3_clip1.clip_outside(project.extent_elev_dir2, verbose=True)
     88##G4_clip = G4.clip_outside(project.extent_elev_dir3, verbose=True)
     89##
     90###print 'hello', dir(G3_clip1), dir(G3_clip1), dir(G4_clip)
     91##print'add all geospatial objects'
     92##G = G1_clip + G2 + G3_clip1 + G3_clip2 + G4_clip
     93
     94G3_clip1 = G3.clip_outside(project.extent_elev_dir1, verbose=True)
     95G3_clip2 = G3_clip1.clip_outside(project.extent_elev_dir2, verbose=True)
     96=======
    8397print 'clipping outside extents'
    8498G1_clip = G1.clip(project.extent_elev_dir4, verbose=True)
    8599G3_clip1 = G3.clip_outside(project.extent_elev_dir4, verbose=True)
    86100G3_clip2 = G3_clip1.clip_outside(project.extent_elev_dir2, verbose=True)
     101>>>>>>> .r6199
    87102G4_clip = G4.clip_outside(project.extent_elev_dir3, verbose=True)
    88103
    89 #print 'hello', dir(G3_clip1), dir(G3_clip1), dir(G4_clip)
    90 print'add all geospatial objects'
    91 G = G1_clip + G2 + G3_clip1 + G3_clip2 + G4_clip
     104G = G3_clip2 + G5 + G4_clip
    92105
    93106print'clip combined geospatial object by bounding polygon'
  • anuga_work/production/patong/export_results_max.py

    r6028 r6203  
    2020directory = project.output_dir
    2121
    22 time_dir1 = '20081126_141801_run_final_0.8_kvanputt'
     22time_dir1 = '20090106_122422_run_trial_0.8_poly_kvanputt'
     23time_dir2 = '20090106_122015_run_trial_0.8_kvanputt'
    2324
    24 time_dirs = [time_dir1]
     25time_dirs = [time_dir1, time_dir2]
    2526 
    2627
     
    2829#cellsize = 250
    2930
    30 timestep = None    # None means no timestep!
    31 #timestep = 0
     31#timestep = None    # None means no timestep!
     32timestep = 0
    3233
    3334######
     
    4950
    5051# one or more key strings from var_equations above
    51 var = ['stage', 'elevation', 'depth', 'speed']
     52var = ['stage', 'elevation']
    5253
    5354######
  • anuga_work/production/patong/project.py

    r6194 r6203  
    7474# Important to distinguish each run - ensure str(user) is included!
    7575# Note, the user is free to include as many parameters as desired
    76 dir_comment='_'+setup+'_'+str(tide)+'_'+str(user)
     76dir_comment='_'+setup+'_'+str(tide)+'_poly_'+str(user)
    7777
    7878#------------------------------------------------------------------------------
     
    136136
    137137# where the combined elevation file sits
    138 combined_dir_name = topographies_dir + combined_name
     138combined_dir_name = topographies_dir + combined_name + '_data'
    139139combined_smaller_name_dir = topographies_dir + combined_smaller_name
    140140
    141141# where the mesh sits (this is created during the run_patong.py)
    142 meshes_dir_name = meshes_dir + scenario_name+'.msh'
     142meshes_dir_name = meshes_dir + scenario_name+'_poly.msh'
    143143
    144144# where the boundary ordering files sit (this is used within build_boundary.py)
     
    171171# Initial bounding polygon for data clipping
    172172poly_all = read_polygon(polygons_dir+'poly_all.csv')
    173 res_poly_all = 100000*res_factor
     173res_poly_all = 10000*res_factor
    174174
    175175# Area of Interest 1 elevation from -10m to 20m
Note: See TracChangeset for help on using the changeset viewer.