Changeset 5221

Timestamp:

Apr 21, 2008, 5:11:58 PM (17 years ago)

Author:

ole

Message:

Work done during Water Down Under 2008.
Hardwired the three conserved quantities from sww into file_function as it was getting messy trying to exclude irrelevant quantities. Also did some formatting and commenting.

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• general_mesh.py (modified) (1 diff)
• generic_boundary_conditions.py (modified) (1 diff)
• test_generic_boundary_conditions.py (modified) (1 diff)
• test_util.py (modified) (1 diff)
• util.py (modified) (4 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/general_mesh.py

@@ -88 +88 @@
         """
 
-        if verbose: print 'General_mesh: Building basic mesh structure' 
+        if verbose: print 'General_mesh: Building basic mesh structure in ANUGA domain' 
 
         self.triangles = array(triangles, Int)

anuga_core/source/anuga/abstract_2d_finite_volumes/generic_boundary_conditions.py

@@ -245 +245 @@
 
         if verbose: print 'Initialise file_function'
-        self.F = file_function(filename, domain,
+        self.F = file_function(filename,
+                               domain,
+                               quantities=domain.conserved_quantities,
                                interpolation_points=self.midpoint_coordinates,
                                time_thinning=time_thinning,

anuga_core/source/anuga/abstract_2d_finite_volumes/test_generic_boundary_conditions.py

@@ -253 +253 @@
         
         try:
-            F = File_boundary(filename + '.tms', domain)            
+            F = File_boundary(filename + '.tms',
+                              domain)
         except:
             pass

anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -951 +951 @@
         domain = Domain(points, vertices)
 
-        #Check that domain.starttime is updated if non-existing
-        F = file_function(filename + '.tms', domain)
-        
+        # Check that domain.starttime is updated if non-existing
+        F = file_function(filename + '.tms',
+                          domain,
+                          quantities = ['Attribute0', 'Attribute1', 'Attribute2'])  
         assert allclose(domain.starttime, start)
 
-        #Check that domain.starttime is updated if too early
+        # Check that domain.starttime is updated if too early
         domain.starttime = start - 1
-        F = file_function(filename + '.tms', domain)
+        F = file_function(filename + '.tms',
+                          domain,
+                          quantities = ['Attribute0', 'Attribute1', 'Attribute2'])
         assert allclose(domain.starttime, start)
 
-        #Check that domain.starttime isn't updated if later
+        # Check that domain.starttime isn't updated if later
         domain.starttime = start + 1
-        F = file_function(filename + '.tms', domain)        
+        F = file_function(filename + '.tms',
+                          domain,
+                          quantities = ['Attribute0', 'Attribute1', 'Attribute2'])
         assert allclose(domain.starttime, start+1)
 
         domain.starttime = start
-        F = file_function(filename + '.tms', domain,
+        F = file_function(filename + '.tms',
+                          domain,
                           quantities = ['Attribute0', 'Attribute1', 'Attribute2'],
                           use_cache=True)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -62 +62 @@
                  list of quantity names. The resulting function will return
                  a tuple of values - one for each quantity
-                 If quantities are None, domain's conserved quantities
-                 are used.
+                 If quantities are None, the default quantities are
+                 ['stage', 'xmomentum', 'ymomentum']
+                 
 
     interpolation_points - list of absolute UTM coordinates for points (N x 2)
@@ -72 +73 @@
 
     
-    See Interpolation function for further documentation
+    See Interpolation function in anuga.fit_interpolate.interpolation for further documentation
     """
 
@@ -85 +86 @@
     # - interpolation points as absolute UTM coordinates
 
-
-
-
-    # Use domain's conserved_quantity names as defaults
+    if quantities is None:
+        if verbose:
+            msg = 'Quantities specified in file_function are None,'
+            msg += ' so I will use stage, xmomentum, and ymomentum in that order.'
+            print msg
+
+        quantities = ['stage', 'xmomentum', 'ymomentum']
+            
+
+    # Use domain's startime if available
     if domain is not None:    
-        if quantities is None: 
-            quantities = domain.conserved_quantities
-            
         domain_starttime = domain.get_starttime()
     else:
@@ -234 +238 @@
     if type(quantity_names) == types.StringType:
         quantity_names = [quantity_names]        
-    
+
     if quantity_names is None or len(quantity_names) < 1:
-        # If no quantities are specified get quantities from file
-        # x, y, time are assumed as the independent variables so
-        # they are excluded as potentiol quantities
-        quantity_names = []
-        for name in fid.variables.keys():
-            if name not in ['x', 'y', 'time']:
-                quantity_names.append(name)
-
-    if len(quantity_names) < 1:                
-        msg = 'ERROR: At least one independent value must be specified'
-        raise msg
+        msg = 'No quantities are specified in file_function'
+        raise Exception, msg