Changeset 6232 for anuga_validation

Timestamp:

Jan 23, 2009, 2:44:41 AM (16 years ago)

Author:

ole

Message:

Improved test_caching_of_set_quantity - it still needs to be moved to validation suite.

File:

• anuga_validation/okushiri_2005/test_caching_of_set_quantity.py (modified) (2 diffs)

anuga_validation/okushiri_2005/test_caching_of_set_quantity.py

@@ -26 +26 @@
 # Module imports
 from anuga.shallow_water import Domain
+from anuga.caching import cache
+from anuga.fit_interpolate.fit import _fit_to_mesh
 import project
+import Numeric as num
 
+internal_verbose = False # Verbose used in set_quantity and passed into fit_to_mesh
+
+filename=project.bathymetry_filename
+alpha=0.02
+from anuga.config import points_file_block_line_size as max_read_lines
 
 #-------------------------
 # Create Domain from mesh
 #-------------------------
-domain = Domain(project.mesh_filename, use_cache=True, verbose=True)
+domain = cache(Domain, (project.mesh_filename, {'verbose': True}), verbose=False)
+
+# Clear caching of underlying function                                            
+args = (filename, )
+kwargs = {'vertex_coordinates': None,
+          'triangles': None,
+          'mesh': domain.mesh,
+          'point_attributes': None,
+          'alpha': alpha,
+          'verbose': internal_verbose,
+          'acceptable_overshoot': 1.01, # This is the default value in _fit_to_mesh
+          'mesh_origin': None,
+          'data_origin': None,
+          'max_read_lines': max_read_lines,
+          'attribute_name': None 
+          }
+
+
+cache(_fit_to_mesh,
+      args, 
+      kwargs,
+      verbose=False,
+      dependencies=[filename],
+      clear=True)
+
+# Check that cache is empty      
+flag = cache(_fit_to_mesh,
+             args, 
+             kwargs,
+             verbose=False,
+             dependencies=[filename],
+             test=True)
+assert flag is None
+
 
 
@@ -38 +79 @@
 # Initial Conditions
 #-------------------------
-print 'Set elevation and cache'
+#print 'Set elevation and cache'
 domain.set_quantity('elevation',
-                    filename=project.bathymetry_filename,
+                    filename=filename,
                     alpha=0.02,                    
-                    verbose=True,
+                    verbose=internal_verbose,
                     use_cache=True)
+                    
+ref = domain.get_quantity('elevation').get_values()                    
 
-print 'Try to read in via cache'
+# Check that cache is now present (and correct)
+flag = cache(_fit_to_mesh,
+             args, 
+             kwargs,
+             verbose=False,
+             dependencies=[filename],
+             test=True)
+assert flag is not None
+res = domain.get_quantity('elevation').get_values()                                        
+assert num.allclose(res, ref)
+
+# Now check this using the high level call
+#print 'Try to read in via cache'
 domain.set_quantity('elevation',
-                    filename=project.bathymetry_filename,
+                    filename=filename,
                     alpha=0.02,                    
-                    verbose=True,
+                    verbose=internal_verbose,
                     use_cache=True)
+                    
+res = domain.get_quantity('elevation').get_values()                                        
+assert num.allclose(res, ref)