[GRASS-SVN] r34619 - in grass/branches/develbranch_6/raster/r.watershed2: front ram

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-11-28 23:45:32 -0500 (Fri, 28 Nov 2008)
New Revision: 34619

Modified:
   grass/branches/develbranch_6/raster/r.watershed2/front/main.c
   grass/branches/develbranch_6/raster/r.watershed2/ram/do_astar.c
Log:
more sync with devbr6 r.w1

Modified: grass/branches/develbranch_6/raster/r.watershed2/front/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.watershed2/front/main.c	2008-11-29 03:21:22 UTC (rev 34618)
+++ grass/branches/develbranch_6/raster/r.watershed2/front/main.c	2008-11-29 04:45:32 UTC (rev 34619)
@@ -236,9 +236,9 @@
     sprintf(command, "%s/etc/", G_gisbase());
 
     if (flag_seg->answer)
-	strcat(command, "r.watershed2.seg");
+	strcat(command, "r.watershed.seg");
     else
-	strcat(command, "r.watershed2.ram");
+	strcat(command, "r.watershed.ram");
 
     if (flag_flow->answer)
 	strcat(command, " -4");

Modified: grass/branches/develbranch_6/raster/r.watershed2/ram/do_astar.c
===================================================================
--- grass/branches/develbranch_6/raster/r.watershed2/ram/do_astar.c	2008-11-29 03:21:22 UTC (rev 34618)
+++ grass/branches/develbranch_6/raster/r.watershed2/ram/do_astar.c	2008-11-29 04:45:32 UTC (rev 34619)
@@ -95,7 +95,7 @@
 	    }
 	}
     }
-    G_percent(count, do_points, 1);	/* finish it */
+    G_percent(count, do_points, 3);	/* finish it */
     flag_destroy(worked);
     flag_destroy(in_list);
     G_free(heap_index);