Changeset 7634

Timestamp:

Feb 24, 2010, 2:42:00 PM (15 years ago)

Author:

steve

Message:

Getting rid of space in name

Location:

anuga_validation/analytical_solutions

Files:

• . (moved) (moved from anuga_validation/analytical solutions)
• carrier_wave_runup.py (modified) (8 diffs)
• yoon_cross_mesh.py (modified) (1 diff)
• yoon_import_mesh.py (modified) (1 diff)

anuga_validation/analytical_solutions/carrier_wave_runup.py

@@ -14 +14 @@
 """
 
-######################
+#-------------------
 # Module imports
 import sys
-from os import sep
-sys.path.append('..'+sep+'pyvolution')
-
-from shallow_water import Domain, Reflective_boundary, Time_boundary
 from math import sqrt, cos, sin, pi
-from mesh_factory import strang_mesh
-
+from numpy import asarray
+from time import localtime, strftime, gmtime
+
+
+#-------------------
+# Anuga Imports
+#-------------------
+from anuga.shallow_water_balanced.swb_domain import Domain, Transmissive_boundary, Reflective_boundary,\
+     Dirichlet_boundary, Time_boundary
+
+#from anuga.interface import Domain, Transmissive_boundary, Reflective_boundary,\
+#     Dirichlet_boundary
+
+from anuga.utilities.polygon import inside_polygon, is_inside_triangle
+from anuga.abstract_2d_finite_volumes.mesh_factory import strang_mesh
+
+
+#-------------------
 #Convenience functions
+#-------------------
 def imag(a):
     return a.imag
@@ -32 +45 @@
 
 
-######################
+#--------------------
 # Domain
 # Strang_domain will search through the file and test to see if there are
@@ -41 +54 @@
 domain = Domain(points, elements)
 
-domain.default_order = 2
-domain.smooth = True
-
+print 'extent ',domain.get_extent()
+
+#----------------
+# Order of scheme
+# Good compromise between
+# limiting and CFL
+#---------------
+domain.set_default_order(2)
+domain.set_timestepping_method(2)
+domain.set_beta(0.7)
+domain.set_CFL(0.6)
+
+
+#-------------------
 #Set a default tagging
+#-------------------
 epsilon = 1.0e-12
 
@@ -52 +77 @@
         domain.boundary[(id,face)] = 'left'
 
-
-
-
+#---------------------
 # Provide file name for storing output
+#---------------------
 domain.store = True
 domain.format = 'sww'
-domain.set_name('run-up_second_order_again')
+
+time = strftime('%Y%m%d_%H%M%S',localtime())
+output_file= 'carrier_wave_runup_'+time
+
+domain.set_name(output_file)
 
 print "Number of triangles = ", len(domain)
 
-#Reduction operation for get_vertex_values
-from anuga.pyvolution.util import mean
-domain.reduction = mean
-#domain.reduction = min  #Looks better near steep slopes
-
+#-----------------------
 #Define the boundary condition
-def stage_setup(x,t_star1):
+#-----------------------
+def stage_setup(x,t):
     vh = 0
     alpha = 0.1
@@ -83 +108 @@
     for j in range (1,50):
         sigma0 = (sigma_max+sigma_min)/2.
-        lambda_prime = 2./a*(t_star1/sqrt(l_0/alpha/g)+v1)
+        lambda_prime = 2./a*(t/sqrt(l_0/alpha/g)+v1)
         sigma_prime = sigma0/a
         const = (1.-ii*lambda_prime)**2+sigma_prime**2
@@ -123 +148 @@
 
 
-######################
+#---------------------
 #Initial condition
+#---------------------
 print 'Initial condition'
 t_star1 = 0.0
@@ -162 +188 @@
 domain.set_boundary({'left': Bw, 'external': Br})
 
-
+import time
+visualize = True
+if visualize:
+    from anuga.visualiser import RealtimeVisualiser
+    vis = RealtimeVisualiser(domain)
+    vis.render_quantity_height("elevation", zScale=3.0, offset = 0.01, dynamic=False)
+    vis.render_quantity_height("stage", zScale = 3.0, dynamic=True, opacity = 0.6, wireframe=False)
+    #vis.colour_height_quantity('stage', (lambda q:q['stage'], 1.0, 2.0))
+    vis.colour_height_quantity('stage', (0.4, 0.6, 0.4))
+    vis.start()
+    time.sleep(2.0)
 
 #domain.visualise = True
@@ -168 +204 @@
 ######################
 #Evolution
-import time
+
 t0 = time.time()
+
+
 for t in domain.evolve(yieldstep = 1., finaltime = 100):
     domain.write_time()
     print boundary_stage(domain.time)
+    if visualize: vis.update()
+    
+if visualize: vis.evolveFinished()    
 
 print 'That took %.2f seconds' %(time.time()-t0)

anuga_validation/analytical_solutions/yoon_cross_mesh.py

@@ -11 +11 @@
 #---------------
 # Module imports
-#import sys
-#from os import sep
-#sys.path.append('..'+sep+'pyvolution')
 from anuga.shallow_water_balanced.swb_domain import Domain, Transmissive_boundary, Reflective_boundary,\
      Dirichlet_boundary

anuga_validation/analytical_solutions/yoon_import_mesh.py

@@ -13 +13 @@
 # Module imports 
 import sys
-from os import sep
-sys.path.append('..'+sep+'pyvolution')
-from shallow_water import Domain, Dirichlet_boundary
+
+from anuga.interface import Domain, Dirichlet_boundary
 from math import sqrt, cos, sin, pi
-from mesh_factory import strang_mesh
-from anuga.pyvolution.util import inside_polygon
-from Numeric import asarray
-from least_squares import Interpolation
+from anuga.abstract_2d_finite_volume.mesh_factory import strang_mesh
+from anuga.utilities.polygon import inside_polygon
+
+from numpy import asarray
+from anuga.fit_interpolate.interpolate import Interpolation
 
 #-------------------------------