Changeset 8562 for trunk/anuga_core/source/anuga/file_conversion/sww2dem.py

Timestamp:

Sep 7, 2012, 3:27:55 PM (13 years ago)

Author:

steve

Message:

Setting up sww2dem for Yuyang to change to faster code.

File:

• trunk/anuga_core/source/anuga/file_conversion/sww2dem.py (modified) (2 diffs)

trunk/anuga_core/source/anuga/file_conversion/sww2dem.py

@@ -302 +302 @@
     assert len(vertex_points.shape) == 2
 
-    grid_points = num.zeros ((ncols*nrows, 2), num.float)
-
-    for i in xrange(nrows):
-        if out_ext == '.asc':
-            yg = i * cellsize
-        else:
-            # this will flip the order of the y values for ers
-            yg = (nrows-i) * cellsize
-
-        for j in xrange(ncols):
-            xg = j * cellsize
-            k = i*ncols + j
-
-            grid_points[k, 0] = xg
-            grid_points[k, 1] = yg
-
-    # Interpolate
-    from anuga.fit_interpolate.interpolate import Interpolate
-
-    # Remove loners from vertex_points, volumes here
-    vertex_points, volumes = remove_lone_verts(vertex_points, volumes)
-    # export_mesh_file('monkey.tsh',{'vertices':vertex_points, 'triangles':volumes})
-
-    interp = Interpolate(vertex_points, volumes, verbose = verbose)
-
-    # Interpolate using quantity values
-    if verbose: log.critical('Interpolating')
-    grid_values = interp.interpolate(result, grid_points).flatten()
-    outside_indices = interp.get_outside_poly_indices()
+
+    def calc_grid_values(vertex_points, volumes, result):
+
+        grid_points = num.zeros ((ncols*nrows, 2), num.float)
+
+        for i in xrange(nrows):
+            if out_ext == '.asc':
+                yg = i * cellsize
+            else:
+                # this will flip the order of the y values for ers
+                yg = (nrows-i) * cellsize
+
+            for j in xrange(ncols):
+                xg = j * cellsize
+                k = i*ncols + j
+
+                grid_points[k, 0] = xg
+                grid_points[k, 1] = yg
+
+        # Interpolate
+        from anuga.fit_interpolate.interpolate import Interpolate
+
+        # Remove loners from vertex_points, volumes here
+        vertex_points, volumes = remove_lone_verts(vertex_points, volumes)
+        # export_mesh_file('monkey.tsh',{'vertices':vertex_points, 'triangles':volumes})
+
+
+
+        #
+
+        interp = Interpolate(vertex_points, volumes, verbose = verbose)
+
+        # Interpolate using quantity values
+        if verbose: log.critical('Interpolating')
+        grid_values = interp.interpolate(result, grid_points).flatten()
+        outside_indices = interp.get_outside_poly_indices()
+
+        for i in outside_indices:
+            #print 'change grid_value',NODATA_value
+            grid_values[i] = NODATA_value
+
+        return grid_values
+
+
+
+    grid_values = calc_grid_values(vertex_points, volumes, result)
+
+
 
     #print outside_indices
@@ -343 +362 @@
 #    outside_indices = outside_polygon(grid_points, P, closed=True)
 
-    for i in outside_indices:
-        #print 'change grid_value',NODATA_value
-        grid_values[i] = NODATA_value
+
 
     if out_ext == '.ers':