Changeset 1599

Timestamp:

Jul 11, 2005, 11:23:59 PM (18 years ago)

Author:

steve

Message:

 

Location:

inundation/ga/storm_surge

Files:

• parallel (modified) (1 prop)
• parallel/run_parallel_sw_merimbula.py (modified) (1 diff)
• pyvolution/netherlands.py (modified) (2 diffs)
• pyvolution/realtime_visualisation_new.py (modified) (5 diffs)
• pyvolution/shallow_water.py (modified) (2 diffs)
• zeus/pyvolution.zbi (modified) (previous)

inundation/ga/storm_surge/parallel/run_parallel_sw_merimbula.py

@@ -145 +145 @@
                          ghost_recv_dict = ghost_recv_dict)
 
-domain.initialise_visualiser(rect=rect,scale_z =0.1)
 #domain.initialise_visualiser(rect=rect)
-domain.visualise_color_stage = True
+
+domain.initialise_visualiser(rect=rect)
+domain.visualiser.coloring['stage'] = True
+domain.visualiser.scale_z['stage'] = 0.2
+domain.visualiser.scale_z['elevation'] = 0.05
+
+
 domain.default_order = 1
 

inundation/ga/storm_surge/pyvolution/netherlands.py

@@ -83 +83 @@
 N = 130 #size = 33800
 N = 600 #Size = 720000
-N = 30
+N = 60
 
 
@@ -120 +120 @@
     domain.filename, _ = os.path.splitext(base)
 else:
-    domain.initialise_visualiser(rect=[0.0,0.0,2.0,2.0])
-    domain.visualise_color_stage = False
+    domain.initialise_visualiser(rect=[0.0,0.0,1.0,1.0])
+    domain.visualiser.coloring['stage'] = True
     domain.visualise_timer = True
     domain.checkpoint = False

inundation/ga/storm_surge/pyvolution/realtime_visualisation_new.py

@@ -53 +53 @@
 #        print 'range_y',self.range_y
 
-
-
+        self.stage_color     = stage_color
+        self.elevation_color = elevation_color
+        self.friction_color  = friction_color
+        self.other_color     = other_color
+
+        self.qcolor = {}
+        self.scale_z = {}
+        self.coloring = {}
+        self.updating = {}
+
+        self.qcolor['stage']  = self.stage_color
+        self.scale_z['stage']  = 1.0
+        self.coloring['stage'] = False
+        self.updating['stage'] = True
+
+        self.qcolor['elevation']  = self.elevation_color
+        self.scale_z['elevation']  = 1.0
+        self.coloring['elevation'] = False
+        self.updating['elevation'] = False
 
         #print self.max_x, self.min_x, self.max_y, self.min_y,
@@ -68 +85 @@
         #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()
@@ -125 +138 @@
         self.range_z = max(range_z,self.range_z)
 
+
+    def setup_all(self):
+
+        self.update_quantity('elevation')
+        self.update_quantity('stage')
+
     def update_all(self):
 
-        self.update_quantity('elevation',self.elevation_color)
-        self.update_quantity('stage',self.stage_color)
+        if self.updating['elevation']:
+            self.update_quantity('elevation')
+
+        if self.updating['stage']:
+            self.update_quantity('stage')
+
+
+
 
     def update_timer(self):
@@ -137 +162 @@
 
 
-    def update_quantity(self,qname,qcolor=None,scale_z=None):
+    def update_quantity(self,qname):
 
         #print 'update '+qname+' arrays'
+
+        qcolor   = self.qcolor[qname]
+        scale_z  = self.scale_z[qname]
+        coloring = self.coloring[qname]
+        updating = self.updating[qname]
+
 
         if qcolor is None:
@@ -156 +187 @@
             scale_z = self.scale_z
 
-        try:
+        #try:
+        if coloring:
+            self.update_arrays_color(self.domain.quantities[qname].vertex_values, qcolor, scale_z)
+        else:
             self.update_arrays(self.domain.quantities[qname].vertex_values, qcolor, scale_z)
 
-            #print 'update bed image'
-            self.vpython_z_models[qname].pos    = self.pos
-            self.vpython_z_models[qname].color  = self.colour
-            self.vpython_z_models[qname].normal = self.normals
-        except:
-            print 'Visualisation: Could not update quantity '+qname
-            pass
+        #print 'update bed image'
+        self.vpython_z_models[qname].pos    = self.pos
+        self.vpython_z_models[qname].color  = self.colour
+        self.vpython_z_models[qname].normal = self.normals
+        #except:
+        #    print 'Visualisation: Could not update quantity '+qname
+        #    pass
 
     def update_quantity_color(self,qname,qcolor=None,scale_z=None):

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -194 +194 @@
             #visualise.create_surface(self)
             self.initialise_visualiser()
-            self.visualiser.update_quantity('stage')
-            self.visualiser.update_quantity('elevation')
+            self.visualiser.setup_all()
             self.visualiser.update_timer()
 
@@ -215 +214 @@
                 #visualise.update(self)
                 if self.visualise is True:
-                    self.visualiser.update_quantity('stage')
+                    self.visualiser.update_all()
                     self.visualiser.update_timer()