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

Timestamp:

Oct 10, 2006, 4:11:39 PM (17 years ago)

Author:

ole

Message:

Small fix ensuring that mesh file is always stored irrespective of caching.

File:

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

anuga_core/source/anuga/pmesh/mesh_interface.py

@@ -72 +72 @@
     
     kwargs = {'maximum_triangle_area': maximum_triangle_area,
-              'filename': filename,
               'interior_regions': interior_regions,
               'interior_holes': interior_holes,
@@ -93 +92 @@
 
 
-        res = cache(_create_mesh_from_regions,
-                    args, kwargs,
-                    verbose=verbose,
-                    compression=False)
-    else:
-        res = apply(_create_mesh_from_regions,
-                    args, kwargs)
-
-    return res
-
+        m = cache(_create_mesh_from_regions,
+                  args, kwargs,
+                  verbose=verbose,
+                  compression=False)
+    else:
+        m = apply(_create_mesh_from_regions,
+                  args, kwargs)
+
+
+    # Decide whether to store this mesh or return it    
+    if filename is None:
+        return m
+    else:
+        if verbose: print 'Generating mesh to file "%s"' %filename
+        m.generate_mesh(minimum_triangle_angle=minimum_triangle_angle,
+                        verbose=verbose)
+        m.export_mesh_file(filename)
+        
 
 
@@ -108 +115 @@
                               boundary_tags,
                               maximum_triangle_area=None,
-                              filename=None,
                               interior_regions=None,
                               interior_holes=None,
@@ -228 +234 @@
     
             
-   # Do interior holes
+    # Do interior holes
     if interior_holes is not None:    
         for polygon, res in interior_holes:
@@ -235 +241 @@
        
             
-
-    if filename is None:
-        return m
-    else:
-        if verbose: print 'Generating mesh to file "%s"' %filename
-        m.generate_mesh(minimum_triangle_angle=minimum_triangle_angle,
-                             verbose=verbose)
-        m.export_mesh_file(filename)
-
+    return m        
+