Changeset 3963

Timestamp:

Nov 10, 2006, 12:35:03 PM (17 years ago)

Author:

jack

Message:

Added new method get_quantity_names to domain.py for use by the visualiser.
Made commandline_viewer.py correctly start and stop the thread.
Made realtime.py only use public interfaces rather than dealing with the internals of the domain and quantity data structures

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/domain.py (modified) (1 diff)
• visualiser/commandline_viewer.py (modified) (1 diff)
• visualiser/realtime.py (modified) (2 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -330 +330 @@
         self.quantities[name].set_values(*args, **kwargs)
 
+
+    def get_quantity_names(self):
+        """Get a list of all the quantity names that this domain is aware of.
+        Any value in the result should be a valid input to get_quantity.
+        """
+        return self.quantities.keys()
 
     def get_quantity(self, name, location='vertices', indices = None):

anuga_core/source/anuga/visualiser/commandline_viewer.py

@@ -57 +57 @@
 
         # Start the visualiser (in its own thread).
-        o.run()
+        o.start()
+        # Wait for the visualiser to terminate before shutdown
+        o.join()
+        

anuga_core/source/anuga/visualiser/realtime.py

@@ -61 +61 @@
         qty_index = zeros(N_vert, Float)
         triangles = self.source.get_triangles()
+        vertex_values, _ = self.source.get_quantity(quantityName).get_vertex_values(xy=False, smooth=False)
 
         for n in range(len(triangles)):
             for v in range(3):
-                qty_index[triangles[n][v]] = self.source.get_quantity(quantityName).vertex_values[n][v]
+                #qty_index[triangles[n][v]] = self.source.get_quantity(quantityName).vertex_values[n][v]
+                qty_index[triangles[n][v]] = vertex_values[n * 3 + v]
 
         points = vtkPoints()
@@ -95 +97 @@
         triangles = self.source.get_triangles()
         quantities = {}
-        for q in self.source.quantities.keys():
+        for q in self.source.get_quantity_names():
             quantities[q], _ = self.source.get_quantity(q).get_vertex_values(xy=False)
         return quantities