Changeset 1691

Timestamp:

Aug 8, 2005, 2:37:37 PM (19 years ago)

Author:

ole

Message:

minor clean up

File:

• inundation/ga/storm_surge/validation/LWRU2/lwru2.py (modified) (10 diffs)

inundation/ga/storm_surge/validation/LWRU2/lwru2.py

@@ -7 +7 @@
 http://www.cee.cornell.edu/longwave/index.cfm?page=benchmark&problem=2
 
+Depth at western boundary is d = 13.5 cm
 """
 
@@ -43 +44 @@
     from Scientific.IO.NetCDF import NetCDFFile
 
-    print filename[:-4] + '.sww'
-
-    fid = NetCDFFile(filename[:-4] + '.sww', 'w')
+    outfile = filename[:-4] + '.sww'
+    print 'Writing to', outfile
+    fid = NetCDFFile(outfile, 'w')
 
     fid.institution = 'Geoscience Australia'
@@ -58 +59 @@
 
     fid.createVariable('xmomentum', Float, ('number_of_timesteps',))
-    fid.variables['xmomentum'][:] = 0.0
-
+    fid.variables['xmomentum'][:] = 0.0 #0.04
     fid.createVariable('ymomentum', Float, ('number_of_timesteps',))
     fid.variables['ymomentum'][:] = 0.0
 
+    fid.close()
 
 
-    fid.close()
 
 
@@ -77 +77 @@
 from cPickle import dump, load
 
+
+boundary_file_name = 'Benchmark_2_input.txt'
+bathymetry_file_name = 'Benchmark_2_Bathymetry.txt'
+
+    
 try:
+    raise Exception
     print 'Read pickled domain'
     fid = open(picklefile)
@@ -85 +91 @@
 
     #Preparing time boundary
-    prepare_timeboundary('Benchmark_2_input.txt')
+    prepare_timeboundary(boundary_file_name)
 
     #Preparing points
     from pyvolution.data_manager import xya2pts
-    xya2pts('Benchmark_2_Bathymetry.txt', verbose = True)
+    xya2pts(bathymetry_file_name, verbose = True,
+            z_func = lambda z: -z)
 
 
@@ -95 +102 @@
     # Domain
     print 'Creating domain'
-    points, vertices, boundary = rectangular(200, 200/5*3,
+    points, vertices, boundary = rectangular(100, 100/5*3,
                                              len1=5.448, len2=3.402)
     domain = Domain(points, vertices, boundary)
@@ -111 +118 @@
     #LS code to be included in set_quantity
     from pyvolution import util, least_squares
-    points, attributes = util.read_xya('Benchmark_2_Bathymetry.pts')
-
+    points, attributes = util.read_xya(bathymetry_file_name[:-4] + '.pts')
+    
     #Fit attributes to mesh
     vertex_attributes = least_squares.fit_to_mesh(domain.coordinates,
@@ -118 +125 @@
                                                   points,
                                                   attributes['elevation'],
+                                                  alpha = 0,
                                                   verbose=True)
 
     print 'Initial values'
     domain.set_quantity('elevation', vertex_attributes)
+    #domain.set_quantity('elevation', bathymetry_file_name[:-4] + '.pts')    
     domain.set_quantity('friction', 0.0)
     domain.set_quantity('stage', 0.0)
@@ -137 +146 @@
 print 'Boundaries'
 Br = Reflective_boundary(domain)
-Bf = File_boundary('Benchmark_2_input.sww', domain, verbose=True)
+Bf = File_boundary(boundary_file_name[:-4] + '.sww', domain, verbose=True)
 
 #Set boundary conditions
 domain.set_boundary({'left': Bf, 'right': Br, 'bottom': Br, 'top': Br})
+
+
 
 
@@ -148 +159 @@
 domain.visualise = True
 
-for t in domain.evolve(yieldstep = 1.0, finaltime = 22.5):
+for t in domain.evolve(yieldstep = 0.05, finaltime = 22.5):
     domain.write_time()