Changeset 1810

Timestamp:

Sep 8, 2005, 4:36:43 PM (19 years ago)

Author:

ole

Message:

Cleanup

Location:

inundation/validation/Completed/LWRU2

Files:

• Benchmark_2_Bathymetry.txt (modified) (1 diff)
• README.txt (modified) (1 diff)
• lwru2.py (modified) (7 diffs)
• project.py (moved) (moved from inundation/validation/Completed/LWRU2/filenames.py)

inundation/validation/Completed/LWRU2/Benchmark_2_Bathymetry.txt

@@ -95892 +95892 @@
  5.48800e+00  3.38800e+00 -1.2500000e-01
  5.48800e+00  3.40200e+00 -1.2500000e-01
-
- 
- 

inundation/validation/Completed/LWRU2/README.txt

@@ -7 +7 @@
 http://www.cee.cornell.edu/longwave/index.cfm?page=benchmark&problem=2
 
-Run the code lwru2.py with the variable read_mesh = False (at the top
+Run the code lwru2.py with the variable use_variable_mesh = False (at the top
 of the code) and then extract_timeseries.py to see the results.
 
 If you wish to look at the a more detailed animation, create a mesh
-using the script create_mesh.py and run lwru2.py again with read_mesh
+using the script create_mesh.py and run lwru2.py again with use_variable_mesh
 = True. The resulting sww file can be viewed with e.g. Swollen.
 

inundation/validation/Completed/LWRU2/lwru2.py

@@ -1 @@
-"""Example of shallow water wave equation.
+"""Validation of the AnuGA implementation of the shallow water wave equation.
 
 This script sets up LWRU2 benchmark with initial condition stated
@@ -11 +11 @@
 
 
-#read_mesh = True  #Use large unstructured mesh generated from create_mesh.py
-read_mesh = False  #Use small structured mesh
+#use_variable_mesh = True #Use large variable mesh generated by create_mesh.py
+use_variable_mesh = False #Use small structured mesh
+
+
 
 import sys
@@ -73 +75 @@
 # Module imports
 from pyvolution.shallow_water import Domain, Reflective_boundary,\
-            File_boundary, Transmissive_Momentum_Set_Stage_boundary
+     File_boundary, Transmissive_Momentum_Set_Stage_boundary
 from pyvolution.mesh_factory import rectangular_cross
 from pyvolution.pmesh2domain import pmesh_to_domain_instance
 from Numeric import array, zeros, Float, allclose
-import filenames
+import project
 from caching import cache
 
 #Preparing time boundary
-prepare_timeboundary(filenames.boundary_filename)
+prepare_timeboundary(project.boundary_filename)
 
 #Preparing points
 from pyvolution.data_manager import xya2pts
-xya2pts(filenames.bathymetry_filename, verbose = True,
+xya2pts(project.bathymetry_filename, verbose = True,
         z_func = lambda z: -z)
 
@@ -91 +93 @@
 #######################
 # Domain
-
-if read_mesh is True:
-    print 'Creating domain from', filenames.mesh_filename
-    #domain = pmesh_to_domain_instance(filenames.mesh_filename, Domain)
+if use_variable_mesh is True:
+    print 'Creating domain from', project.mesh_filename
 
     domain = cache(pmesh_to_domain_instance,
-                   (filenames.mesh_filename, Domain),
-                   dependencies = [filenames.mesh_filename])
+                   (project.mesh_filename, Domain),
+                   dependencies = [project.mesh_filename])
 
 
@@ -131 +131 @@
 
 domain.set_quantity('elevation',
-                    filename=filenames.bathymetry_filename[:-4] + '.pts',
+                    filename=project.bathymetry_filename[:-4] + '.pts',
                     alpha = 0.0001,
                     verbose = True,
@@ -147 +147 @@
 Br = Reflective_boundary(domain)
 
-#####################
-# Error with File Boundary. We need to only set
-# stage and let the scheme set the momentum
 from pyvolution.util import file_function
-function = file_function(filenames.boundary_filename[:-4] + '.sww', domain,
+function = file_function(project.boundary_filename[:-4] + '.sww', domain,
                          verbose = True)
 Bts = Transmissive_Momentum_Set_Stage_boundary(domain, function)
 
 #Set boundary conditions
-if read_mesh is True:
+if use_variable_mesh is True:
     domain.set_boundary({'wave': Bts, 'wall': Br})
 else:
@@ -165 +162 @@
 import time
 t0 = time.time()
-#domain.visualise = True
 
 for t in domain.evolve(yieldstep = 0.05, finaltime = 22.5):
     domain.write_time()
-    #Stage_cv = domain.quantities['stage'].centroid_values
-    #print Stage_cv[0]
-    #print 'Function value',function(t)
 
 print 'That took %.2f seconds' %(time.time()-t0)