Changeset 8240 for trunk/anuga_work/development/2010-projects/anuga_1d/channel/channel_domain.py

Timestamp:

Oct 26, 2011, 6:32:44 PM (14 years ago)

Author:

steve

Message:

Padarn's code

File:

• trunk/anuga_work/development/2010-projects/anuga_1d/channel/channel_domain.py (modified) (2 diffs)

trunk/anuga_work/development/2010-projects/anuga_1d/channel/channel_domain.py

@@ -144 +144 @@
 
     def update_derived_quantites(self):
+
         pass
+
+
+
+    def initialize_plotting(self,
+                            stage_lim = [-1.0, 40.0],
+                            height_lim = [-1.0, 10.0],
+                            velocity_lim = [-5.0, 5.0]):
+
+        import pylab
+        pylab.ion()
+
+
+        x = self.get_vertices().flatten()
+        z = self.quantities['elevation'].vertex_values.flatten()
+        w = self.quantities['stage'].vertex_values.flatten()
+        h = self.quantities['height'].vertex_values.flatten()
+        v = self.quantities['velocity'].vertex_values.flatten()
+
+        print x.shape
+        print z.shape
+
+        self.plot1 = pylab.subplot(311)
+
+        self.zplot, = pylab.plot(x, z)
+        self.wplot, = pylab.plot(x, w)
+
+        self.plot1.set_ylim(stage_lim)
+        pylab.xlabel('Position')
+        pylab.ylabel('Stage')
+
+        self.plot2 = pylab.subplot(312)
+
+        self.hplot, = pylab.plot(x, h)
+
+        self.plot2.set_ylim(height_lim)
+        pylab.xlabel('Position')
+        pylab.ylabel('Height')
+
+        self.plot3 = pylab.subplot(313)
+
+        self.vplot, = pylab.plot(x, v)
+
+        self.plot3.set_ylim(velocity_lim)
+
+        pylab.xlabel('Position')
+        pylab.ylabel('Velocity')
+
+
+    def update_plotting(self):
+
+        import pylab
+
+        #x = self.get_vertices().flatten()
+        z = self.quantities['elevation'].vertex_values.flatten()
+        w = self.quantities['stage'].vertex_values.flatten()
+        h = self.quantities['height'].vertex_values.flatten()
+        v = self.quantities['velocity'].vertex_values.flatten()
+
+
+        self.zplot.set_ydata(z)
+        self.wplot.set_ydata(w)
+        self.hplot.set_ydata(h)
+        self.vplot.set_ydata(v)
+
+        pylab.draw()
+
+
+    def hold_plotting(self):
+
+        self.update_plotting()
+        import pylab
+        
+        pylab.ioff()
+
+        pylab.show()
+
+
+
+    def finalize_plotting(self):
+
+        pass
+
+
 
 #=============== End of Channel Domain ===============================
@@ -198 +282 @@
     # (i.e. bed and width) have been accurately computed in the previous
     # timestep. 
-    h_C[:] = numpy.where(a_C > 0.0, a_C/(b_C + h0/b_C), 0.0)
-    u_C[:] = numpy.where(a_C > 0.0, d_C/(a_C + h0/a_C), 0.0)
+    h_C[:] = numpy.where(a_C > 0.0, a_C/b_C, 0.0)
+    u_C[:] = numpy.where(a_C > 0.0, d_C/a_C, 0.0)
 
     w_C[:] = h_C + z_C