Changeset 1703

Timestamp:

Aug 10, 2005, 4:56:41 PM (19 years ago)

Author:

ole

Message:

Added unstructured mesh

Location:

inundation/ga/storm_surge/validation/LWRU2

Files:

• create_mesh.py (added)
• filenames.py (added)
• lwru2.py (modified) (8 diffs)

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

@@ -59 +59 @@
 
     fid.createVariable('xmomentum', Float, ('number_of_timesteps',))
-    #fid.variables['xmomentum'][:] = 0.005
-    #fid.variables['xmomentum'][:-1] = Q[1:]-Q[:-1]/0.05 #Too high
-    #fid.variables['xmomentum'][:-1] = Q[1:]-Q[:-1]/0.5   #Too low
-    #fid.variables['xmomentum'][:-1] = Q[1:]-Q[:-1]/0.1   #Too high
-    #fid.variables['xmomentum'][:-1] = Q[1:]-Q[:-1]/0.25   #Too high
-    #fid.variables['xmomentum'][:-1] = Q[1:]-Q[:-1]/0.35 #Too low
-    #fid.variables['xmomentum'][:-1] = Q[1:]-Q[:-1]/0.3  #Too low
-    #fid.variables['xmomentum'][-1] = 0.0
-
-
-    #fid.variables['xmomentum'][:] = 0.003
     fid.variables['xmomentum'][:] = 0.0
 
@@ -82 +71 @@
             File_boundary, Transmissive_Momentum_Set_Stage_boundary
 from pyvolution.mesh_factory import rectangular
+from pyvolution.pmesh2domain import pmesh_to_domain_instance 
 from Numeric import array, zeros, Float, allclose
+import filenames
 
 picklefile = 'domain.pck'
 from cPickle import dump, load
 
-
-boundary_file_name = 'Benchmark_2_input.txt'
-bathymetry_file_name = 'Benchmark_2_Bathymetry.txt'
-N = 100
+N = 50
 
 try:
-    #raise Exception
+    raise Exception
     fid = open(picklefile)
     print 'Read pickled domain'
@@ -101 +89 @@
 
     #Preparing time boundary
-    prepare_timeboundary(boundary_file_name)
+    prepare_timeboundary(filenames.boundary_filename)
 
     #Preparing points
     from pyvolution.data_manager import xya2pts
-    xya2pts(bathymetry_file_name, verbose = True,
+    xya2pts(filenames.bathymetry_filename, verbose = True,
             z_func = lambda z: -z)
 
@@ -111 +99 @@
     #######################
     # Domain
-    print 'Creating domain'
-    points, vertices, boundary = rectangular(N, N/5*3,
-                                             len1=5.448, len2=3.402)
-    domain = Domain(points, vertices, boundary)
+    #print 'Creating domain'
+    #points, vertices, boundary = rectangular(N, N/5*3,
+    #                                         len1=5.448, len2=3.402)
+    #domain = Domain(points, vertices, boundary)
+
+    print 'Creating domain from', filenames.mesh_filename
+    domain = pmesh_to_domain_instance(filenames.mesh_filename, Domain)
+
+    print "Number of triangles = ", len(domain)
+    print 'The extent is ', domain.get_extent()
+
 
     domain.check_integrity()
@@ -128 +123 @@
     #LS code to be included in set_quantity
     from pyvolution import util, least_squares
-    points, attributes = util.read_xya(bathymetry_file_name[:-4] + '.pts')
+    points, attributes = util.read_xya(filenames.bathymetry_filename[:-4] + '.pts')
 
     #Fit attributes to mesh
@@ -140 +135 @@
     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)
@@ -155 +149 @@
 print 'Boundaries'
 Br = Reflective_boundary(domain)
-#Bf = File_boundary(boundary_file_name[:-4] + '.sww', domain, verbose=True)
 
 #####################
@@ -161 +154 @@
 # stage and let the scheme set the momentum
 from pyvolution.util import file_function
-function = file_function(boundary_file_name[:-4] + '.sww', domain,verbose = True)
+function = file_function(filenames.boundary_filename[:-4] + '.sww', domain,
+                         verbose = True)
 Bts = Transmissive_Momentum_Set_Stage_boundary(domain,function)