Changeset 2050

Timestamp:

Nov 22, 2005, 2:14:12 PM (19 years ago)

Author:

steve

Message:

Fixed bug in visualisation of advection domain

Location:

inundation

Files:

• parallel/run_parallel_merimbula.py (modified) (3 diffs)
• parallel/run_parallel_sw_merimbula.py (modified) (2 diffs)
• pyvolution/advection.py (modified) (2 diffs)

inundation/parallel/run_parallel_merimbula.py

@@ -101 +101 @@
         print "WARNING: number of subboxes is not equal to the number of proc"
 
-    domain_full = pmesh_to_domain_instance(filename, Domain)
+    domain_full = pmesh_to_domain_instance(filename, Advection_Domain)
     domain_full.set_quantity('stage', Set_Stage(200.0,300.0,1.0))
 #    domain.set_quantity('stage', Set_Stage(756000.0,756500.0,4.0))
@@ -152 +152 @@
                                    velocity = [0.1,0.0])
 
-domain.initialise_visualiser(rect=rect)
+#domain.initialise_visualiser(rect=rect)
 
 #Boundaries
 
 T = Transmissive_boundary(domain)
-domain.set_boundary( {'outflow': T, 'inflow': T, 'inner':T, 'exterior': T, 'open':T} )
+R = Reflective_boundary(domain)
+domain.set_boundary( {'outflow': R, 'inflow': R, 'inner':R, 'exterior': R, 'open':R} )
 
 
@@ -166 +167 @@
 # Evolution
 t0 = time.time()
-domain.visualise = True
+
+
+try:
+    domain.initialise_visualiser(rect=rect)
+    #domain.visualiser.coloring['stage'] = True
+    #domain.visualiser.scale_z['stage'] = 0.2
+except:
+    print 'No visualiser'
+
+
+
 #yieldstep = 1
 yieldstep = 1000

inundation/parallel/run_parallel_sw_merimbula.py

@@ -92 +92 @@
     # read in the test files
 
-    filename = 'test-100.tsh'
-#    filename = 'merimbula_10785_1.tsh'
+#    filename = 'test-100.tsh'
+    filename = 'merimbula_10785_1.tsh'
     nx = numprocs
     ny = 1
@@ -101 +101 @@
     domain_full = pmesh_to_domain_instance(filename, Domain)
 
-    domain_full.set_quantity('stage', Set_Stage(200.0,300.0,1.0))
-#    domain_full.set_quantity('stage', Set_Stage(756000.0,756500.0,2.0))
+#    domain_full.set_quantity('stage', Set_Stage(200.0,300.0,1.0))
+    domain_full.set_quantity('stage', Set_Stage(756000.0,756500.0,2.0))
 
     nodes, triangles, boundary, triangles_per_proc, quantities = \

inundation/pyvolution/advection.py

@@ -64 +64 @@
         self.visualise  = False
         self.visualise_color_stage = False
+        self.visualise_stage_range = 1.0
         self.visualise_timer = True
         self.visualise_range_z = None
+
 
         self.smooth = True
@@ -342 +344 @@
         #Initialise real time viz if requested
         if self.visualise is True and self.time == 0.0:
+            #pass
             #import realtime_visualisation_new as visualise
+            #visualise.create_surface(self)
             self.initialise_visualiser()
-            #self.visualiser.update_quantity('stage')
+            self.visualiser.setup_all()
             self.visualiser.update_timer()
+
 
         #Call basic machinery from parent class
         for t in Generic_domain.evolve(self, yieldstep, finaltime):
+
+
             #Real time viz
             if self.visualise is True:
-                #self.visualiser.update_quantity('stage')
+                #pass
+                self.visualiser.update_all()
                 self.visualiser.update_timer()
+
 
             #Pass control on to outer loop for more specific actions