Changeset 2116

Timestamp:

Dec 5, 2005, 4:53:13 PM (19 years ago)

Author:

steve

Message:

 

Location:

inundation

Files:

• validation/Incomplete/LWRU1/icplot.py (modified) (2 diffs)
• validation/Incomplete/LWRU1/lwru1.py (modified) (11 diffs)
• zeus/Merimbula.zpi (modified) (1 diff)

inundation/validation/Incomplete/LWRU1/icplot.py

@@ -10 +10 @@
 #    assert len(fields) == 2, '%s' %fields
 #    x.append( float(fields[0]) )
-#    w.append( float(fields[1]) )            
+#    w.append( float(fields[1]) )
 #
 #print 'X', x, len(x)
@@ -23 +23 @@
 
 hold(False)
-for i in range(100000):
-    print i*i
-    plot(X[:,0], X[:,1] + sin(i/10.0))    
+for i in range(100):
+    print i
+    plot(X[:,0], X[:,1] + sin(i/10.0))
 
 
 
 show()
-print 'end'    
+print 'end'
 
 
-

inundation/validation/Incomplete/LWRU1/lwru1.py

@@ -16 +16 @@
      Dirichlet_boundary,Transmissive_boundary, Constant_height, Constant_stage
 
-from pyvolution.mesh_factory import rectangular
+from pyvolution.mesh_factory import rectangular_cross
 from Numeric import array, zeros, Float, allclose
 
@@ -32 +32 @@
 #(only about 200m is expected, though)
 
-points, vertices, boundary = rectangular(400, 40,
+points, vertices, boundary = rectangular_cross(150, 15,
                                          len1=55000, len2=5000,
                                          origin = (-5000, 0.0))
 
-#points, vertices, boundary = rectangular(100, 10,
+#points, vertices, boundary = rectangular_cross(100, 10,
 #                                         len1=55000, len2=5000,
 #                                         origin = (-5000, 0.0))
@@ -83 +83 @@
             assert len(fields) == 2, '%s' %fields
             self.x.append( float(fields[0]) )
-            self.w.append( float(fields[1]) )            
+            self.w.append( float(fields[1]) )
 
         #print 'X', self.x, len(self.x)
@@ -90 +90 @@
         #plot(self.x, self.w)
         #show()
-        #import sys; sys.exit() 
+        #import sys; sys.exit()
 
     def __call__(self, x, y):
@@ -98 +98 @@
             xi = x[i]
 
-            
+
             #Find slot
 
-            if xi < self.x[0]: w[i] = self.w[0]
-            elif xi > self.x[-1]: w[i] = self.w[-1]
+            if xi < self.x[0]:
+                w[i] = self.w[0]
+            elif xi > self.x[-1]:
+                w[i] = self.w[-1]
             else:
                 index = 0
@@ -108 +110 @@
                 while xi < self.x[index]: index -= 1
 
-                #print xi, index, self.x[index], self.w[index]                    
+                #print xi, index, self.x[index], self.w[index]
 
                 if xi == self.x[index]:
@@ -129 +131 @@
                     w[i] = self.w[index]
 
-        #print x, w            
-        return w    
+        #print x, w
+        return w
 
 
@@ -154 +156 @@
 
 #Set boundary conditions
-domain.set_boundary({'left': Br, 'right': Bt, 'bottom': Bt, 'top': Bt})
+domain.set_boundary({'left': Br, 'right': Br, 'bottom': Br, 'top': Br})
 
 
@@ -166 +168 @@
 pt = []
 xes = []
-y = 2500 
-x0 = -100
-step = 50
+y = 2500
+x0 = -500
+step = 5
 for i in range(1000):
     x = x0+i*step
@@ -177 +179 @@
 from pyvolution.least_squares import Interpolation
 
- 
+
 V = domain.get_vertex_coordinates(obj=True) #Why?
 T = domain.get_triangles(obj=True)
@@ -193 +195 @@
 print 'xxxxx'
 
-ion()
-hold(False)
+
 f = domain.quantities['stage'].vertex_values.flat
 y = I.interpolate( f )
-plot(xes, y, '-b', xes, z, '-k')
-set( gca(), Ylim=(-10,10) )
-
-raw_input('go')
-for t in domain.evolve(yieldstep = 1, finaltime = 300.0):
+
+#ion()
+#plot(xes, y, '-b', xes, z, '-k', [-500, 50000], [0.0, 0.0], '-k')
+ion()
+clf()
+hold(True)
+plot(xes, y, '-b')
+plot(xes, z, '-k')
+plot([-500, 50000], [0.0, 0.0], '-k')
+set( gca(), Ylim=(-100,100) )
+set( gca(), Xlim=(-500,2000) )
+draw()
+ioff()
+
+#raw_input('go')
+for t in domain.evolve(yieldstep = 10, finaltime = 300.0):
+    domain.write_time()
+
 
     f = domain.quantities['stage'].vertex_values.flat
     y = I.interpolate( f )
-    ioff()
-    plot(xes, y, '-b', xes, z, '-k')
-    ion()
-    set( gca(), Ylim=(-10,10) )
-    
-    
+
+    clf()
+    hold(True)
+    plot(xes, y, '-b')
+    plot(xes, z, '-k')
+    plot([-500, 50000], [0.0, 0.0], '-k')
+    set( gca(), Ylim=(-100,100) )
+    set( gca(), Xlim=(-500,2000) )
+    draw()
+
+
+    #raw_input('go')
+
     #print y[:], y.shape
 
 
-    domain.write_time()
+
 
 

inundation/zeus/Merimbula.zpi

@@ -74 +74 @@
     <ReleaseProjectReload>Off</ReleaseProjectReload>
     <file>..\merimbula\prepare.py</file>
+    <file>..\merimbula\project.py</file>
     <file>..\merimbula\run_least_squares_merimbula.py</file>
     <file>..\merimbula\run_merimbula_lake.py</file>