Changeset 5173

Timestamp:

Mar 18, 2008, 5:05:34 PM (16 years ago)

Author:

ole

Message:

Beautified demos

Location:

anuga_core/documentation/user_manual/demos

Files:

• channel1.py (modified) (3 diffs)
• channel3.py (modified) (4 diffs)

anuga_core/documentation/user_manual/demos/channel1.py

@@ -16 +16 @@
 # Setup computational domain
 #------------------------------------------------------------------------------
-length = 10.
-width = 5.
-dx = dy = 1           # Resolution: Length of subdivisions on both axes
+points, vertices, boundary = rectangular_cross(10, 5,
+                                               len1=10.0, len2=5.0) # Mesh
 
-points, vertices, boundary = rectangular_cross(int(length/dx), int(width/dy),
-                                               len1=length, len2=width)
-
-domain = Domain(points, vertices, boundary)   # Create domain
+domain = Domain(points, vertices, boundary)  # Create domain
 domain.set_name('channel1')                  # Output name
 
@@ -35 +31 @@
 domain.set_quantity('elevation', topography) # Use function for elevation
 domain.set_quantity('friction', 0.01)        # Constant friction 
-domain.set_quantity('stage',
-                    expression='elevation')        # Dry
-#domain.set_quantity('stage',
-#                     expression='elevation + 0.1') # Wet
+domain.set_quantity('stage',                 # Dry bed
+                    expression='elevation + 0.0')  
 
 
@@ -54 +48 @@
 #------------------------------------------------------------------------------
 for t in domain.evolve(yieldstep = 0.2, finaltime = 40.0):
-    domain.write_time()
+    print domain.timestepping_statistics()
 
 

anuga_core/documentation/user_manual/demos/channel3.py

@@ -19 +19 @@
 length = 40.
 width = 5.
-#dx = dy = 1           # Resolution: Length of subdivisions on both axes
-dx = dy = .1           # Resolution: Length of subdivisions on both axes
+dx = dy = .05           # Resolution: Length of subdivisions on both axes
 
 points, vertices, boundary = rectangular_cross(int(length/dx), int(width/dy),
@@ -26 +25 @@
 domain = Domain(points, vertices, boundary)   
 domain.set_name('channel3')                  # Output name
+print domain.statistics()
 
 
@@ -40 +40 @@
     for i in range(N):
 
-        #Step
+        # Step
         if 10 < x[i] < 12:
             z[i] += 0.4 - 0.05*y[i]        
         
-        #Constriction
+        # Constriction
         if 27 < x[i] < 29 and y[i] > 3:
             z[i] += 2        
@@ -75 +75 @@
 #------------------------------------------------------------------------------
 for t in domain.evolve(yieldstep = 0.2, finaltime = 16.0):
-    domain.write_time()
+    print domain.timestepping_statistics()