Changeset 550

Timestamp:

Nov 16, 2004, 11:06:07 AM (20 years ago)

Author:

ole

Message:

Got wave run-up to work

File:

• inundation/ga/storm_surge/analytical solutions/Analytical solution_wave_runup.py (modified) (7 diffs)

inundation/ga/storm_surge/analytical solutions/Analytical solution_wave_runup.py

@@ -16 +16 @@
 ######################
 # Module imports 
-#
-
 import sys
 from os import sep
 sys.path.append('..'+sep+'pyvolution')
 
-from shallow_water import Transmissive_boundary, Reflective_boundary,\
-     Dirichlet_boundary
-from shallow_water import Constant_height
-from shallow_water import Time_boundary
-from domain import Domain, Volume
-from Numeric import array
+from shallow_water import Domain, Reflective_boundary, Time_boundary
 from math import sqrt, cos, sin, pi
+from mesh_factory import strang_mesh
 
-import visualise2 as visualise
-
+#Convenience functions
 def imag(a):
     return a.imag
@@ -40 +33 @@
 
 ######################
-# Boundary conditions
-# Not required for this problem
-
-from domain import Strang_domain, Volume
-
-######################
 # Domain
 # Strang_domain will search through the file and test to see if there are
 # two or three entries. Two entries are for points and three for triangles.
 
-domain = Strang_domain('run-up.pt')
+points, elements = strang_mesh('run-up.pt')
+domain = Domain(points, elements) 
 
 domain.default_order = 2
@@ -65 +53 @@
 
 # Provide file name for storing output
-domain.filename="run-up_second_order"
+domain.store = True
+domain.format = 'sww'
+domain.filename = 'run-up_second_order'
 
-print "Number of triangles = ", len(Volume.instances)
-
-domain.visualise = False
-domain.checkpoint = False #
-domain.store = True       #Store for visualisation purposes
-domain.format = 'sww'     #Native netcdf visualisation format
+print "Number of triangles = ", len(domain)
 
 #Reduction operation for get_vertex_values              
-from pytools.stats import mean
+from util import mean
 domain.reduction = mean 
 #domain.reduction = min  #Looks better near steep slopes
@@ -130 +115 @@
     return [stage, uh, vh]
 
-def boundary_height(t):
+def boundary_level(t):
     x = -200
     return stage_setup(x,t)
@@ -137 +122 @@
 ######################
 #Initial condition
-#
 print 'Initial condition'
 t_star1 = 0.0
@@ -150 +134 @@
     return z
 
-domain.set_field_values(x_slope, None)
+domain.set_quantity('elevation', x_slope)
 
 #Set the water depth
-def height(x,y):
+def level(x,y):
     z = x_slope(x,y)
     n = x.shape[0]
@@ -165 +149 @@
     return w   
 
-domain.set_conserved_quantities(height, None, None)
+domain.set_quantity('level', level)
+
 
 #####################
 #Set up boundary conditions
-Br = Reflective_boundary()
-Bw = Time_boundary(domain, boundary_height)
+Br = Reflective_boundary(domain)
+Bw = Time_boundary(domain, boundary_level)
 domain.set_boundary({'left': Bw, 'external': Br})
 
 
-    
-######################
-#Visualisation
-if domain.visualise:
-    visualise.create_surface(domain)
-
-  
 ######################
 #Evolution
-
 import time
 t0 = time.time()
-for t in domain.evolve(max_timestep = 1.0, yieldstep = 1., finaltime = 100):
+for t in domain.evolve(yieldstep = 1., finaltime = 100):
     domain.write_time()
-    print boundary_height(domain.time)
-
-# Remove the following if Visual Python not required       
-    if domain.visualise:  
-        visualise.update(domain, index=0, smooth=True)
+    print boundary_level(domain.time)
     
 print 'That took %.2f seconds' %(time.time()-t0)