Changeset 1471 for inundation/ga

Timestamp:

May 26, 2005, 5:41:07 PM (19 years ago)

Author:

steve

Message:

Can now change base colour for different quantities, but need a better method!

Location:

inundation/ga/storm_surge

Files:

• Hobart/run_hobart_buildings.py (modified) (1 diff)
• parallel/advection.py (modified) (2 diffs)
• parallel/run_parallel_advection.py (modified) (2 diffs)
• pyvolution/realtime_visualisation_new.py (modified) (8 diffs)
• pyvolution/shallow_water.py (modified) (3 diffs)
• zeus/pyvolution.zbi (modified) (previous)

inundation/ga/storm_surge/Hobart/run_hobart_buildings.py

@@ -42 +42 @@
 domain.default_order = 1
 domain.smooth = True
-domain.visualise = True
+
+# Turn on visualiser
+domain.initialise_visualiser()
+
+# Colours for Hobart
+domain.visualiser.stage_color = (0.0,0.38,0.1)
+domain.visualiser.friction_color = (0.1,0.99,0.1)
+domain.visualiser.other_color = (0.99,0.4,0.1)
+
 
 #------------------------------

inundation/ga/storm_surge/parallel/advection.py

@@ -44 +44 @@
 
         #Realtime visualisation
-        self.visualise = False
+        self.visualiser = None
+        self.visualise  = False
         self.visualise_color_stage = False
         self.visualise_timer = True
@@ -312 +313 @@
         #Initialise real time viz if requested
         if self.visualise is True and self.time == 0.0:
-            import realtime_visualisation_new as visualise
+            #import realtime_visualisation_new as visualise
             self.visualiser.update_quantity('stage')
             self.visualiser.update_timer()

inundation/ga/storm_surge/parallel/run_parallel_advection.py

@@ -30 +30 @@
 # Initial condition is zero by default
 
+#turn on the visualisation
 domain.initialise_visualiser()
 
@@ -60 +61 @@
 
 #Check that the boundary value gets propagated to all elements
-for t in domain.evolve(yieldstep = 0.1, finaltime = 3.0):
+for t in domain.evolve(yieldstep = 0.5, finaltime = 3.0):
     if myid == 0:
         domain.write_time()

inundation/ga/storm_surge/pyvolution/realtime_visualisation_new.py

@@ -2 +2 @@
 
 elevation_color = (0.3,0.4,0.5)
-stage_color = (0.1,0.4,0.99)
-
-# Colours for Hobart
-stage_color = (0.0,0.38,0.1)
-friction_color = (0.1,0.99,0.1)
-other_color = (0.99,0.4,0.1)
+stage_color     = (0.1,0.4,0.99)
+friction_color  = (0.1,0.99,0.1)
+other_color     = (0.99,0.4,0.1)
+
 
 class Visualiser:
@@ -60 +58 @@
         #print 'keys',self.domain.quantities.keys()
         #print 'shape of stage',shape(self.stage)
+
+        self.stage_color     = stage_color
+        self.elevation_color = elevation_color
+        self.friction_color  = friction_color
+        self.other_color     = other_color
 
         setup_scene()
@@ -98 +101 @@
             range_z = max(range_z, max_z - min_z)
         except:
-            print 'Visualisation: could not find range of '+qname1
+            #print 'Visualisation: could not find range of '+qname1
             pass
 
@@ -108 +111 @@
             range_z = max(range_z, max_z - min_z)
         except:
-            print 'Visualisation: could not find range of '+qname2
+            #print 'Visualisation: could not find range of '+qname2
             pass
 
@@ -115 +118 @@
     def update_all(self):
 
-        self.update_quantity('elevation',elevation_color)
-        self.update_quantity('stage',stage_color)
+        self.update_quantity('elevation',self.elevation_color)
+        self.update_quantity('stage',self.stage_color)
 
     def update_timer(self):
@@ -130 +133 @@
 
         if qcolor is None:
-            qcolor = other_color
+            qcolor = self.other_color
 
             if qname=='elevation':
-                qcolor = elevation_color
+                qcolor = self.elevation_color
 
             if qname=='stage':
-                qcolor = stage_color
-                
+                qcolor = self.stage_color
+
             if qname=='friction':
-                qcolor = friction_color
+                qcolor = self.friction_color
 
         if scale_z is None:
@@ -161 +164 @@
         if qcolor is None:
             if qname=='elevation':
-                qcolor = elevation_color
+                qcolor = self.elevation_color
 
             if qname=='stage':
-                qcolor = stage_color
-                
+                qcolor = self.stage_color
+
             if qname=='friction':
-                qcolor = friction_color
+                qcolor = self.friction_color
 
         if scale_z is None:
@@ -530 +533 @@
 def create_surface(domain,scale_z=1.0):
 
-    visualiser = Visualiser(domain,scale_z)
-    domain.visualiser = visualiser
-
-    visualiser.update_quantity('elevation')
-    visualiser.update_quantity('stage')
-    visualiser.update_timer()
+    domain.initialise_visualiser(scale_z)
+
+    domain.visualiser.update_quantity('elevation')
+    domain.visualiser.update_quantity('stage')
+    domain.visualiser.update_timer()
 
 def update(domain):
 
-    visualiser = domain.visualiser
     if domain.visualise_color_stage:
-        visualiser.update_quantity_color('stage')
+        domain.visualiser.update_quantity_color('stage')
     else:
-        visualiser.update_quantity('stage')
-
-    visualiser.update_timer()
+        domain.visualiser.update_quantity('stage')
+
+    domain.visualiser.update_timer()

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -57 +57 @@
 from domain import *
 from region import *
+from realtime_visualisation_new import Visualiser
 Generic_domain = Domain #Rename
 
@@ -80 +81 @@
 
         #Realtime visualisation
-        self.visualise = False
+        self.visualiser = None
+        self.visualise  = False
         self.visualise_color_stage = False
         self.visualise_stage_range = 1.0
@@ -105 +107 @@
         #self.z = self.quantities['elevation']
         #self.eta = self.quantities['friction']
+
+    def initialise_visualiser(self,scale_z=1.0):
+        #Realtime visualisation
+        if self.visualiser is None:
+            self.visualiser = Visualiser(self,scale_z)
+        self.visualise = True
 
     def check_integrity(self):