Changeset 3370 for development

Timestamp:

Jul 19, 2006, 12:03:27 PM (19 years ago)

Author:

steve

Message:

Playing with limiters

Location:

development/pyvolution-1d

Files:

• dam.py (modified) (4 diffs)
• dam2.py (modified) (4 diffs)
• dry_dam.py (modified) (4 diffs)
• quantity.py (modified) (2 diffs)
• shallow_water_1d.py (modified) (2 diffs)

development/pyvolution-1d/dam.py

@@ -50 +50 @@
             h[i] = h0 
 
-    return h
+    return h , u*h
 
 
@@ -97 +97 @@
 domain.order = 2
 domain.default_order = 2
+domain.cfl = 0.8
+#domain.beta = 0.0
 print "domain.order", domain.order
 
@@ -114 +116 @@
 C = domain.centroids
 plot1 = newLinePlot("Stage")
+plot2 = newLinePlot("Momentum")
 
 import time
@@ -123 +126 @@
     if t > 0.0:
         StageQ = domain.quantities['stage'].vertex_values
-        y = analytical_sol(X.flat,domain.time)
+        y , my = analytical_sol(X.flat,domain.time)
         linePlot(plot1,X,StageQ,X,y)
+        MomentumQ = domain.quantities['xmomentum'].vertex_values
+        linePlot(plot2,X,MomentumQ,X,my)
     #raw_input('press_return')
     #pass

development/pyvolution-1d/dam2.py

@@ -49 +49 @@
             h[i] = h0 
 
-    return h
+    return h,u*h
 
 
@@ -96 +96 @@
 domain.order = 2
 domain.default_order = 2
+domain.cfl = 0.5
 print "domain.order", domain.order
 
@@ -114 +115 @@
 C = domain.centroids
 plot1 = newLinePlot("Stage")
+plot2 = newLinePlot("Momentum")
 
 import time
@@ -123 +125 @@
     if t > 0.0:
         StageQ = domain.quantities['stage'].vertex_values
-        y = analytical_sol(X.flat,domain.time)
+        y,my = analytical_sol(X.flat,domain.time)
         linePlot(plot1,X,StageQ,X,y)
+        MomentumQ = domain.quantities['xmomentum'].vertex_values
+        linePlot(plot2,X,MomentumQ,X,my)
     #raw_input('press_return')
     #pass

development/pyvolution-1d/dry_dam.py

@@ -36 +36 @@
             h[i] = h0 
 
-    return h
-
+    return h , u*h
 
 def newLinePlot(title='Simple Plot'):
@@ -59 +58 @@
 
 L = 2000.0     # Length of channel (m)
-N = 100        # Number of compuational cells
+N = 400        # Number of compuational cells
 cell_len = L/N # Origin = 0.0
 
@@ -98 +97 @@
 C = domain.centroids
 plot1 = newLinePlot("Stage")
+plot2 = newLinePlot("Momentum")
 
 import time
@@ -107 +107 @@
     if t > 0.0:
         StageQ = domain.quantities['stage'].vertex_values
-        y = analytical_sol(X.flat,domain.time)
+        y,my = analytical_sol(X.flat,domain.time)
         linePlot(plot1,X,StageQ,X,y)
-    raw_input('press_return')
+        MomentumQ = domain.quantities['xmomentum'].vertex_values
+        linePlot(plot2,X,MomentumQ,X,my)
+        
+    #raw_input('press_return')
     #pass
 

development/pyvolution-1d/quantity.py

@@ -486 +486 @@
 
                 x0 = X[k0] #V0 centroid
-                x1 = X[k] #V1 centroid (Self)
+                x1 = X[k]  #V1 centroid (Self)
                 x2 = X[k2] #V2 centroid
 
                 #Gradient
+                #G[k] = (q2-q0)/(x2-x0)
                 G[k] = ((q0-q1)/(x0-x1)*(x2-x1) - (q2-q1)/(x2-x1)*(x0-x1))/(x2-x0)
 
@@ -614 +615 @@
 
         N = self.domain.number_of_elements
-        beta = self.beta
+        #beta = self.beta
+        beta = 0.8
 
         qc = self.centroid_values

development/pyvolution-1d/shallow_water_1d.py

@@ -80 +80 @@
         self.smooth = True
 
+        #Evolve parametrs
+        self.cfl = 1.0
+        
         #Reduction operation for get_vertex_values
         from util import mean
@@ -479 +482 @@
                 #timestep = 0.01
             
-                timestep = min(timestep, 0.5*domain.areas[k]/max_speed)
+                timestep = min(timestep, domain.cfl*0.5*domain.areas[k]/max_speed)
                 if (timestep < 1e-6) & (enter == True):
                     #print "domain.order", domain.order