Changeset 271

Timestamp:

Sep 6, 2004, 10:09:28 AM (21 years ago)

Author:

ole

Message:

Made evlove specialisation in advection module

Location:

inundation/ga/storm_surge/pyvolution

Files:

• advection.py (modified) (2 diffs)
• shallow_water.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/advection.py

@@ -38 +38 @@
         #Only first is implemented for advection    
         self.default_order = self.order = 1  
+
+        #Realtime visualisation
+        self.visualise = False
+        self.smooth = True
 
 
@@ -160 +164 @@
         
 
+
+    def evolve(self, yieldstep = None, finaltime = None):
+        """Specialisation of basic evolve method from parent class
+        """
+        
+        #Initialise real time viz if requested
+        if self.visualise is True and self.time == 0.0:
+            import realtime_visualisation as visualise
+            visualise.create_surface(self)
+
+        #Call basic machinery from parent class
+        for t in Generic_domain.evolve(self, yieldstep, finaltime):
+            #Real time viz
+            if self.visualise is True:
+                visualise.update(self)
+
+            #Pass control on to outer loop for more specific actions    
+            yield(t)
+        

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -39 +39 @@
         #Realtime visualisation
         self.visualise = False
-
 
         #Stored output
@@ -102 +101 @@
 
     def evolve(self, yieldstep = None, finaltime = None):
-        #Call basic machinery from parent class
-
-
+        """Specialisation of basic evolve method from parent class
+        """
+        
+        #Initialise real time viz if requested
         if self.visualise is True and self.time == 0.0:
             import realtime_visualisation as visualise
@@ -113 +113 @@
             self.store_bathymetry()        
             ###self.store_conserved_quantities()        
-                    
+
+        #Call basic machinery from parent class
         for t in Generic_domain.evolve(self, yieldstep, finaltime):
             #Real time viz