Changeset 1407

Timestamp:

May 17, 2005, 12:02:50 PM (19 years ago)

Author:

steve

Message:

Adding parallel update_timestep

Location:

inundation/ga/storm_surge

Files:

• parallel/advection.py (modified) (4 diffs)
• parallel/parallel_advection.py (modified) (5 diffs)
• parallel/run_parallel_advection.py (modified) (2 diffs)
• pyvolution/realtime_visualisation_new.py (modified) (5 diffs)
• zeus/pyvolution.zbi (modified) (previous)

inundation/ga/storm_surge/parallel/advection.py

@@ -24 +24 @@
 """
 
+from realtime_visualisation_new import Visualiser
 from domain import *
 Generic_domain = Domain #Rename
@@ -48 +49 @@
         self.visualise_timer = True
         self.visualise_range_z = None
+
         self.smooth = True
 
+
+
+    def initialise_visualiser(self,scale_z=1.0):
+        #Realtime visualisation
+        self.visualiser = Visualiser(self,scale_z)
+        self.visualise = True
 
 
@@ -180 +188 @@
         if self.visualise is True and self.time == 0.0:
             import realtime_visualisation_new as visualise
-            visualise.create_surface(self)
+            self.visualiser.update_quantity('stage')
+            self.visualiser.update_timer()
 
         #Call basic machinery from parent class
@@ -186 +195 @@
             #Real time viz
             if self.visualise is True:
-                visualise.update(self)
+                self.visualiser.update_quantity('stage')
+                self.visualiser.update_timer()
 
             #Pass control on to outer loop for more specific actions

inundation/ga/storm_surge/parallel/parallel_advection.py

@@ -17 +17 @@
 Advection_Domain = Domain
 from Numeric import zeros, Float, Int, ones
+import pypar
+
 
 class Parallel_Domain(Advection_Domain):
 
-    def __init__(self, coordinates, vertices, boundary = None, ghosts = None, velocity = None):
+    def __init__(self, coordinates, vertices, boundary = None, ghosts = None, velocity = None, processor=0):
 
         Advection_Domain.__init__(self, coordinates, vertices, boundary, velocity)
 
         N = self.number_of_elements
+
+        self.processor = processor
 
         if  ghosts == None:
@@ -36 +40 @@
                 self.full[key] = -1
 
+
+
+
     def check_integrity(self):
         Advection_Domain.check_integrity(self)
@@ -41 +48 @@
         msg = 'Will need to check global and local numbering'
         assert self.conserved_quantities[0] == 'stage', msg
+
+
+
+    def update_timestep(self, yieldstep, finaltime):
+        Advection_Domain.update_timestep(self, yieldstep, finaltime)
+
+        timestep = 0.0
+        pypar.raw_reduce(self.timestep,timestep,pypar.MIN,0)
+        print 'Processor %d, Timestep %.4f'%(self.processor,timestep)
+
+
 
 
@@ -49 +67 @@
                 stage_cv[triangle] = stage_cv[self.ghosts[triangle]]
 
+
+    def write_time(self):
+        if self.min_timestep == self.max_timestep:
+            print 'Processor %d, Time = %.4f, delta t = %.8f, steps=%d (%d)'\
+                  %(self.processor, self.time, self.min_timestep, self.number_of_steps,
+                    self.number_of_first_order_steps)
+        elif self.min_timestep > self.max_timestep:
+            print 'Processor %d, Time = %.4f, steps=%d (%d)'\
+                  %(self.processor, self.time, self.number_of_steps,
+                    self.number_of_first_order_steps)
+        else:
+            print 'Processor %d, Time = %.4f, delta t in [%.8f, %.8f], steps=%d (%d)'\
+                  %(self.processor, self.time, self.min_timestep,
+                    self.max_timestep, self.number_of_steps,
+                    self.number_of_first_order_steps)
+
+
+
     def evolve(self, yieldstep = None, finaltime = None):
         """Specialisation of basic evolve method from parent class
@@ -54 +90 @@
 
         #Initialise real time viz if requested
-        if self.visualise is True and self.time == 0.0:
-            import realtime_visualisation_new as visualise
-            self.visualiser = visualise.Visualiser(self)
+        if self.time == 0.0:
+            pass
 
         #Call basic machinery from parent class
         for t in Advection_Domain.evolve(self, yieldstep, finaltime):
-            #Real time viz
-            if self.visualise is True:
-                self.visualiser.update_quantity('stage')
 
             #Pass control on to outer loop for more specific actions

inundation/ga/storm_surge/parallel/run_parallel_advection.py

@@ -9 +9 @@
 from Numeric import array
 
+import pypar
+
+numprocs = pypar.size()
+myid = pypar.rank()
+processor_name = pypar.Get_processor_name()
+
 N = 30
 M = 30
@@ -15 +21 @@
 
 #Create advection domain with direction (1,-1)
-domain = Parallel_Domain(points, vertices, boundary, ghosts, velocity=[1.0, 0.0])
+domain = Parallel_Domain(points, vertices, boundary, ghosts, velocity=[1.0, 0.0],processor = myid)
 
 # Initial condition is zero by default
 
-domain.visualise = True
-#domain.visualise_range_z = 1.0
-
+domain.initialise_visualiser()
 
 #Boundaries

inundation/ga/storm_surge/pyvolution/realtime_visualisation_new.py

@@ -6 +6 @@
 
 class Visualiser:
+
     def __init__(self,domain,scale_z=1.0):
         """Create visualisation of domain
@@ -20 +21 @@
         self.z_models = {}
         keys = self.domain.quantities.keys()
-        #print keys
+        print keys
         for key in keys:
             self.z_models[key] = faces(frame= self.frame)
 
-
+        print self.z_models
 
         self.max_x = max(max(self.vertices[:,0]),max(self.vertices[:,2]),max(self.vertices[:,4]))
@@ -55 +56 @@
         #print 'keys',self.domain.quantities.keys()
         #print 'shape of stage',shape(self.stage)
+
+        setup_scene()
 
         self.border_model = curve(frame = self.frame,
@@ -486 +489 @@
                  type_converters = converters.blitz, compiler='gcc');
 
-scene.width = 1000
-scene.height = 800
-
-#Original
-scene.center = (0.5,0.5,0.0)
-scene.forward = vector(-0.0, 0.5, -0.8)
-
-#Temporary (for bedslope)
-#scene.forward = vector(0.0006, 0.7, -0.03)
-
-
-#Temporary for hackett - begin
-#scene.autoscale = 0
-#scene.scale = (0.002, 0.002, 0.01) #Scale z so that countours stand out more
-#scene.center = (300.0,500.0,-10)
-#Temporary for hackett - end
-
-
-scene.ambient = 0.4
-#scene.lights = [(0.6, 0.3, 0.2), (0.1, -0.5, 0.4), (-0.1, 0.1, -0.4),
-#               (-0.2, 0.2, 0.1)]
-
-scene.lights = [(0.6, 0.3, 0.2), (0.1, -0.5, 0.4)]
-
-
-
-def create_surface(domain,scale_z=0.5):
-
-    visualiser = Visualiser(domain,scale_z=0.5)
+
+def setup_scene():
+
+    from visual import *
+    #scene.width = 1000
+    #scene.height = 800
+
+    #Original
+    scene.center = (0.5,0.5,0.0)
+    scene.forward = vector(-0.0, 0.5, -0.8)
+
+    #Temporary (for bedslope)
+    #scene.forward = vector(0.0006, 0.7, -0.03)
+
+
+    #Temporary for hackett - begin
+    #scene.autoscale = 0
+    #scene.scale = (0.002, 0.002, 0.01) #Scale z so that countours stand out more
+    #scene.center = (300.0,500.0,-10)
+    #Temporary for hackett - end
+
+
+    scene.ambient = 0.4
+    #scene.lights = [(0.6, 0.3, 0.2), (0.1, -0.5, 0.4), (-0.1, 0.1, -0.4),
+    #               (-0.2, 0.2, 0.1)]
+
+    scene.lights = [(0.6, 0.3, 0.2), (0.1, -0.5, 0.4)]
+
+
+
+def create_surface(domain,scale_z=1.0):
+
+    visualiser = Visualiser(domain,scale_z)
     domain.visualiser = visualiser
 
@@ -529 +536 @@
         visualiser.update_quantity('stage')
 
-    if domain.visualise_timer:
-        visualiser.update_timer()
+    visualiser.update_timer()