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

Timestamp:

Mar 17, 2009, 4:02:54 PM (15 years ago)

Author:

rwilson

Message:

Revert back to 6481, prior to auto-merge of trunk and numpy branch.

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,
-                 default_boundary=None,
-                 verbose=False):
+    def __init__(self, domain = None, f = None):
         Boundary.__init__(self)
-        self.default_boundary = default_boundary
-        self.default_boundary_invoked = False    # Flag
-        self.domain = domain
-        self.verbose = verbose
 
         try:
@@ -129 +122 @@
     def evaluate(self, vol_id=None, edge_id=None):
         # FIXME (Ole): I think this should be get_time(), see ticket:306
-        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
+        return self.f(self.domain.time)
 
 
@@ -337 +299 @@
                     if self.default_boundary_invoked is False:
                         # Issue warning the first time
-                        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
+                        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)
                    
                         # FIXME (Ole): Replace this crude flag with