Changeset 5874

Timestamp:

Oct 28, 2008, 5:39:20 PM (15 years ago)

Author:

ole

Message:

Added warning in case forcing function uses default_rate.

File:

• anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (5 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -114 +114 @@
 
 from types import IntType, FloatType
+from warnings import warn
 
 
@@ -1796 +1797 @@
 
         self.default_rate = default_rate
+        self.default_rate_invoked = False    # Flag        
         
 
@@ -1807 +1809 @@
         try:
             rate = self.update_rate(t)
-        except (Modeltime_too_late, Modeltime_too_early), e: 
-            if self.default_rate is None: 
+        except Modeltime_too_early, e:
+            raise Modeltime_too_early, e
+        except Modeltime_too_late, e:
+            if self.default_rate is None:
                 raise Exception, e # Reraise exception
             else:
-                # FIXME: Issue a warning first time this happens (See changeset:5657)
+                # Pass control to default rate function
                 rate = self.default_rate(t)
+                
+                if self.default_rate_invoked is False:
+                    # Issue warning the first time
+                    msg = '%s' %str(e)
+                    msg += 'Instead I will use the default rate: %s\n'\
+                        %str(self.default_rate) 
+                    msg += 'Note: Further warnings will be supressed'
+                    warn(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_rate_invoked = True
+                    
+
+            
                 
 
@@ -1944 +1964 @@
                                  center=center, radius=radius,
                                  polygon=polygon,
-                                 default_rate=default_rain,                                 
+                                 default_rate=default_rain,
                                  verbose=verbose)
 
@@ -2007 +2027 @@
                  center=None, radius=None,
                  polygon=None,
-                 default_rate=None,                                                  
+                 default_rate=None,
                  verbose=False):