Changeset 3678 for anuga_validation/analytical solutions/Analytical_solution_circular_hydraulic_jump.py

Timestamp:

Oct 1, 2006, 6:55:46 PM (18 years ago)

Author:

steve

Message:

Added more limiting to cells near dry cells, use beta_*_dry

File:

• anuga_validation/analytical solutions/Analytical_solution_circular_hydraulic_jump.py (modified) (6 diffs)

anuga_validation/analytical solutions/Analytical_solution_circular_hydraulic_jump.py

@@ -8 +8 @@
 
 #-------------------------------
-# Set up path and module imports
-import sys
-from os import sep
-sys.path.append('..'+sep+'pyvolution')
+# Setup modules
 
-from shallow_water import Domain, Dirichlet_Discharge_boundary
-from shallow_water import Transmissive_Momentum_Set_Stage_boundary, Dirichlet_boundary
+from anuga.shallow_water import Domain, Dirichlet_Discharge_boundary
+from anuga.shallow_water import Transmissive_Momentum_Set_Stage_boundary, Dirichlet_boundary
 from math import pi, sqrt
-from mesh_factory import strang_mesh
+from anuga.abstract_2d_finite_volumes.mesh_factory import strang_mesh
 
 
@@ -66 +63 @@
 #------------------------------------------
 # Reduction operation for get_vertex_values
-from anuga.pyvolution.util import mean
-domain.reduction = mean
+from anuga.utilities.numerical_tools import mean
+#domain.reduction = mean
 #domain.reduction = min  #Looks better near steep slopes
 
@@ -116 +113 @@
 #------------------
 # Order of accuracy
-domain.default_order = 1
-domain.CFL = 0.75
-#domain.beta_w = 0.5
-#domain.beta_h = 0.2
-domain.smooth = True
+domain.default_order = 2
+domain.beta_w      = 1.0
+domain.beta_w_dry  = 0.2
+domain.beta_uh     = 1.0
+domain.beta_uh_dry = 0.2
+domain.beta_vh     = 1.0
+domain.beta_vh_dry = 0.2
+domain.CFL = 0.5
+
+#domain.smooth = True
 
 
@@ -135 +137 @@
 #
 #
+
+domain.initialise_visualiser()
+#from anuga.visualiser.vtk_realtime_visualiser import Visualiser
+
 #from realtime_visualisation_new import Visualiser
+#vis = Visualiser(domain,title="stage")
+#vis.setup['elevation'] = True
+#vis.updating['stage'] = True
+#vis.qcolor['stage'] = (0.0,0.0,0.8)
+#vis.coloring['stage']= True
 ##vxmom = Visualiser(domain,title='xmomentum',scale_z=10.0)
 ##vymom = Visualiser(domain,title='ymomentum',scale_z=10.0)
@@ -148 +159 @@
 
 t0 = time.time()
-for t in domain.evolve(yieldstep = .1, finaltime = 3.0):
+for t in domain.evolve(yieldstep = .02, finaltime = 3.0):
     domain.write_time()
-
+    #vis.update()
     exp = '(xmomentum**2 + ymomentum**2)**0.5'
     radial_momentum = domain.create_quantity_from_expression(exp)
@@ -167 +178 @@
 
 #    f.write('time = %25.15e wall clock time %g \n' % (domain.time, time.time()))
-    f.write('%10.3f %25.15e %25.15e %25.15e %25.15e \n' % (domain.time, inner_stage, inner_radial_mom, outer_stage, outer_radial_mom))
+#    f.write('%10.3f %25.15e %25.15e %25.15e %25.15e \n' % (domain.time, inner_stage, inner_radial_mom, outer_stage, outer_radial_mom))
 
     f.write('time = %25.15e wall clock time %g \n' % (domain.time, time.time()))