Changeset 6553 for branches/numpy/anuga/abstract_2d_finite_volumes/generic_boundary_conditions.py

Timestamp:

Mar 19, 2009, 1:43:34 PM (16 years ago)

Author:

rwilson

Message:

Merged trunk into numpy, all tests and validations work.

File:

• branches/numpy/anuga/abstract_2d_finite_volumes/generic_boundary_conditions.py (modified) (3 diffs)

branches/numpy/anuga/abstract_2d_finite_volumes/generic_boundary_conditions.py

@@ -88 +88 @@
     # FIXME (Ole): We should rename f to function to be consistent with
     # Transmissive_Momentum_Set_Stage_Boundary (cf posting by rrraman)
-    def __init__(self, domain = None, f = None):
+    def __init__(self, domain=None,
+                 f=None,
+                 default_boundary=None,
+                 verbose=False):
         Boundary.__init__(self)
+        self.default_boundary = default_boundary
+        self.default_boundary_invoked = False    # Flag
+        self.domain = domain
+        self.verbose = verbose
 
         try:
@@ -122 +129 @@
     def evaluate(self, vol_id=None, edge_id=None):
         # FIXME (Ole): I think this should be get_time(), see ticket:306
-        return self.f(self.domain.time)
+        try:
+            res = self.f(self.domain.time)
+        except Modeltime_too_early, e:
+            raise Modeltime_too_early, e
+        except Modeltime_too_late, e:
+            if self.default_boundary is None:
+                raise Exception, e # Reraise exception
+            else:
+                # Pass control to default boundary
+                res = self.default_boundary.evaluate(vol_id, edge_id)
+                
+                # Ensure that result cannot be manipulated
+                # This is a real danger in case the 
+                # default_boundary is a Dirichlet type 
+                # for instance. 
+                res = res.copy() 
+                
+                if self.default_boundary_invoked is False:
+                    if self.verbose:                
+                        # Issue warning the first time
+                        msg = '%s' %str(e)
+                        msg += 'Instead I will use the default boundary: %s\n'\
+                            %str(self.default_boundary) 
+                        msg += 'Note: Further warnings will be supressed'
+                        print msg
+               
+                    # FIXME (Ole): Replace this crude flag with
+                    # Python's ability to print warnings only once.
+                    # See http://docs.python.org/lib/warning-filter.html
+                    self.default_boundary_invoked = True
+
+        return res
 
 
@@ -299 +337 @@
                     if self.default_boundary_invoked is False:
                         # Issue warning the first time
-                        msg = '%s' %str(e)
-                        msg += 'Instead I will use the default boundary: %s\n'\
-                            %str(self.default_boundary) 
-                        msg += 'Note: Further warnings will be supressed'
-                        warn(msg)
+                        if self.verbose:
+                            msg = '%s' %str(e)
+                            msg += 'Instead I will use the default boundary: %s\n'\
+                                %str(self.default_boundary) 
+                            msg += 'Note: Further warnings will be supressed'
+                            print msg
                    
                         # FIXME (Ole): Replace this crude flag with