Changeset 8507

Timestamp:

Aug 13, 2012, 4:50:25 PM (13 years ago)

Author:

steve

Message:

Just adding extra mpi facility via pypar_ext

Location:

trunk/anuga_core/source/anuga_parallel

Files:

• parallel_inlet_operator.py (modified) (3 diffs)
• parallel_operator_factory.py (modified) (3 diffs)
• pypar_ext (added)
• pypar_ext/anuga_setup.py (added)
• pypar_ext/source (added)
• pypar_ext/source/LICENSE (added)
• pypar_ext/source/__init__.py (added)
• pypar_ext/source/__metadata__.py (added)
• pypar_ext/source/compile.py (added)
• pypar_ext/source/mpiextras.c (added)
• pypar_ext/source/pypar_ext.py (added)
• pypar_ext/source/setup.py (added)
• pypar_ext/source/test_pypar_ext.py (added)
• test_parallel_frac_op.py (modified) (2 diffs)
• test_parallel_inlet_operator.py (added)

trunk/anuga_core/source/anuga_parallel/parallel_inlet_operator.py

@@ -35 +35 @@
                  line,
                  Q = 0.0,
+                 default = None,
                  description = None,
                  label = None,
@@ -84 +85 @@
         self.set_logging(logging)
 
+
+        self.set_default(default)
+
+
     def __call__(self):
 
@@ -114 +119 @@
         """
         # Only one processor should call this function unless Q is parallelizable
+
+        from anuga.fit_interpolate.interpolate import Modeltime_too_early, Modeltime_too_late
+        
         if callable(self.Q):
-            Q = self.Q(t)[0]
+            try:
+                Q = self.Q(t)[0]
+            except Modeltime_too_early, e:
+                raise Modeltime_too_early(e)
+            except Modeltime_too_late, e:
+                Q = self.get_default(t)
         else:
             Q = self.Q
 
         return Q
+    
 
     def statistics(self):

trunk/anuga_core/source/anuga_parallel/parallel_operator_factory.py

@@ -39 +39 @@
                    line,
                    Q,
+                   default = None,
                    description = None,
                    label = None,
@@ -52 +53 @@
                                                               line,
                                                               Q,
+                                                              default = default,
                                                               description = description,
                                                               label = label,
@@ -81 +83 @@
                                        line,
                                        Q,
+                                       default = default,
                                        description = description,
                                        label = label,

trunk/anuga_core/source/anuga_parallel/test_parallel_frac_op.py

@@ -50 +50 @@
 
 length = 40.
-width = 15.
-
-dx = dy = 0.5          # Resolution: Length of subdivisions on both axes
+width = 16.
+
+dx = dy = 2           # Resolution: Length of subdivisions on both axes
 
 #----------------------------------------------------------------------
@@ -222 +222 @@
     ##-----------------------------------------------------------------------
 
-    for t in domain.evolve(yieldstep = 2.0, finaltime = 2.0):
+    for t in domain.evolve(yieldstep = 2.0, finaltime = 20.0):
         if myid == 0 and verbose:
             domain.write_time()