Changeset 3776

Timestamp:

Oct 13, 2006, 2:43:30 PM (18 years ago)

Author:

ole

Message:

Made parallel abstraction work on sequential machine without pypar.
Work on simple parallel example (plotting)

Location:

anuga_core/source/anuga_parallel

Files:

• parallel_abstraction.py (modified) (1 diff)
• parallel_api.py (modified) (2 diffs)
• test_parallel_sw_runup.py (modified) (1 diff)

anuga_core/source/anuga_parallel/parallel_abstraction.py

@@ -36 +36 @@
         return time.time()
 
-    #def send(*args, **kwargs):
-    #    pass
+    def send(*args, **kwargs):
+        pass
 
-    #def receive(*args, **kwargs):
-    #    pass    
+    def receive(*args, **kwargs):
+        pass    
 
+    pypar_available = False
 else:
     from pypar import *
+    pypar_available = True    

anuga_core/source/anuga_parallel/parallel_api.py

@@ -5 +5 @@
 
 # Parallelism
-# The Python-MPI interface
-from pypar import size, rank, get_processor_name, finalize, send, receive
-#from anuga_parallel.parallel_abstraction import size, rank, get_processor_name, finalize #,send, receive
+
+# The abstract Python-MPI interface
+from anuga_parallel.parallel_abstraction import size, rank, get_processor_name
+from anuga_parallel.parallel_abstraction import finalize, send, receive
+from anuga_parallel.parallel_abstraction import pypar_available
+
+# Mesh partitioning
 from anuga_parallel.pmesh_divide  import pmesh_divide_metis
 from anuga_parallel.build_submesh import build_submesh
 from anuga_parallel.build_local   import build_local_mesh
-from anuga_parallel.build_commun  import send_submesh, rec_submesh, extract_hostmesh
-from anuga_parallel.parallel_shallow_water import Parallel_Domain
+
+# ANUGA parallel engine (only load if pypar can)
+if pypar_available:
+    from anuga_parallel.build_commun  import send_submesh
+    from anuga_parallel.build_commun  import rec_submesh
+    from anuga_parallel.build_commun  import extract_hostmesh
+    from anuga_parallel.parallel_shallow_water import Parallel_Domain
 
 
@@ -30 +39 @@
     """ Distribute the domain to all processes
     """
+
+    if not pypar_available: return domain # Bypass
 
     # For some obscure reason this communication must happen prior to

anuga_core/source/anuga_parallel/test_parallel_sw_runup.py

@@ -92 +92 @@
 print time
 print
-for i, _ in enumerate(interpolation_points):
+for i, (x,y) in enumerate(interpolation_points):
     print i, gauge_values[i]
     print 
 
         
+    try:
+        from pylab import *
+    except:
+        pass
+    else:
+        ion()
+        hold(False)
+        plot(time, gauge_values[i], 'r.-')
+        #time, predicted_gauge_values[i], 'k-')
+        
+        title('Gauge %d (%f,%f)' %(i,x,y))
+        xlabel('time(s)')
+        ylabel('stage (m)')    
+        #legend(('Observed', 'Modelled'), shadow=True, loc='upper left')
+        #savefig('Gauge_%d.png' %i, dpi = 300)
+    
+        raw_input('Next')
+        
+
+