Changeset 3249

Timestamp:

Jun 28, 2006, 9:29:41 AM (19 years ago)

Author:

nick

Message:

onslow update

Location:

production/onslow_2006

Files:

• project.py (modified) (7 diffs)
• project.pyc (modified) (previous)
• run_onslow.py (modified) (6 diffs)

production/onslow_2006/project.py

@@ -3 +3 @@
 """
 
-from os import sep, environ
+from os import sep, environ, getenv, getcwd
 from os.path import expanduser
 from utilities.polygon import read_polygon
@@ -12 +12 @@
 from coordinate_transforms.redfearn import degminsec2decimal_degrees
 
-from time import localtime, strftime
-
-from os import getcwd
+from time import localtime, strftime, gmtime
                 
 #Making assumptions about the location of scenario data
@@ -35 +33 @@
 
 if sys.platform == 'win32':
-    home = environ['INUNDATIONHOME']     #Sandpit's parent dir
-    comparehome = environ['ANUGAHOME']
+    home = getenv('INUNDATIONHOME')
+#    python_home = getenv('PWD')     
+#    home = environ['INUNDATIONHOME']     #Sandpit's parent dir
+    user = getenv('USERPROFILE')
+#    user = basename(user_path)
+    print 'USER:', user
+    
 else:    
-    home = environ['INUNDATIONHOME']     #Sandpit's parent dir
-#    home = expanduser('~')
+    home = getenv('INUNDATIONHOME', sep+'d'+sep+'cit'+sep+'1'+sep+'cit'+sep+'risk_assessment_methods_project'+sep+'inundation')     
+    user = getenv('LOGNAME')
+    print 'USER:', user
 
 #Derive subdirectories and filenames
-time = strftime('%Y%m%d_%H%M%S',localtime()) #gets time for new dir
-outputtimedir = home+sep+scenario_dir_name+sep+'output'+sep+time+sep
+#time = strftime('%Y%m%d_%H%M%S',localtime()) #gets time for new dir
+local_time = strftime('%Y%m%d_%H%M%S',gmtime()) #gets time for new dir
+
 meshdir = home+sep+scenario_dir_name+sep+'meshes'+sep
 datadir = home+sep+scenario_dir_name+sep+'topographies'+sep
@@ -52 +57 @@
 outputdir = home+sep+scenario_dir_name+sep+'output'+sep
 tidedir = home+sep+scenario_dir_name+sep+'tide_data'+sep
-comparereportdir = comparehome+sep+'documentation'+sep+'experimentation'+sep+'boundary_ANUGA_MOST'+sep+'report'
-comparereportfigdir = comparehome+sep+'documentation'+sep+'experimentation'+sep+'boundary_ANUGA_MOST'+sep+'report_figures'
+
+outputtimedir = outputdir + local_time + sep
+
 print'bound', boundarydir
 
@@ -81 +87 @@
 codedirname = codedir + 'project.py'
 
-meshname = meshdir + basename
-
+#meshname = meshdir + basename
+meshname = outputtimedir + 'mesh_' + basename
+print 'meshname',meshname
 coarsedemname = datadir + coarsename
 
@@ -138 +145 @@
 #Interior region - Onslow town
 
+#first run!
 #i0 = [304000, 7608000]
-i0 = [304000, 7607000]
-i1 = [302000, 7605000]
+#i1 = [302000, 7605000]
 #i2 = [303000, 7602000]
+#i3 = [305000, 7601000]
+#i4 = [309000, 7603000]
+#i5 = [307000, 7606500]
+
+#refined run
+#i0 = [304000, 7607000]
+#i1 = [302000, 7605000]
+#i2 = [304000, 7603000]
+#i3 = [307000, 7602000]
+#i4 = [309000, 7603000]
+#i5 = [307000, 7606000]
+
+#for visualisation
+i0 = [304000, 7609000]
+i1 = [301500, 7605000]
 i2 = [304000, 7603000]
-#i3 = [305000, 7601000]
 i3 = [307000, 7602000]
 i4 = [309000, 7603000]
-#i5 = [307000, 7606500]
-i5 = [307000, 7606000]
+i5 = [311000, 7607000]
+
+
 
 poly_onslow = [i0, i1, i2, i3, i4, i5]
@@ -189 +211 @@
 
 poly_region = [m0, m1, m2, m3, m4, m5]
-
-from coordinate_transforms.redfearn import redfearn
-# boundary up to 50 m contour
-lat1_50 = degminsec2decimal_degrees(-21,30,0)
-lat2_50 = degminsec2decimal_degrees(-21,25,0)
-lat3_50 = degminsec2decimal_degrees(-21,12,0)
-lat4_50 = degminsec2decimal_degrees(-21,0,0)
-lon1_50 = degminsec2decimal_degrees(114,40,0)
-lon2_50 = degminsec2decimal_degrees(114,49,0)
-lon3_50 = degminsec2decimal_degrees(115,1,0)
-lon4_50 = degminsec2decimal_degrees(115,9,0)
-z, easting, northing = redfearn(lat1_50, lon1_50)
-p0_50 = [easting, northing]
-z, easting, northing = redfearn(lat2_50, lon2_50)
-p1_50 = [easting, northing]
-z, easting, northing= redfearn(lat3_50, lon3_50)
-p2_50 = [easting, northing]
-z, easting, northing = redfearn(lat4_50, lon4_50)
-p3_50 = [easting, northing]
-
-d4_50 = [285000, 7585000]
-d6_50 = [330000, 7605000]
-bounding_poly50 = [p0_50, p1_50, p2_50, p3_50, d6_50, d5, d4_50]
-
-# boundary up to 25 m contour
-lat1_25 = degminsec2decimal_degrees(-21,30,0)
-lat2_25 = degminsec2decimal_degrees(-21,24,0)
-lat3_25 = degminsec2decimal_degrees(-21,3,0)
-lon1_25 = degminsec2decimal_degrees(114,46,0)
-lon2_25 = degminsec2decimal_degrees(114,53,0)
-lon3_25 = degminsec2decimal_degrees(115,9,0)
-z, easting, northing = redfearn(lat1_25, lon1_25)
-p0_25 = [easting, northing]
-z, easting, northing = redfearn(lat2_25, lon2_25)
-p1_25 = [easting, northing]
-z, easting, northing = redfearn(lat3_25, lon3_25)
-p2_25 = [easting, northing]
-bounding_poly25 = [p0_25, p1_25, p2_25, d6, d5, d4]

production/onslow_2006/run_onslow.py

@@ -88 +88 @@
 #    print' most file', project.MOST_dir + project.boundary_basename
 
-"""
+'''
 # fine data (clipping the points file to smaller area)
 # creates DEM from asc data
@@ -113 +113 @@
 print'export G'
 G.export_points_file(project.combined_dem_name + '.pts')
-"""
+'''
 
 #-------------------------------------------------------------------------------                                 
@@ -122 +122 @@
 
 from pmesh.mesh_interface import create_mesh_from_regions
-
+'''
+# original
+interior_res = 5000
+high_res = 1500
+interior_regions = [[project.poly_onslow, high_res],
+                    [project.poly_thevenard, interior_res],
+                    [project.poly_coast, interior_res]]
+'''
 #new
-region_res = 50000
-coast_res = 2500
+region_res = 25000
+coast_res = 25000
 onslow_res = 500
 interior_regions = [[project.poly_onslow, onslow_res],
-                    [project.poly_coast, coast_res]]
-#,
+                    [project.poly_coast, coast_res]]#,
 #                    [project.poly_region, region_res]]
 
@@ -141 +147 @@
                              'bottom': [4], 'bottomright': [5],
                              'topright':[6]},
-           'maximum_triangle_area': 1000000,
+           'maximum_triangle_area': 100000,
            'filename': meshname,           
            'interior_regions': interior_regions},
-          verbose = True)
+          verbose = True, evaluate=True)
 
 
@@ -235 +241 @@
        'inverted_bathymetry': True},
       #evaluate = True,
-       verbose = True)
+       verbose = True, evaluate=True)
 
 
@@ -260 +266 @@
 t0 = time.time()
 
-for t in domain.evolve(yieldstep = 240, finaltime = 7200): 
+for t in domain.evolve(yieldstep = 450, finaltime = 10800): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')     
 
-for t in domain.evolve(yieldstep = 120, finaltime = 12600
+for t in domain.evolve(yieldstep = 60, finaltime = 17760
                        ,skip_initial_step = True): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')     
 
-for t in domain.evolve(yieldstep = 60, finaltime = 19800
+for t in domain.evolve(yieldstep = 480, finaltime = 36000
                        ,skip_initial_step = True): 
     domain.write_time()
     domain.write_boundary_statistics(tags = 'top')     
     
-for t in domain.evolve(yieldstep = 120, finaltime = 25200
-                       ,skip_initial_step = True): 
-    domain.write_time()
-    domain.write_boundary_statistics(tags = 'top')     
-
-for t in domain.evolve(yieldstep = 240, finaltime = 36000
-                       ,skip_initial_step = True): 
-    domain.write_time()
-    domain.write_boundary_statistics(tags = 'top')     
   
 print 'That took %.2f seconds' %(time.time()-t0)