Changeset 5150

Timestamp:

Mar 10, 2008, 4:00:52 PM (17 years ago)

Author:

nick

Message:

update geraldton

Location:

anuga_work/production/geraldton

Files:

• build_geraldton.py (modified) (4 diffs)
• project.py (modified) (7 diffs)
• run_geraldton.py (modified) (4 diffs)

anuga_work/production/geraldton/build_geraldton.py

@@ -36 +36 @@
 #------------------------------------------------------------------------------
 
-
 print 'time stamp: ',project.build_time
-print 'USER: ', project.user
-
 
 copy_code_files(project.output_build_time_dir,__file__, 
@@ -45 +42 @@
 
 start_screen_catcher(project.output_build_time_dir)
+
+print 'time stamp: ',project.build_time
+print 'USER: ', project.user, project.host
 
 
@@ -81 +81 @@
 
 print'create Geospatial data1 objects from topographies'
-G1 = Geospatial_data(file_name = onshore_dir_name + '.pts')
+G1 = Geospatial_data(file_name = onshore_dir_name + '.pts',verbose=True)
 print'finished reading in %s.pts' %onshore_dir_name
-G2 = Geospatial_data(file_name = coast_in_dir_name + '.txt')
-G3 = Geospatial_data(file_name = island_dir_name + '.pts')
-G4 = Geospatial_data(file_name = offshore_in_dir_name + '.txt')
+G2 = Geospatial_data(file_name = coast_in_dir_name + '.txt',verbose=True)
+G3 = Geospatial_data(file_name = island_dir_name + '.pts',verbose=True)
+G4 = Geospatial_data(file_name = offshore_in_dir_name + '.txt',verbose=True)
 print'finished reading in files'
 
-G_onshore_clip = G1.clip(project.poly_all, verbose=True)
-print 'finished clip'
-G_onshore_clip_clipout=G_onshore_clip.clip_outside(project.poly_cbd, verbose=True)
-print 'finished clipout'
-# reduce resolution by 9 time (1/9) of the original file. This was determined
-# as the resolution for this region is going to be 20000 and the asc grid cellsize is
-# 30m there (900). The sqrt of 20000 is about 140 or 150, a 150m x150m grid would contain
-# 36 points at a 30m grid spacing and we only need 4. So 4/36 is 1/9 or 0.11111
-G_onshore_clip_clipout_reduced=G_onshore_clip_clipout.split(0.111, verbose=True)
+#G_onshore_clip = G1.clip(project.poly_all, verbose=True)
+#print 'finished clip'
+#G_onshore_clip_clipout=G_onshore_clip.clip_outside(project.poly_cbd, verbose=True)
+#print 'finished clipout'
+## reduce resolution by 10 time (1/10) of the original file. This was determined
+## as the resolution for this region is going to be 20000 and the asc grid cellsize is
+## 10m there (100). There is 2 20000m triangles in a 200m x 200m grid sqrt of 40000 is about 200, 
+## a 200m x 200m area would contain 400 points at a 10m grid spacing and we only need 4. So 4/400 is 1/100 or 0.01
+## 1/100 reduction is possible but a 1/10 is enough to help with file size and loading
+#G_onshore_clip_clipout_reduced=G_onshore_clip_clipout.split(0.1, verbose=True)
+#
+#G_cbd = G1.clip(projec.poly_cbd,verbose=True)
+##G_cbd_reduced = G_cbd.split(0.25, verbose=True)
+#
+#G_bathy = G4.clip(project.poly_all)
+#G_island = G3.clip(project.poly_all)
+#G_coast = G2.clip(project.poly_all)
+#
+#print'add all geospatial objects'
+#G = G_onshore_clip_clipout_reduced + G_cbd_reduced + G_bathy + G_island + G_coast 
 
-G_cbd = G1.clip(projec.poly_cbd,verbose=True)
-G_cbd_reduced = G_cbd.split(0.25, verbose=True)
+G = G1 + G2 + G3 + G4
 
-G_bathy = G4.clip(project.poly_all)
-G_island = G3.clip(project.poly_all)
-G_coast = G2.clip(project.poly_all)
-
-print'add all geospatial objects'
-G = G_onshore_clip_clipout_reduced + G_cbd_reduced + G_bathy + G_island + G_coast 
+G_clip = G.clip(project.poly_all, verbose=True)
 
 print'clip combined geospatial object by bounding polygon'
@@ -116 +121 @@
 if access(project.topographies_dir,F_OK) == 0:
     mkdir (project.topographies_dir)
-G.export_points_file(project.combined_dir_name + '.txt')
+G_clip.export_points_file(project.combined_dir_name + '.txt')
 #G_clipped.export_points_file(project.combined_dir_name + '.xya')
-G_small, = G.split(0.1, verbose)
+G_small,G_other = G_clip.split(0.01, verbose=True)
 G_small.export_points_file(project.combined_dir_name_small + '.txt')
 

anuga_work/production/geraldton/project.py

@@ -39 +39 @@
 starttime=10000
 midtime=21600
-finaltime=25000
+#finaltime=25000
+finaltime=10000
 export_cellsize=50
-setup='trial'
+setup='final'
 source='other'
 
@@ -73 +74 @@
 
 #final topo name
-combined_name ='geraldton_combined_elevation.pts'
-combined_smaller_name = 'geraldton_combined_elevation_smaller'
+combined_name ='geraldton_combined_elevation'
+combined_name_small = 'geraldton_combined_elevation_small'
 
 anuga_dir = home+state+sep+scenario+sep+'anuga'+sep
 
-topographies_in_dir = home+sep+state+sep+scenario+sep+'elevation_final'+sep+'points'+sep
-topographies_dir = home+sep+state+sep+scenario+sep+'anuga'+sep+'topographies'+sep
+topographies_in_dir = home+state+sep+scenario+sep+'elevation_final'+sep+'points'+sep
+topographies_dir = home+state+sep+scenario+sep+'anuga'+sep+'topographies'+sep
 
 #input topo file location
@@ -95 +96 @@
 #final topo files
 combined_dir_name = topographies_dir + combined_name
-combined_smaller_dir_name = topographies_dir + combined_smaller_name
+combined_dir_name_small = topographies_dir + combined_name_small
 
 meshes_dir = anuga_dir+'meshes'+sep
@@ -127 +128 @@
 #output locations
 output_dir = anuga_dir+'outputs'+sep
-output_build_time_dir = output_dir+build_time+'_'+source+sep
+output_build_time_dir = output_dir+build_time+dir_comment+sep
 output_run_time_dir = output_dir +run_time+dir_comment+sep
 #output_run_time_dir = output_dir+sep+run_time+sep
@@ -134 +135 @@
 #gauges
 gauge_name = '???.csv'
-gauges_dir = home+sep+state+sep+scenario+sep+'anuga'+sep+'gauges'+sep
+gauges_dir = home+state+sep+scenario+sep+'anuga'+sep+'gauges'+sep
 gauges_dir_name = gauges_dir + gauge_name
 
@@ -171 +172 @@
 
 poly_neg20_pos20 = read_polygon(polygons_dir+'neg20_pos20_points.csv')
-res_neg20_pos20 = 25000*res_factor
+res_neg20_pos20 = 20000*res_factor
 
 poly_neg10_pos10= read_polygon(polygons_dir+'neg10_pos10_points.csv')
-res_neg10_pos10 = 5000*res_factor
+res_neg10_pos10 = 2000*res_factor
 
 poly_cbd = read_polygon(polygons_dir+'cbd_points.csv')
@@ -180 +181 @@
 
 poly_wallabi = read_polygon(polygons_dir+'island_wallabi_poly_points.csv')
-res_wallabi = 25000*res_factor
+res_wallabi = 20000*res_factor
+
 poly_dingiville = read_polygon(polygons_dir+'island_dingiville_poly_points.csv')
-res_dingiville = 25000*res_factor
+res_dingiville = 20000*res_factor
+
 poly_pelsaert = read_polygon(polygons_dir+'island_pelsaert_poly_points.csv')
-res_pelsaert = 25000*res_factor
+res_pelsaert = 20000*res_factor
 
 

anuga_work/production/geraldton/run_geraldton.py

@@ -168 +168 @@
     print 'domain id', id(domain)
     #print 'Reading Boundary file',project.boundaries_dir_namea + '.sww'
+    print'set_boundary'
+
+    Br = Reflective_boundary(domain)
+    Bd = Dirichlet_boundary([kwargs['tide'],0,0])
+    Bo = Dirichlet_boundary([kwargs['tide']+5.0,0,0])
 
     if project.source != 'other':
@@ -173 +178 @@
                     domain, time_thinning=kwargs['time_thinning'], mean_stage=kwargs['tide'], 
                     use_cache=True, verbose=True)
-                    
-    kwargs['input_start_time']=domain.starttime
-
-    print 'finished reading boundary file'
-
-    Br = Reflective_boundary(domain)
-    Bd = Dirichlet_boundary([kwargs['tide'],0,0])
-    Bo = Dirichlet_boundary([kwargs['tide']+5.0,0,0])
-
-
-    print'set_boundary'
-
-    domain.set_boundary({'back': Br,
-                         'side': Bd,
-                         'ocean': Bf}) 
+        print 'finished reading boundary file'
+        domain.set_boundary({'back': Br,
+                             'side': Bd,
+                             'ocean': Bf})
+    else: 
+        print 'set ocean'               
+        domain.set_boundary({'back': Br,
+                             'side': Bd,
+                             'ocean': Bd}) 
+
+#    kwargs['input_start_time']=domain.starttime
+
+
+
     print'finish set boundary'
 
@@ -195 +199 @@
     t0 = time.time()
 
-    for t in domain.evolve(yieldstep = 240, finaltime = kwargs['starttime']): 
+    for t in domain.evolve(yieldstep = 240, finaltime = kwargs['finaltime']): 
         domain.write_time()
         domain.write_boundary_statistics(tags = 'ocean')     
 
-        if allclose(t, 120):
+        if allclose(t, 240):
             domain.set_boundary({'back': Br, 'side': Bd, 'ocean': Bo})
 
-        if allclose(t, 720):
+        if allclose(t, 1440):
             domain.set_boundary({'back': Br, 'side': Bd, 'ocean': Bd})
 
@@ -274 +278 @@
     
     kwargs['output_dir']=project.output_run_time_dir
-    kwargs['bathy_file']=project.combined_dir_name
-#    kwargs['bathy_file']=project.combined_small_dir_name + '.pts'
+#    kwargs['bathy_file']=project.combined_dir_name+'.txt'
+    kwargs['bathy_file']=project.combined_dir_name_small + '.txt'
     kwargs['boundary_file']=project.boundaries_in_dir_name + '.sww'
     kwargs['file_name']=project.home+'detail.csv'