Changeset 5855 for anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

Timestamp:

Oct 22, 2008, 3:07:29 PM (15 years ago)

Author:

ole

Message:

Much more work on caching and fitting.
Caching of set_quantity as per Okushiri example now works again.

Moreover, caching can now handle instances and ever circular references.

This should address ticket:244 and ticket:302

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py (modified) (2 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/quantity.py

@@ -856 +856 @@
             raise msg
 
-        if True:  
+        if False:  
+            # FIXME (Ole)
+            # Use mesh as defined by domain
+            # This causes problems for caching 
+            # due to quantities changing, but
+            # it would work if we only passed in
+            # the appropriate Mesh object.
             vertex_attributes = fit_to_mesh(filename,
                                             mesh=self.domain,  
@@ -865 +871 @@
                                             max_read_lines=max_read_lines)
         else:
-        
+            # This variant will cause Mesh object to be recreated
+            # in fit_to_mesh thus doubling up on the neighbour structure 
             coordinates = self.domain.get_nodes(absolute=True)
             triangles = self.domain.triangles      #FIXME 
             vertex_attributes = fit_to_mesh(filename,
                                             coordinates, triangles, 
+                                            mesh=None,                                           
                                             alpha=alpha,
                                             attribute_name=attribute_name,