Changeset 1639

Timestamp:

Jul 25, 2005, 11:26:36 PM (19 years ago)

Author:

steve

Message:

 

Location:

inundation/ga/storm_surge

Files:

• parallel/run_advection.py (modified) (2 diffs)
• pyvolution/advection.py (modified) (3 diffs)
• pyvolution/realtime_visualisation_new.py (modified) (10 diffs)
• zeus/pyvolution.zbi (modified) (previous)

inundation/ga/storm_surge/parallel/run_advection.py

@@ -9 +9 @@
 from config import g, epsilon
 from Numeric import allclose, array, zeros, ones, Float
-from advection import *
+from advection import Domain, Transmissive_boundary, Dirichlet_boundary
 from Numeric import array
 
@@ -33 +33 @@
 #turn on the visualisation
 rect = [0.0, 0.0, 1.0, 1.0]
-domain.initialise_visualiser(rect=rect)
+#domain.initialise_visualiser(rect=rect)
+domain.visualise = True
 
 

inundation/ga/storm_surge/pyvolution/advection.py

@@ -326 +326 @@
         """
 
-        logger.debug('Trying to weave compute_fluxes')
+        logger.debug('Trying to weave advection.compute_fluxes')
         weave.inline(code, ['stage_edge','stage_bdry','stage_update',
                              'neighbours','neighbour_edges','normals',
@@ -344 +344 @@
             #import realtime_visualisation_new as visualise
             self.initialise_visualiser()
-            self.visualiser.update_quantity('stage')
+            #self.visualiser.update_quantity('stage')
             self.visualiser.update_timer()
 
@@ -351 +351 @@
             #Real time viz
             if self.visualise is True:
-                self.visualiser.update_quantity('stage')
+                #self.visualiser.update_quantity('stage')
                 self.visualiser.update_timer()
 

inundation/ga/storm_surge/pyvolution/realtime_visualisation_new.py

@@ +1 @@
+
 from visual import *
 
@@ -9 +10 @@
 class Visualiser:
 
-    def __init__(self,domain,scale_z=1.0,rect=None):
+    def __init__(self,domain,scale_z=1.0,rect=None,title='Test'):
         """Create visualisation of domain
         """
 
+        self.scene = display(title=title)
+        self.scene.center = (0.5,0.5,0.0)
+        self.scene.forward = vector(-0.0, 0.5, -0.8)
+        self.scene.ambient = 0.4
+        self.scene.lights = [(0.6, 0.3, 0.2), (0.1, -0.5, 0.4)]
+
         self.frame  = frame()
 
-        self.domain = domain
+        self.domain   = domain
         self.scale_z  = scale_z
         self.vertices = domain.vertex_coordinates
@@ -24 +31 @@
         #print keys
         for key in self.domain.quantities:
-            self.vpython_z_models[key] = faces(frame= self.frame)
+            self.vpython_z_models[key] = faces(frame=self.frame)
 
         #print self.z_models
@@ -33 +40 @@
             self.max_y = max(max(self.vertices[:,1]),max(self.vertices[:,3]),max(self.vertices[:,5]))
             self.min_y = min(min(self.vertices[:,1]),min(self.vertices[:,3]),min(self.vertices[:,5]))
-            self.range_x = self.max_x - self.min_x
-            self.range_y = self.max_y - self.min_y
-            self.range_xy = max(self.range_x, self.range_y)
         else:
             self.max_x = rect[2]
@@ -41 +45 @@
             self.max_y = rect[3]
             self.min_y = rect[1]
-            self.range_x = self.max_x - self.min_x
-            self.range_y = self.max_y - self.min_y
-            self.range_xy = max(self.range_x, self.range_y)
+
+
+        self.range_x = self.max_x - self.min_x
+        self.range_y = self.max_y - self.min_y
+        self.range_xy = max(self.range_x, self.range_y)
 
 
@@ -84 +90 @@
         #print 'keys',self.domain.quantities.keys()
         #print 'shape of stage',shape(self.stage)
-
-
-        setup_scene()
 
         self.border_model = curve(frame = self.frame,
@@ -141 +144 @@
     def setup_all(self):
 
+        self.scene.select()
+
         self.update_quantity('elevation')
         self.update_quantity('stage')
@@ -146 +151 @@
     def update_all(self):
 
+        self.scene.select()
+
         if self.updating['elevation']:
             self.update_quantity('elevation')
@@ -156 +163 @@
 
     def update_timer(self):
+
+        self.scene.select()
 
         if self.domain.visualise_timer == True:
@@ -592 +601 @@
 
     domain.visualiser.update_timer()
+
+
+
+if __name__ == '__main__':
+
+    from advection import Domain as A_Domain
+    from shallow_water import Domain as SW_Domain
+    from mesh_factory import rectangular
+
+    points, vertices, boundary = rectangular(20, 20, len1=200, len2=200)
+    a_domain  = A_Domain(points, vertices, boundary)
+    sw_domain = SW_Domain(points, vertices, boundary)
+
+    a_domain.initialise_visualiser()
+    a_domain.visualiser.update_all()
+
+
+    sw_domain.initialise_visualiser()
+    sw_domain.visualiser.update_all()
+
+    #a_v = Visualiser(domain=a_domain, title='advection')
+    #a_v.update_all()
+
+
+    #sw_v = Visualiser(domain=sw_domain, title='shallow water')
+    #sw_v.update_all()