Changeset 1272

Timestamp:

May 2, 2005, 5:58:03 PM (20 years ago)

Author:

steve

Message:

Playing with visualisation

Location:

inundation/ga/storm_surge

Files:

• pyvolution/realtime_visualisation_new.py (modified) (10 diffs)
• steve/Eden_tide_Sept03.dat (added)
• zeus/pyvolution.zbi (modified) (previous)

inundation/ga/storm_surge/pyvolution/realtime_visualisation_new.py

@@ -7 +7 @@
 
         self.frame  = frame()
-        self.bed_model     = faces(frame=self.frame)
+        autoscale=0
+        self.bed_model   = faces(frame=self.frame)
         self.stage_model = faces(frame=self.frame)
         self.domain = domain
@@ -27 +28 @@
         self.max_bed = max(max(self.bed))
         self.min_bed = min(min(self.bed))
-        self.range_bed = self.max_bed - self.min_bed
+        self.range_bed = max(self.max_bed - self.min_bed, 1e-10)*2.0
 
         print 'min_bed=',self.min_bed
@@ -45 +46 @@
         #print 'shape of stage',shape(self.stage)
 
+        self.border_model = curve(frame = self.frame, pos=[(0,0),(0,1),(1,1),(1,0),(0,0)])
+        self.timer=label(pos=(0.75,0.5,0.5),text='Time=%10.5e'%self.domain.time)
+
         self.update_all()
 
@@ -51 +55 @@
         self.update_bed()
         self.update_stage()
+
+    def update_timer(self):
+        self.timer.text='Time=%10.5e'%self.domain.time
 
     def update_bed(self):
@@ -89 +96 @@
         min_y = self.min_y
         range_xy = self.range_xy
+        range_bed = self.range_bed
 
         vertices = self.vertices
@@ -96 +104 @@
 
         try:
-            update_arrays_weave(vertices,quantity,col,pos,normals,colour,N,min_x,min_y,range_xy,scale_z)
+            update_arrays_weave(vertices,quantity,col,pos,normals,colour,N,
+                                min_x,min_y,range_xy,range_bed,scale_z)
         except:
-            update_arrays_python(vertices,quantity,col,pos,normals,colour,N,min_x,min_y,range_xy,scale_z)
-
-
-
-def  update_arrays_python(vertices,quantity,col,pos,normals,colour,N,min_x,min_y,range_xy,scale_z):
+            update_arrays_python(vertices,quantity,col,pos,normals,colour,N,
+                                 min_x,min_y,range_xy,range_bed,scale_z)
+
+
+
+def  update_arrays_python(vertices,quantity,col,pos,normals,colour,N,
+                          min_x,min_y,range_xy,range_bed,scale_z):
 
     from math import sqrt
@@ -114 +125 @@
             v[j,0] = (vertices[i,2*j  ]-min_x)/range_xy
             v[j,1] = (vertices[i,2*j+1]-min_y)/range_xy
-            v[j,2] = quantity[i,j]*scale_z
+            v[j,2] = quantity[i,j]/range_bed*scale_z
 
         v10 = v[1,:]-v[0,:]
@@ -156 +167 @@
 
 
-def  update_arrays_weave(vertices,quantity,col,pos,normals,colour,N,min_x,min_y,range_xy,scale_z):
+def  update_arrays_weave(vertices,quantity,col,pos,normals,colour,
+                         N,min_x,min_y,range_xy,range_bed,scale_z):
 
     import weave
@@ -174 +186 @@
                 v(j,0) = (vertices(i,2*j  )-min_x)/range_xy;
                 v(j,1) = (vertices(i,2*j+1)-min_y)/range_xy;
-                v(j,2) = quantity(i,j)*scale_z;
+                v(j,2) = quantity(i,j)/range_bed*scale_z;
             }
 
@@ -261 +273 @@
     surface = domain.surface
     surface.update_stage()
+    surface.update_timer()
     #print 'end visual update'