Changeset 3425

Timestamp:

Jul 26, 2006, 5:32:15 PM (18 years ago)

Author:

steve

Message:

 

Location:

development/pyvolution-1d

Files:

• analytic_dam.py (modified) (1 diff)
• dam.py (modified) (6 diffs)
• domain.py (modified) (1 diff)
• quantity.py (modified) (1 diff)
• shallow_water_1d.py (modified) (1 diff)

development/pyvolution-1d/analytic_dam.py

@@ -75 +75 @@
         #u2 = S2 - g*h0/(4*S2)*(1+sqrt(1+8*S2*S2/(g*h0)))
 
-
-
         h2=h0/(1.0-u2/z)
-
-        print z,h2,u2        
         x3=(u2-c2)*t
         x2=z*t

development/pyvolution-1d/dam.py

@@ -63 +63 @@
     g = Gnuplot.Gnuplot()
     g.title(title)
-    g('set data style linespoints') 
+    g('set style data lines') 
     g.xlabel('x')
     g.ylabel('y')
@@ -73 +73 @@
     plot2 = Gnuplot.PlotItems.Data(x2.flat,y2.flat, with="lines 3")
     g.plot(plot1,plot2)
-    #g.plot(Gnuplot.PlotItems.Data(x1.flat,y1.flat),with="linespoints")
+    #g.plot(Gnuplot.PlotItems.Data(x1.flat,y1.flat),with="lines")
     #g.plot(Gnuplot.PlotItems.Data(x2.flat,y2.flat), with="lines")
 
@@ -81 +81 @@
 
 L = 2000.0     # Length of channel (m)
-N = 400        # Number of compuational cells
+N = 100        # Number of compuational cells
 cell_len = L/N # Origin = 0.0
 
@@ -103 +103 @@
 
 domain.default_order = 2
-domain.cfl = 0.8
-#domain.beta = 0.0
+domain.cfl = 1.0
+domain.beta = 0.85
 print "domain.order", domain.default_order
 
@@ -130 +130 @@
 finaltime = 50.0
 
-print domain.neighbour_vertices
-
 for t in domain.evolve(yieldstep = yieldstep, finaltime = finaltime):
     domain.write_time()
     if t > 0.0:
         StageQ = domain.quantities['stage'].vertex_values
+        MomentumQ = domain.quantities['xmomentum'].vertex_values
+        Velocity = MomentumQ/StageQ
         y , my = analytical_sol(X.flat,domain.time)
         linePlot(plot1,X,StageQ,X,y)
-        MomentumQ = domain.quantities['xmomentum'].vertex_values
-
-        Velocity = MomentumQ/StageQ
         linePlot(plot2,X,MomentumQ,X,my)
         linePlot(plot3,X,Velocity,X,my/y)
@@ -164 +161 @@
 #f.close
 
+#del plot1, plot2,plot3

development/pyvolution-1d/domain.py

@@ -823 +823 @@
             elif self.order == 2:
                 Q.extrapolate_second_order()
-                Q.limit()
+                #Q.limit()
             else:
                 raise 'Unknown order'

development/pyvolution-1d/quantity.py

@@ -572 +572 @@
                 #G[k] = (d1+d2)*0.5
                 #G[k] = (d1*(x2-x1) - d2*(x0-x1))/(x2-x0)                
-                G[k] = xmic( 0.9, d1, d2 )
+                G[k] = xmic( self.domain.beta, d1, d2 )
         
 

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"