Changeset 3335 for development/pyvolution-1d/shallow_water_1d.py

Timestamp:

Jul 14, 2006, 2:11:20 PM (18 years ago)

Author:

jakeman

Message:

New file dam.py tests numerical solution against analytical solution of
Stoker 57. Numerical results match Stoker's roughly but oscillations
present. Most likely limiting is not working correctly. Q.limit does
have an effect but unsure whether this effect is the right one.

File:

• development/pyvolution-1d/shallow_water_1d.py (modified) (6 diffs)

development/pyvolution-1d/shallow_water_1d.py

@@ -63 +63 @@
 
         #forcing terms not included in 1d domain ?WHy?
-        #self.forcing_terms.append(gravity)
-        #self.forcing_terms.append(manning_friction)
+        self.forcing_terms.append(gravity)
+        self.forcing_terms.append(manning_friction)
         #print "\nI have Removed forcing terms line 64 1dsw"
 
@@ -174 +174 @@
         #and or visualisation
         self.distribute_to_vertices_and_edges()
-
+        
         #Initialise real time viz if requested
         #if self.visualise is True and self.time == 0.0:
@@ -432 +432 @@
     #Loop
     timestep = float(sys.maxint)
+    enter = True
     for k in range(N):
 
@@ -473 +474 @@
             # flux = edgefluxleft - edgefluxright
             flux -= edgeflux #* domain.edgelengths[k,i]
-
             #Update optimal_timestep
             try:
                 #timestep = min(timestep, 0.5*domain.radii[k]/max_speed)
                 #timestep = 0.01
+            
                 timestep = min(timestep, 0.5*domain.areas[k]/max_speed)
-                if timestep < 0.00001:
-                    #print 'max_speed', max_speed
+                if (timestep < 1e-6) & (enter == True):
+                    #print "domain.order", domain.order
+                    #domain.write_time()
+                    print "cell number", k
+                    print "timestep", timestep
+                    print 'max_speed', max_speed
                     s = domain.quantities['stage']
                     s = s.centroid_values
                     xm = domain.quantities['xmomentum']
                     xm = xm.centroid_values
-                    #print 'h', s[k]
-                    #print 'xm', xm[k]
-                    #print 'u', xm[k]/s[k]
-                    #break
-                #timestep = 0.01
-                #print 'areas', domain.areas[k]
-                #print "timestep", timestep
+                    print 'h', s[k]
+                    print 'xm', xm[k]
+                    print 'u', xm[k]/s[k]
+                    enter = False
+            
             except ZeroDivisionError:
                 pass
@@ -497 +500 @@
         #Normalise by area and store for when all conserved
         #quantities get updated
-        #flux /= domain.areas[k]
+        flux /= domain.areas[k]
         # ADD ABOVE LINE AGAIN
         Stage.explicit_update[k] = flux[0]
@@ -599 +602 @@
     """
 
-    from config import optimised_gradient_limiter
+    #from config import optimised_gradient_limiter
 
     #Remove very thin layers of water