Changeset 1839

Timestamp:

Sep 16, 2005, 12:11:41 PM (20 years ago)

Author:

steve

Message:

Investigating Circular Hydraulic jump.

Location:

inundation

Files:

• analytical solutions/Analytical_solution_circular_hydraulic_jump.py (modified) (2 diffs)
• pyvolution/config.py (modified) (1 diff)
• pyvolution/realtime_visualisation_new.py (modified) (3 diffs)

inundation/analytical solutions/Analytical_solution_circular_hydraulic_jump.py

@@ -113 +113 @@
 # Order of accuracy
 domain.default_order = 2
+domain.CFL = 1.0
+#domain.beta_w = 0.5
+#domain.beta_h = 0.2
 domain.smooth = True
+
+
 
 
@@ -119 +124 @@
     #domain.visualiser.coloring['stage'] = True
 domain.visualiser.scale_z['stage'] = 2.0
-#domain.visualiser.scale_z['elevation'] = 0.05
+domain.visualiser.scale_z['elevation'] = 0.05
+
+
+from realtime_visualisation_new import Visualiser
+vxmom = Visualiser(domain,title='xmomentum',scale_z=10.0)
+vymom = Visualiser(domain,title='ymomentum',scale_z=10.0)
+
+
 #----------
 # Evolution
 import time
+
+print 'PROBLEM WITH INSTABILITY AFTER t'
 t0 = time.time()
 for t in domain.evolve(yieldstep = .01, finaltime = 10):
     domain.write_time()
+    vxmom.update_quantity('xmomentum')
+    vymom.update_quantity('ymomentum')
 
 print 'That took %.2f seconds' %(time.time()-t0)

inundation/pyvolution/config.py

@@ -78 +78 @@
 beta_h = 0.2
 CFL = 1.0  #FIXME (ole): Is this in use yet??
+           #(Steve) yes, change domain.CFL to
+           #make changes
 
 

inundation/pyvolution/realtime_visualisation_new.py

@@ -22 +22 @@
         self.frame  = frame()
 
-        self.domain   = domain
-        self.scale_z  = scale_z
-        self.vertices = domain.vertex_coordinates
+        self.domain          = domain
+        self.default_scale_z = scale_z
+        self.vertices        = domain.vertex_coordinates
 
 
@@ -176 +176 @@
 
         #print 'update '+qname+' arrays'
-
-        qcolor   = self.qcolor[qname]
-        scale_z  = self.scale_z[qname]
-        coloring = self.coloring[qname]
-        updating = self.updating[qname]
+        try:
+            qcolor   = self.qcolor[qname]
+            scale_z  = self.scale_z[qname]
+            coloring = self.coloring[qname]
+            updating = self.updating[qname]
+        except:
+            qcolor   = None
+            scale_z  = None
+            coloring = False
+            updating = True
 
 
@@ -196 +201 @@
 
         if scale_z is None:
-            scale_z = self.scale_z
+            scale_z = self.default_scale_z
 
         #try: