Changeset 8546 for trunk/anuga_core

Timestamp:

Aug 30, 2012, 11:12:13 PM (13 years ago)

Author:

steve

Message:

Pulling out s2p_map and p2s_map

File:

• trunk/anuga_core/source/anuga_parallel/parallel_api.py (modified) (4 diffs)

trunk/anuga_core/source/anuga_parallel/parallel_api.py

@@ -72 +72 @@
         # FIXME - what other attributes need to be transferred?
 
-        for p in range(1, numprocs):
+        for p in xrange(1, numprocs):
             # FIXME SR: Creates cPickle dump
             send((domain_name, domain_dir, domain_store, \
@@ -92 +92 @@
     if myid == 0:
         boundary_map = domain.boundary_map
-        for p in range(1, numprocs):
+        for p in xrange(1, numprocs):
             # FIXME SR: Creates cPickle dump
             send(boundary_map, p)
@@ -139 +139 @@
 
 
-        n = len(s2p_map)
-        s2p_map_keys_flat = num.reshape(num.array(s2p_map.keys(),num.int), (n,1) )
-        s2p_map_values_flat = num.array(s2p_map.values(),num.int)
-        s2p_map_flat = num.concatenate( (s2p_map_keys_flat, s2p_map_values_flat), axis=1 )
-
-        n = len(p2s_map)
-        p2s_map_keys_flat = num.reshape(num.array(p2s_map.keys(),num.int), (n,2) )
-        p2s_map_values_flat = num.reshape(num.array(p2s_map.values(),num.int) , (n,1))
-        p2s_map_flat = num.concatenate( (p2s_map_keys_flat, p2s_map_values_flat), axis=1 )
-        
-        for p in range(1, numprocs):
-
-            # FIXME SR: Creates cPickle dump
-            send(s2p_map_flat, p)
-            # FIXME SR: Creates cPickle dump
-            #print p2s_map
-            send(p2s_map_flat, p)
+#        n = len(s2p_map)
+#        s2p_map_keys_flat = num.reshape(num.array(s2p_map.keys(),num.int), (n,1) )
+#        s2p_map_values_flat = num.array(s2p_map.values(),num.int)
+#        s2p_map_flat = num.concatenate( (s2p_map_keys_flat, s2p_map_values_flat), axis=1 )
+#
+#        n = len(p2s_map)
+#        p2s_map_keys_flat = num.reshape(num.array(p2s_map.keys(),num.int), (n,2) )
+#        p2s_map_values_flat = num.reshape(num.array(p2s_map.values(),num.int) , (n,1))
+#        p2s_map_flat = num.concatenate( (p2s_map_keys_flat, p2s_map_values_flat), axis=1 )
+
+        s2p_map = None
+        p2s_map = None
+
+#        for p in range(1, numprocs):
+#
+#            # FIXME SR: Creates cPickle dump
+#            send(s2p_map_flat, p)
+#            # FIXME SR: Creates cPickle dump
+#            #print p2s_map
+#            send(p2s_map_flat, p)
 
         if verbose: print 'Communication done'
@@ -176 +179 @@
         
         # Recieve serial to parallel (s2p) and parallel to serial (p2s) triangle mapping
-        s2p_map_flat = receive(0)
-        s2p_map = dict.fromkeys(s2p_map_flat[:,0], s2p_map_flat[:,1:2])
-
-        p2s_map_flat = receive(0)
-        p2s_map_keys = [tuple(x) for x in p2s_map_flat[:,0:1]]
-
-        p2s_map = dict.fromkeys(p2s_map_keys, p2s_map_flat[:,2])
+        s2p_map = None
+        p2s_map = None
+
+#        s2p_map_flat = receive(0)
+#        s2p_map = dict.fromkeys(s2p_map_flat[:,0], s2p_map_flat[:,1:2])
+#
+#        p2s_map_flat = receive(0)
+#        p2s_map_keys = [tuple(x) for x in p2s_map_flat[:,0:1]]
+#
+#        p2s_map = dict.fromkeys(p2s_map_keys, p2s_map_flat[:,2])
 
     #------------------------------------------------------------------------