Changeset 8167

Timestamp:

Mar 25, 2011, 5:55:00 PM (14 years ago)

Author:

steve

Message:

Found an error in vtk visualiser

Location:

trunk

Files:

• anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py (modified) (4 diffs)
• anuga_core/source/anuga/operators/run_dam_break.py (modified) (8 diffs)
• anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (1 diff)
• anuga_core/source/anuga/visualiser/realtime.py (modified) (2 diffs)
• anuga_core/source/anuga/visualiser/visualiser.py (modified) (1 diff)
• anuga_work/development/kv/Report.pdf (modified) (previous)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/generic_domain.py

@@ -1344 +1344 @@
             self.update_boundary()
 
+            # Update any other quantities that might be useful
+            self.update_other_quantities()
+
             # Update extrema if necessary (for reporting)
             self.update_extrema()            
@@ -1658 +1661 @@
 
     def apply_fractional_steps(self):
+
         for operator in self.fractional_step_operators:
             operator()
@@ -1784 +1788 @@
                 num.put(Q_cv, Idg, num.take(Q_cv, Idf, axis=0))
 
- 
+    def update_other_quantities(self):
+        """ There may be a need to calculates some of the other quantities
+        based on the new values of conserved quantities
+        """
+
+        pass
+
     def distribute_to_vertices_and_edges(self):
         """Extrapolate conserved quantities from centroid to
@@ -1802 +1812 @@
             else:
                 raise Exception('Unknown order: %s' % str(self._order_))
+
 
     def centroid_norm(self, quantity, normfunc):

trunk/anuga_core/source/anuga/operators/run_dam_break.py

@@ -15 +15 @@
 from math import cos
 from numpy import zeros, float, where
+import numpy
 from time import localtime, strftime, gmtime
 
@@ -39 +40 @@
 L = 100000.
 W = 10*dx
+#W = dx
 
 # structured mesh
@@ -46 +48 @@
 
 domain.set_name(output_file)                
-#domain.set_datadir(output_dir)
 
 #------------------------------------------------------------------------------
@@ -53 +54 @@
 domain.set_timestepping_method('rk2')
 domain.set_default_order(2)
+domain.set_beta(1.7)
 
 #------------------------------------------------------------------------------
@@ -59 +61 @@
 domain.set_use_kinematic_viscosity(True)
 
-domain.set_beta(1.7)
 #------------------------------------------------------------------------------
 # Setup initial conditions
@@ -87 +88 @@
 
 # Associate boundary tags with boundary objects
-domain.set_boundary({'left': Br, 'right': Bt, 'top': Br, 'bottom': Br})
+domain.set_boundary({'left': Br, 'right': Br, 'top': Br, 'bottom': Br})
 
 
@@ -94 +95 @@
 vis = RealtimeVisualiser(domain)
 vis.render_quantity_height("stage", zScale = 50000/(h0-h1), dynamic=True)
-vis.colour_height_quantity('stage', (0.0, 0.5, 1.0))
+vis.colour_height_quantity("stage", 
+#        (lambda q: numpy.sqrt( (q["xvelocity"]**2 ) + (q['yvelocity']**2 )), 0.0, 10.0) )
+        (lambda q: q["yvelocity"], -10.0, 10.0) )
 vis.start()
 #===============================================================================
@@ -112 +115 @@
 #    else:
 #        domain.set_use_kinematic_viscosity(True)
-        
+
+    #print domain.quantities['height'].vertex_values
+
+    #domain.quantities['height'].vertex_values
+
+    #print domain.quantities['height'].vertex_values
+
+    #print len(domain)
+
+    #vertex_values, _ = domain.get_quantity('height').get_vertex_values(xy=False, smooth=False)
+
+    #print vertex_values
+
     vis.update()
 

trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -582 +582 @@
         protect_against_infinitesimal_and_negative_heights(self)
         
+
+    def update_other_quantities(self):
+        """ There may be a need to calculates some of the other quantities
+        based on the new values of conserved quantities
+        """
+
+        # The centroid values of height and x and y velocity
+        # might not have been setup
+
+        self.update_centroids_of_velocities_and_height()
+
+        for name in ['height', 'xvelocity', 'yvelocity']:
+            Q = self.quantities[name]
+            if self._order_ == 1:
+                Q.extrapolate_first_order()
+            elif self._order_ == 2:
+                Q.extrapolate_second_order_and_limit_by_edge()
+            else:
+                raise Exception('Unknown order')
+
+
 
     def update_centroids_of_velocities_and_height(self):

trunk/anuga_core/source/anuga/visualiser/realtime.py

@@ -61 +61 @@
         vertex_values, _ = self.source.get_quantity(quantityName).get_vertex_values(xy=False, smooth=False)
 
+        
         for n in range(N_vert):
             qty_index[n] = vertex_values[n]
@@ -94 +95 @@
         quantities = {}
         for q in self.source.get_quantity_names():
-            quantities[q], _ = self.source.get_quantity(q).get_vertex_values(xy=False)
+            #quantities[q], _ = self.source.get_quantity(q).get_vertex_values(xy=False)
+            quantities[q]  = self.source.get_quantity(q).vertex_values.flatten()
         return quantities
 

trunk/anuga_core/source/anuga/visualiser/visualiser.py

@@ -174 +174 @@
                     # range.
                     scalars = vtkFloatArray()
+
                     map(scalars.InsertNextValue, colour[0](self.build_quantity_dict()))
                     self.vtk_polyData[quantityName].GetPointData().SetScalars(scalars)
-                    mapper.SetScalarRange(colour[1:])
+                    #mapper.SetScalarRange(colour[1:])
                     mapper.Update()
                 else: