Changeset 1824

Timestamp:

Sep 13, 2005, 10:52:08 AM (19 years ago)

Author:

ole

Message:

Rewrote boundary_stats

File:

• inundation/pyvolution/domain.py (modified) (2 diffs)

inundation/pyvolution/domain.py

@@ -336 +336 @@
                     self.number_of_first_order_steps)
 
-    def boundary_stats(self, quantities = None, tag = None):
-        """Output statistics about boundary forcing
-
-
-        """
-
+    def boundary_stats(self, quantities = None, tags = None):
+        """Output statistics about boundary forcing at each timestep
+
+        Example
+        Tag 'wall':
+            stage in [2, 5.5]
+            xmomentum in []
+            ymomentum in []
+        Tag 'ocean'
+
+        quantities and tags can be either None, a string or a list of strings
+
+        If quantitites are specified only report on those. Otherwise take all conserved quantities.
+        If tags are specified only report on those, otherwise take all tags.
+
+        #FIXME: Should return text string
+        """
+
+        #Input checks
+        import types
+        
         if quantities is None:
             quantities = self.conserved_quantities
-
+        elif type(quantities) == types.StringType:
+            quantities = [quantities] #Turn it into a list
+
+        msg = 'Keyword argument quantities must be either None, '
+        msg += 'string or list. I got %s' %str(quantitites)   
+        assert type(quantities) == types.ListType, msg
+            
+
+        if tag is None:
+            tags = self.get_boundary_tags()
+        elif type(tags) == types.StringType:
+            tags = [tags] #Turn it into a list
+
+        msg = 'Keyword argument tags must be either None, '
+        msg += 'string or list. I got %s' %str(quantitites)   
+        assert type(tags) == types.ListType, msg            
+
+
+        #Output stats    
 
         print 'Boundary values at time %.4f:' %self.time
-        for name in quantities:
-            q = self.quantities[name]
-
-            if tag is None:
-                #Take entire boundary
-                print '    Quantity %s: min = %12.8f, max = %12.8f'\
-                      %(name, min(q.boundary_values), max(q.boundary_values))
-            else:
-                #Take only boundary associated with tag
+
+        for tag in tags:
+            print '    Tag: %s' %tag
+
+            for name in quantities:
+                q = self.quantities[name]
+
+                #Find range of boundary values for tag and q 
                 maxval = minval = None
                 for i, ((vol_id, edge_id), B) in enumerate(self.boundary_objects):
@@ -364 +396 @@
 
                 if minval is None or maxval is None:
-                    print 'Sorry no information about tag %s' %tag
+                    print 'Sorry no information about tag %s and quantity %s' %(tag, name)
                 else:
-                    print '    Quantity %s, tag %s: min = %12.8f, max = %12.8f'\
-                          %(name, tag, minval, maxval)
+                    print '        %s\t in [%12.8f, %12.8f]'\
+                          %(name, minval, maxval)
+
+
+            
+        
+        #for name in quantities:
+        #    q = self.quantities[name]
+        #
+        #    if tag is None:
+        #        #Take entire boundary
+        #        print '    Quantity %s: min = %12.8f, max = %12.8f'\
+        #              %(name, min(q.boundary_values), max(q.boundary_values))
+        #    else:
+        #        #Take only boundary associated with tag
+        #        maxval = minval = None
+        #        for i, ((vol_id, edge_id), B) in enumerate(self.boundary_objects):
+        #            if self.boundary[(vol_id, edge_id)] == tag:
+        #                v = q.boundary_values[i]
+        #                if minval is None or v < minval: minval = v
+        #                if maxval is None or v > maxval: maxval = v
+        # 
+        #        if minval is None or maxval is None:
+        #            print 'Sorry no information about tag %s' %tag
+        #        else:
+        #            print '    Quantity %s, tag %s: min = %12.8f, max = %12.8f'\
+        #                  %(name, tag, minval, maxval)