Changeset 9705

Timestamp:

Mar 4, 2015, 10:17:28 AM (10 years ago)

Author:

steve

Message:

Allow inlet_operators to run beyond time defined by file function

Location:

trunk/anuga_core/anuga

Files:

• parallel/parallel_inlet_operator.py (modified) (3 diffs)
• structures/inlet_operator.py (modified) (3 diffs)

trunk/anuga_core/anuga/parallel/parallel_inlet_operator.py

@@ -36 +36 @@
                  Q = 0.0,
                  velocity = None,
-                 default = None,
+                 default = 0.0,
                  description = None,
                  label = None,
@@ -169 +169 @@
                 Q = self.Q(t)
             except Modeltime_too_early, e:
-                raise Modeltime_too_early(e)
+                Q = self.get_default(t)
             except Modeltime_too_late, e:
                 Q = self.get_default(t)
@@ -238 +238 @@
             #log_to_file(self.log_filename, self.culvert_type)
 
-    def log_timestepping_statistics(self):
-
-        if self.logging and self.myid == self.master_proc:
-            log_to_file(self.log_filename, self.timestepping_statistics())
 
     def timestepping_statistics(self):

trunk/anuga_core/anuga/structures/inlet_operator.py

@@ -21 +21 @@
                  Q = 0.0,
                  velocity = None,
-                 default = None,
+                 default = 0.0,
                  description = None,
                  label = None,
@@ -109 +109 @@
                 Q = self.Q(t)
             except Modeltime_too_early, e:
-                raise Modeltime_too_early(e)
+                Q = self.get_default(t,err_msg=e)
             except Modeltime_too_late, e:
                 Q = self.get_default(t,err_msg=e)
@@ -187 +187 @@
         """
 
-        from anuga.fit_interpolate.interpolate import Modeltime_too_early, Modeltime_too_late
-
-
-        if self.default is None:
-            msg = '%s: ANUGA is trying to run longer than specified data.\n' %str(err_msg)
-            msg += 'You can specify keyword argument default in the '
-            msg += 'operator to tell it what to do in the absence of time data.'
-            raise Modeltime_too_late(msg)
-        else:
-            # Pass control to default rate function
-            value = self.default(t)
-
-            if self.default_invoked is False:
-                # Issue warning the first time
-                msg = ('%s\n'
-                       'Instead I will use the default rate: %s\n'
-                       'Note: Further warnings will be supressed'
-                       % (str(err_msg), str(self.default(t))))
-                
-                warnings.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_invoked = True
+
+        # Pass control to default rate function
+        value = self.default(t)
+
+        if self.default_invoked is False:
+            # Issue warning the first time
+            msg = ('%s\n'
+                   'Instead I will use the default rate: %s\n'
+                   'Note: Further warnings will be suppressed'
+                   % (str(err_msg), str(self.default(t))))
+            
+            warnings.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_invoked = True
 
         return value