Changeset 8506

Timestamp:

Aug 13, 2012, 3:47:51 PM (13 years ago)

Author:

steve

Message:

Adding in default argument

Location:

trunk/anuga_core/source/anuga

Files:

• operators/run_polygon_erosion.py (modified) (1 diff)
• operators/set_stage_operators.py (modified) (1 diff)
• structures/inlet_operator.py (modified) (5 diffs)
• structures/test_inlet_operator.py (modified) (1 diff)

trunk/anuga_core/source/anuga/operators/run_polygon_erosion.py

@@ -149 +149 @@
 
 
+
+
 #-------------------------------------------------------------------------------
 # Evolve system through time

trunk/anuga_core/source/anuga/operators/set_stage_operators.py

@@ -93 +93 @@
                 msg = '%s: ANUGA is trying to run longer than specified data.\n' %str(e)
                 msg += 'You can specify keyword argument default_rate in the '
-                msg += 'rate operator to tell it what to do in the absence of time data.'
+                msg += 'stage function to tell it what to do in the absence of time data.'
                 raise Modeltime_too_late(msg)
         else:

trunk/anuga_core/source/anuga/structures/inlet_operator.py

@@ -3 +3 @@
 import inlet
 
+from warnings import warn
 
 class Inlet_operator(anuga.Operator):
@@ -19 +20 @@
                  line,
                  Q = 0.0,
+                 default = None,
                  description = None,
                  label = None,
@@ -40 +42 @@
         self.applied_Q = 0.0
 
+        self.set_default(default)
+
+
     def __call__(self):
 
@@ -71 +76 @@
         """Allowing local modifications of Q
         """
+        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,err_msg=e)
         else:
             Q = self.Q
@@ -122 +133 @@
 
 
+    def set_default(self, default=None):
+        
+        """ Either leave default as None or change it into a function"""
+
+        if default is not None:
+            # If it is a constant, make it a function
+            if not callable(default):
+                tmp = default
+                default = lambda t: tmp
+
+            # Check that default_rate is a function of one argument
+            try:
+                default(0.0)
+            except:
+                raise Exception(msg)
+
+        self.default = default
+        self.default_invoked = False
+
+
+
+    def get_default(self,t, err_msg=' '):
+        """ Call get_default only if exception
+        Modeltime_too_late(msg) has been raised
+        """
+
+        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))))
+                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
+
+
     def set_Q(self, Q):
 

trunk/anuga_core/source/anuga/structures/test_inlet_operator.py

@@ -183 +183 @@
 
         vol1 = domain.compute_total_volume()
+
+        #print vol1-vol0
         
         assert numpy.allclose(13.5, vol1-vol0, rtol=1.0e-8) 
                 
-
+    def test_inlet_variable_Q_default(self):
+        """test_inlet_Q
+
+        This tests that the inlet operator adds the correct amount of water
+        """
+
+        stage_0 = 11.0
+        stage_1 = 10.0
+        elevation_0 = 10.0
+        elevation_1 = 10.0
+
+        domain_length = 200.0
+        domain_width = 200.0
+
+
+        domain = self._create_domain(d_length=domain_length,
+                                     d_width=domain_width,
+                                     dx = 10.0,
+                                     dy = 10.0,
+                                     elevation_0 = elevation_0,
+                                     elevation_1 = elevation_1,
+                                     stage_0 = stage_0,
+                                     stage_1 = stage_1)
+
+        vol0 = domain.compute_total_volume()
+
+        finaltime = 5.0
+
+        #Make sure we are inthe right directory to find the
+        #time series data for the inlets
+        import os
+        baseDir = os.getcwd()
+
+        try:
+            os.chdir('structures')
+        except:
+            pass
+
+        line1 = [[95.0, 10.0], [105.0, 10.0]]
+        Q1 = file_function(filename='inlet_operator_test1.tms', quantities=['hydrograph'])
+
+        line2 = [[10.0, 90.0], [20.0, 90.0]]
+        Q2 = file_function(filename='inlet_operator_test2.tms', quantities=['hydrograph'])
+
+        os.chdir(baseDir)
+
+        Inlet_operator(domain, line1, Q1, default=6)
+        Inlet_operator(domain, line2, Q2, default=3)
+
+        for t in domain.evolve(yieldstep = 1.0, finaltime = finaltime):
+            #domain.write_time()
+            #print domain.volumetric_balance_statistics()
+            pass
+
+
+        vol1 = domain.compute_total_volume()
+
+        #print vol1-vol0
+
+        assert numpy.allclose(31.5, vol1-vol0, rtol=1.0e-8)
 
 # =========================================================================