Changeset 2206

Timestamp:

Jan 13, 2006, 4:43:01 PM (18 years ago)

Author:

steve

Message:

Changed back to vpython viewer with shallow_water. Use shallow_water_vtk to get Jack's new vtk viewer

File:

• inundation/pyvolution/shallow_water.py (modified) (9 diffs)

inundation/pyvolution/shallow_water.py

@@ -58 +58 @@
 from region import *#
 
-Generic_domain = Domain #Rename
+Generic_Domain = Domain #Rename
 
 #Shallow water domain
-class Domain(Generic_domain):
+class Domain(Generic_Domain):
 
     def __init__(self, coordinates, vertices, boundary = None,
@@ -69 +69 @@
         conserved_quantities = ['stage', 'xmomentum', 'ymomentum']
         other_quantities = ['elevation', 'friction']
-        Generic_domain.__init__(self, coordinates, vertices, boundary,
+        Generic_Domain.__init__(self, coordinates, vertices, boundary,
                                 conserved_quantities, other_quantities,
                                 tagged_elements, geo_reference, use_inscribed_circle)
@@ -101 +101 @@
 
 
-        #Establish shortcuts to relevant quantities (for efficiency)
-        #self.w = self.quantities['stage']
-        #self.uh = self.quantities['xmomentum']
-        #self.vh = self.quantities['ymomentum']
-        #self.z = self.quantities['elevation']
-        #self.eta = self.quantities['friction']
 
     def initialise_visualiser(self,scale_z=1.0,rect=None):
@@ -112 +106 @@
         if self.visualiser is None:
             from realtime_visualisation_new import Visualiser
-            #from vtk_realtime_visualiser import Visualiser
             self.visualiser = Visualiser(self,scale_z,rect)
             self.visualiser.setup['elevation']=True
@@ -120 +113 @@
             self.visualiser.coloring['stage'] = True
             self.visualiser.qcolor['stage'] = (0.0, 0.0, 0.8)
+        print 'initialise visualiser'
+        print self.visualiser.setup
+        print self.visualiser.updating
 
     def check_integrity(self):
-        Generic_domain.check_integrity(self)
+        Generic_Domain.check_integrity(self)
 
         #Check that we are solving the shallow water wave equation
@@ -205 +201 @@
         #and or visualisation
         self.distribute_to_vertices_and_edges()
-        #s = '''for x in range(5):
-#  self.distribute_to_vertices_and_edges()'''
-#        global profiler
-#        profiler = profiler.runctx(s, globals(), locals())
 
         #Initialise real time viz if requested
-        if self.visualise is True and self.time == 0.0 and self.visualiser is None:
-            #pass
-            #import realtime_visualisation_new as visualise
-            #visualise.create_surface(self)
-            self.initialise_visualiser()
-            #self.visualiser.update_timer()
-            print "Warning: Enabling the visualiser with domain.visualise is not"
-            print "recommended. Controlling the visualiser manually allows for much better"
-            print "control over visualiser parameters."
-
-        if self.visualise is True:
-            self.visualiser.start()
+        if self.visualise is True and self.time == 0.0:
+            if self.visualiser is None:
+                self.initialise_visualiser()
+
+            self.visualiser.update_timer()
+            self.visualiser.setup_all()
 
         #Store model data, e.g. for visualisation
@@ -236 +222 @@
 
         #Call basic machinery from parent class
-        for t in Generic_domain.evolve(self, yieldstep, finaltime,
+        for t in Generic_Domain.evolve(self, yieldstep, finaltime,
                                        skip_initial_step):
             #Real time viz
             if self.visualise is True:
-                #pass
-                #Obseleted by the VTK-Visualiser
-                #self.visualiser.update_all()
-                #self.visualiser.update_timer()
-                self.visualiser.request_redraw()
+                self.visualiser.update_all()
+                self.visualiser.update_timer()
+
 
             #Store model data, e.g. for subsequent visualisation
@@ -255 +239 @@
             #Pass control on to outer loop for more specific actions
             yield(t)
-        import pypar
-        profiler.dump_stats("distrib_profile." + str(pypar.size()) + "." + str(pypar.rank()) + ".dat")
+
     def initialise_storage(self):
         """Create and initialise self.writer object for storing data.
@@ -280 +263 @@
 
 
-####################MH 090605 new extrapolation function belonging to domain class
-def extrapolate_second_order_sw(domain):
-    """extrapolate conserved quntities to the vertices of the triangles
-    Python version to be written after the C version
-    """
-    msg = 'Method extrapolate_second_order_sw should be implemented in C'
-    raise msg
-####################MH 090605 ###########################################
-
-    def initialise_visualiser(self,scale_z=1.0,rect=None):
-        #Realtime visualisation
-        if self.visualiser is None:
-            from realtime_visualisation_new import Visualiser
-            from Numeric import array, Float
-
-            if rect is None:
-                rect = array(self.xy_extent, Float)
-
-            self.visualiser = Visualiser(self,scale_z,rect)
-        self.visualise = True
+#=============== End of Shallow Water Domain ===============================
+