Changeset 2930

Timestamp:

May 19, 2006, 5:34:17 PM (18 years ago)

Author:

nick

Message:

update to pt hedland

Location:

production/pt_hedland_2006

Files:

• project.py (modified) (6 diffs)
• run_pt_hedland.py (modified) (5 diffs)

production/pt_hedland_2006/project.py

@@ -4 +4 @@
 
 from os import sep, environ, getenv, getcwd
-from os.path import expanduser
+from os.path import expanduser, basename
 from utilities.polygon import read_polygon
 import sys
@@ -10 +10 @@
 from coordinate_transforms.redfearn import degminsec2decimal_degrees
 from time import localtime, strftime
+
+
+
 
 #Making assumptions about the location of scenario data
@@ -34 +37 @@
 #    python_home = getenv('PWD')     
 #    home = environ['INUNDATIONHOME']     #Sandpit's parent dir
+    user = basename(getenv('USERPROFILE'))
+    print 'USER:', user
 else:    
-#    home = environ['INUNDATIONHOME']     #Sandpit's parent dir
-#    home = getenv('INUNDATIONHOME')     
-#    python_home = getenv('PWD')     
     home = getenv('INUNDATIONHOME', sep+'d'+sep+'cit'+sep+'1'+sep+'cit'+sep+'risk_assessment_methods_project'+sep+'inundation')     
+    user = getenv('LOGNAME')
+    print 'USER:', user
+
 #    home = sep+'d'+sep+'cit'+sep+'1'+sep+'cit'+sep+'risk_assessment_methods_project'+sep+'inundation'
 #    home = expanduser('~')
@@ -111 +116 @@
 # bounding polygon provided by Hamish
 #d0 = [818732.55, 8062768.27]
+"""
+old 
 d0 = [755000.0, 8025000.0]
 d1 = [708940.32, 7750510.33]
@@ -116 +123 @@
 d3 = [604415.81, 7733013.56]
 d4 = [517682.34, 7899310.22]
+"""
 
-polyAll = [d0, d4, d3, d2, d1]
+d0 = [763852.0, 7934358.0]
+d1 = [710987.0, 7925797.0]
+d2 = [658264.0, 7926314.0]
+d3 = [552686.0, 7871580.0]
+d4 = [604415.81, 7733013.56]
+d5 = [656561.15, 7732615.11]
+d6 = [708940.32, 7750510.33]
+
+polyAll = [d0, d1, d2, d3, d4, d5, d6]
 
 #Interior region - Pt Hedland town
@@ -129 +145 @@
 
 #Are there other significant features?
-j0 = [670000, 7780000]
-j1 = [620000, 7745000]
-j2 = [665000, 7735000]
-j3 = [700000, 7755000]
+j0 = [670000, 7760000]
+j1 = [630000, 7745000]
+j2 = [665000, 7743000]
+j3 = [690000, 7755000]
 
 poly_region = [j0, j1, j2, j3]

production/pt_hedland_2006/run_pt_hedland.py

@@ -51 +51 @@
 
 # filenames
-print 'run home', project.home
 onshore_dem_name = project.onshore_dem_name
 offshore_points1 = project.offshore_dem_name1
@@ -117 +116 @@
 from pmesh.mesh_interface import create_mesh_from_regions
 
-region_res = 50000
+region_res = 100000
 coast_res = 2500
-pt_hedland_res = 5000
+pt_hedland_res = 500
 # derive poly_coast from project.coast_name using alpha_shape
 interior_regions = [[project.poly_pt_hedland, pt_hedland_res],
@@ -156 +155 @@
 #          {'boundary_tags': {'right': [0], 'bottomright': [1],
 #                             'bottomleft': [2], 'left': [3], 'top': [4]},
-          {'boundary_tags': {'top': [0], 'left': [1],
-                             'bottomleft': [2], 'bottomright': [3], 'right': [4]},
-           'maximum_triangle_area': 400000,
+          {'boundary_tags': {'topright': [0], 'top': [1],'topleft': [2], 'left': [3],
+                             'bottomleft': [4], 'bottomright': [5], 'right': [6]},
+           'maximum_triangle_area': 500000,
            'filename': meshname,           
            'interior_regions': interior_regions},
@@ -247 +246 @@
                    f=lambda t: [(60<t<480)*6, 0, 0])
 
-#domain.set_boundary( {'right': Br, 'bottomright': Br,
-#                             'bottomleft': Br, 'left': Br, 'top': Bf} )
-domain.set_boundary( {'top': Bf, 'left': Br, 'bottomleft': Br, 'bottomright': Br, 'right': Br} )
+#domain.set_boundary( {'top': Bf, 'left': Br, 'bottomleft': Br, 'bottomright': Br, 'right': Br} )
+#
+domain.set_boundary( {'topright': Bf, 'top': Bf,'topleft': Bf, 'left':  Br,
+                             'bottomleft': Br, 'bottomright': Br, 'right': Br})
                              
 #-------------------------------------------------------------------------------                                 
@@ -261 +261 @@
     domain.write_boundary_statistics(tags = 'top')     
 
-for t in domain.evolve(yieldstep = 240, finaltime = 12600
-                       ,skip_initial_step = True): 
-    domain.write_time()
-    domain.write_boundary_statistics(tags = 'top')     
-
-for t in domain.evolve(yieldstep = 240, finaltime = 19800
+for t in domain.evolve(yieldstep = 120, finaltime = 12600
+                       ,skip_initial_step = True): 
+    domain.write_time()
+    domain.write_boundary_statistics(tags = 'top')     
+
+for t in domain.evolve(yieldstep = 60, finaltime = 19800
                        ,skip_initial_step = True): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')     
     
-for t in domain.evolve(yieldstep = 240, finaltime = 25200
+for t in domain.evolve(yieldstep = 120, finaltime = 25200
                        ,skip_initial_step = True): 
     domain.write_time()