Changeset 3715 for anuga_core/source/anuga/pmesh/mesh_interface.py

Timestamp:

Oct 9, 2006, 4:46:39 PM (18 years ago)

Author:

ole

Message:

Enabled caching in create_mesh_from_regions as requested in ticket:80 and
added a unittest for it.

File:

• anuga_core/source/anuga/pmesh/mesh_interface.py (modified) (2 diffs)

anuga_core/source/anuga/pmesh/mesh_interface.py

@@ -62 +62 @@
     unintended resolutions.
     
+    """
+
+    # Build arguments and keyword arguments for use with caching or apply.
+    args = (bounding_polygon,
+            boundary_tags)
+    
+    kwargs = {'maximum_triangle_area': maximum_triangle_area,
+              'filename': filename,
+              'interior_regions': interior_regions,
+              'poly_geo_reference': poly_geo_reference,
+              'mesh_geo_reference': mesh_geo_reference,
+              'minimum_triangle_angle': minimum_triangle_angle,
+              'verbose': verbose}   # FIXME (Ole): Should be bypassed one day
+
+
+    #print 'kwargs', kwargs
+
+    # Call underlying engine with or without caching
+    if use_cache is True:
+        try:
+            from caching import cache
+        except:
+            msg = 'Caching was requested, but caching module'+\
+                  'could not be imported'
+            raise msg
+
+
+        res = cache(_create_mesh_from_regions,
+                    args, kwargs,
+                    verbose=verbose,
+                    compression=False)
+    else:
+        res = apply(_create_mesh_from_regions,
+                    args, kwargs)
+
+    return res
+
+
+
+def _create_mesh_from_regions(bounding_polygon,
+                              boundary_tags,
+                              maximum_triangle_area=None,
+                              filename=None,
+                              interior_regions=None,
+                              poly_geo_reference=None,
+                              mesh_geo_reference=None,
+                              minimum_triangle_angle=28.0,
+                              verbose=True):
+    """_create_mesh_from_regions - internal function.
+
+    See create_mesh_from_regions for documentation.
     """
     #FIXME (OLE-DSG)
@@ -164 +215 @@
         m.export_mesh_file(filename)
 
-