Changeset 6203

Timestamp:

Jan 19, 2009, 12:07:31 PM (16 years ago)

Author:

kristy

Message:

 

Location:

anuga_work/production/patong

Files:

• build_patong2.py (moved) (moved from anuga_work/production/patong/build_patong.py) (2 diffs)
• export_results_max.py (modified) (3 diffs)
• project.py (modified) (3 diffs)

anuga_work/production/patong/build_patong2.py

@@ -75 +75 @@
 
 print 'add G1 + G2'
-G5 = G1+G2
+G5 = G1 + G2
 
 #-------------------------------------------------------------------------------
@@ -81 +81 @@
 #-------------------------------------------------------------------------------
 
+<<<<<<< .mine
+##print 'clipping outside extents'
+##G1_clip = G1.clip(project.extent_elev_dir4, verbose=True) 
+##G3_clip1 = G3.clip_outside(project.extent_elev_dir4, verbose=True) 
+##G3_clip2 =G3_clip1.clip_outside(project.extent_elev_dir2, verbose=True)
+##G4_clip = G4.clip_outside(project.extent_elev_dir3, verbose=True)
+##
+###print 'hello', dir(G3_clip1), dir(G3_clip1), dir(G4_clip)
+##print'add all geospatial objects'
+##G = G1_clip + G2 + G3_clip1 + G3_clip2 + G4_clip
+
+G3_clip1 = G3.clip_outside(project.extent_elev_dir1, verbose=True)
+G3_clip2 = G3_clip1.clip_outside(project.extent_elev_dir2, verbose=True)
+=======
 print 'clipping outside extents'
 G1_clip = G1.clip(project.extent_elev_dir4, verbose=True) 
 G3_clip1 = G3.clip_outside(project.extent_elev_dir4, verbose=True) 
 G3_clip2 = G3_clip1.clip_outside(project.extent_elev_dir2, verbose=True)
+>>>>>>> .r6199
 G4_clip = G4.clip_outside(project.extent_elev_dir3, verbose=True)
 
-#print 'hello', dir(G3_clip1), dir(G3_clip1), dir(G4_clip)
-print'add all geospatial objects'
-G = G1_clip + G2 + G3_clip1 + G3_clip2 + G4_clip
+G = G3_clip2 + G5 + G4_clip
 
 print'clip combined geospatial object by bounding polygon'

anuga_work/production/patong/export_results_max.py

@@ -20 +20 @@
 directory = project.output_dir
 
-time_dir1 = '20081126_141801_run_final_0.8_kvanputt'
+time_dir1 = '20090106_122422_run_trial_0.8_poly_kvanputt'
+time_dir2 = '20090106_122015_run_trial_0.8_kvanputt'
 
-time_dirs = [time_dir1]
+time_dirs = [time_dir1, time_dir2]
   
 
@@ -28 +29 @@
 #cellsize = 250
 
-timestep = None    # None means no timestep!
-#timestep = 0
+#timestep = None    # None means no timestep!
+timestep = 0
 
 ######
@@ -49 +50 @@
 
 # one or more key strings from var_equations above
-var = ['stage', 'elevation', 'depth', 'speed']
+var = ['stage', 'elevation']
 
 ######

anuga_work/production/patong/project.py

@@ -74 +74 @@
 # Important to distinguish each run - ensure str(user) is included!
 # Note, the user is free to include as many parameters as desired
-dir_comment='_'+setup+'_'+str(tide)+'_'+str(user)
+dir_comment='_'+setup+'_'+str(tide)+'_poly_'+str(user)
 
 #------------------------------------------------------------------------------
@@ -136 +136 @@
 
 # where the combined elevation file sits
-combined_dir_name = topographies_dir + combined_name
+combined_dir_name = topographies_dir + combined_name + '_data'
 combined_smaller_name_dir = topographies_dir + combined_smaller_name
 
 # where the mesh sits (this is created during the run_patong.py)
-meshes_dir_name = meshes_dir + scenario_name+'.msh'
+meshes_dir_name = meshes_dir + scenario_name+'_poly.msh'
 
 # where the boundary ordering files sit (this is used within build_boundary.py)
@@ -171 +171 @@
 # Initial bounding polygon for data clipping 
 poly_all = read_polygon(polygons_dir+'poly_all.csv')
-res_poly_all = 100000*res_factor
+res_poly_all = 10000*res_factor
 
 # Area of Interest 1 elevation from -10m to 20m