Changeset 1436

Timestamp:

May 19, 2005, 5:47:00 PM (19 years ago)

Author:

steve

Message:

 

Location:

inundation/ga/storm_surge

Files:

• Hobart/Run_noca.py (modified) (4 diffs)
• parallel/parallel_advection.py (modified) (4 diffs)
• parallel/run_parallel_advection.py (modified) (3 diffs)

inundation/ga/storm_surge/Hobart/Run_noca.py

@@ -24 +24 @@
 ######################
 # Domain
-filename = 'Noca_mesh_1000.tsh'    
+filename = 'Noca_mesh_1000.tsh'
 print 'Creating domain from', filename
 domain = pmesh_to_domain_instance(filename, Domain)
@@ -31 +31 @@
 #--------------------
 # Order of the scheme
-domain.default_order = 1
+domain.default_order = 2
 domain.smooth = True
 
@@ -69 +69 @@
 yieldstep = 0.1
 finaltime = 10
-         
+
 ######################
 #Evolution
@@ -77 +77 @@
     domain.write_time()
     domain.visualiser.update_quantity_color('friction',(1.0,0.0,0.0))
-    
+
 print 'That took %.2f seconds' %(time.time()-t0)
 
-    

inundation/ga/storm_surge/parallel/parallel_advection.py

@@ -81 +81 @@
         # the separate processors
 
+        from weave import converters
+
         stage_cv = self.quantities['stage'].centroid_values
 
@@ -92 +94 @@
                         Idf  = self.full_send_dict[send_proc][0]
                         Xout = self.full_send_dict[send_proc][1]
-                        for i, _ in enumerate(Xout):
+                        N = len(Xout)
+
+                        """
+                        # Original python Code
+                        for i in range(N):
                             Xout[i] = stage_cv[Idf[i]]
+                        """
+                        code1 = """
+                        for (int i=0; i<N ; i++){
+                            Xout(i) = stage_cv(Idf(i));
+                        }
+                        """
+                        weave.inline(code1, ['stage_cv','Idf','Xout','N'],
+                                     type_converters = converters.blitz, compiler='gcc');
 
                         pypar.send(Xout,send_proc)
@@ -104 +118 @@
 
                     X = pypar.receive(iproc,X)
+                    N = len(X)
                     #print 'Processor %d receiving from Processor %d'%(self.processor,iproc)
-                    for i, _ in enumerate(X):
+                    for i in range(N):
                         stage_cv[Idg[i]] = X[i]
             pypar.barrier()
@@ -115 +130 @@
             #print Idf
             Idg  = self.ghost_recv_dict[iproc][0]
+            N = len(Idg)
             #print Idg
-            for i, _ in enumerate(Idf):
+            for i in range(N):
                 #print i,Idg[i],Idf[i]
                 stage_cv[Idg[i]] = stage_cv[Idf[i]]

inundation/ga/storm_surge/parallel/run_parallel_advection.py

@@ -18 +18 @@
 
 
-N = 20
-M = 20
+#N = 50
+N = 25
+M = 25
 
-points, vertices, boundary, full_send_dict, ghost_recv_dict = parallel_rectangular(N, M)
+points, vertices, boundary, full_send_dict, ghost_recv_dict = parallel_rectangular(N, M, len1=1.0)
 
 #Create advection domain with direction (1,-1)
@@ -29 +30 @@
 # Initial condition is zero by default
 
-domain.initialise_visualiser()
+#domain.initialise_visualiser()
 
 #Boundaries
@@ -55 +56 @@
 if myid == 0:
     domain.set_quantity('stage', Set_Stage(0.2,0.4,1.0))
+    import time
+    t0 = time.time()
 
 #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.1, finaltime = 2.0):
     if myid == 0:
         domain.write_time()
 
 if myid == 0:
-    print 'Evolution ended'
+    print 'That took %.2f seconds' %(time.time()-t0)