fix for interactive mode

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@39723 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster/r.watershed/ram/def_basin.c

@@ -9,10 +9,7 @@ CELL def_basin(int row, int col, CELL basin_num,
 
     for (;;) {
 	bas[SEG_INDEX(bas_seg, row, col)] = basin_num;
-	asp_value = asp[SEG_INDEX(asp_seg, row, col)];
 	FLAG_SET(swale, row, col);
-	if (asp_value < 0)
-	    asp_value = -asp_value;
 	ct = 0;
 	for (r = row - 1, rr = 0; rr < 3; r++, rr++) {
 	    for (c = col - 1, cc = 0; cc < 3; c++, cc++) {
@@ -81,6 +78,10 @@ CELL def_basin(int row, int col, CELL basin_num,
 	}
 	else {			/* sides == 4 */
 
+	    asp_value = asp[SEG_INDEX(asp_seg, row, col)];
+	    if (asp_value < 0)
+		asp_value = -asp_value;
+
 	    if (asp_value == 2 || asp_value == 6) {
 		if (new_r[1] != row)
 		    stream_length += window.ns_res;

raster/r.watershed/ram/find_pour.c

@@ -7,6 +7,7 @@ int find_pourpts(void)
     CELL old_elev, basin_num;
 
     basin_num = 0;
+    stream_length = old_elev = 0;
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 1);
 	northing = window.north - (row + .5) * window.ns_res;
@@ -18,17 +19,17 @@ int find_pourpts(void)
 		    easting = window.west + (col + .5) * window.ew_res;
 		    fprintf(fp, "%5d drains into %5d at %3d %3d %.3f %.3f",
 			    (int)basin_num, 0, row, col, easting, northing);
+		    if (col == 0 || col == ncols - 1) {
+			stream_length = .5 * window.ew_res;
+		    }
+		    else if (row == 0 || row == nrows - 1) {
+			stream_length = .5 * window.ns_res;
+		    }
+		    else {
+			stream_length = 0.0;
+		    }
+		    old_elev = alt[SEG_INDEX(alt_seg, row, col)];
 		}
-		if (col == 0 || col == ncols - 1) {
-		    stream_length = .5 * window.ew_res;
-		}
-		else if (row == 0 || row == nrows - 1) {
-		    stream_length = .5 * window.ns_res;
-		}
-		else {
-		    stream_length = 0.0;
-		}
-		old_elev = alt[SEG_INDEX(alt_seg, row, col)];
 		basin_num =
 		    def_basin(row, col, basin_num, stream_length, old_elev);
 	    }

raster/r.watershed/ram/no_stream.c

@@ -19,7 +19,7 @@ int no_stream(int row, int col, CELL basin_num,
 			dvalue = wat[SEG_INDEX(wat_seg, r, c)];
 			if (dvalue < 0)
 			    dvalue = -dvalue;
-			if ((dvalue - max_drain) > 5E-8f) {	/* floating point comparison problem workaround */
+			if (dvalue > max_drain) {
 			    uprow = r;
 			    upcol = c;
 			    max_drain = dvalue;

raster/r.watershed/ram/over_cells.c

@@ -15,25 +15,21 @@ overland_cells(int row, int col, CELL basin_num, CELL haf_num, CELL * hih_ele)
 	    if (r >= 0 && c >= 0 && r < nrows && c < ncols) {
 		value = asp[SEG_INDEX(asp_seg, r, c)];
 		if (value == drain[rr][cc]) {
-		    if (r != row && c != col) {
-			overland_cells(r, c, basin_num, haf_num, &new_ele);
-		    }
-		    else if (r != row) {
-			overland_cells(r, c, basin_num, haf_num, &new_ele);
-		    }
-		    else {
-			overland_cells(r, c, basin_num, haf_num, &new_ele);
-		    }
+		    overland_cells(r, c, basin_num, haf_num, &new_ele);
 		}
 	    }
 	}
     }
-    if (new_max_ele == BIGNEG) {
-	*hih_ele = alt[SEG_INDEX(alt_seg, row, col)];
-    }
-    else {
-	*hih_ele = new_max_ele;
+    /*
+    if (arm_flag) {
+	if (new_max_ele == BIGNEG) {
+	    *hih_ele = alt[SEG_INDEX(alt_seg, row, col)];
+	}
+	else {
+	    *hih_ele = new_max_ele;
+	}
     }
+    */
 
     return 0;
 }

raster/r.watershed/ram/split_str.c

@@ -10,6 +10,8 @@ split_stream(int row, int col, int new_r[], int new_c[], int ct,
     SHORT thisdir, leftflag, riteflag;
     int r, c, rr, cc;
 
+    new_elev = 0;
+
     for (ctr = 1; ctr <= ct; ctr++)
 	splitdir[ctr] = drain[row - new_r[ctr] + 1][col - new_c[ctr] + 1];
     updir = splitdir[1];
@@ -57,16 +59,17 @@ split_stream(int row, int col, int new_r[], int new_c[], int ct,
 	haf[SEG_INDEX(haf_seg, row, col)] = basin_num;
     }
     old_basin = basin_num;
-    new_elev = alt[SEG_INDEX(alt_seg, row, col)];
-    if ((slope = (new_elev - old_elev) / stream_length) < MIN_SLOPE)
-	slope = MIN_SLOPE;
-    if (arm_flag)
+    if (arm_flag) {
+	new_elev = alt[SEG_INDEX(alt_seg, row, col)];
+	if ((slope = (new_elev - old_elev) / stream_length) < MIN_SLOPE)
+	    slope = MIN_SLOPE;
 	fprintf(fp, " %f %f\n", slope, stream_length);
+    }
     for (r = 1; r <= ct; r++) {
 	basin_num += 2;
-	easting = window.west + (new_c[r] + .5) * window.ew_res;
-	northing = window.north - (new_r[r] + .5) * window.ns_res;
 	if (arm_flag) {
+	    easting = window.west + (new_c[r] + .5) * window.ew_res;
+	    northing = window.north - (new_r[r] + .5) * window.ns_res;
 	    fprintf(fp, "%5d drains into %5d at %3d %3d %.3f %.3f",
 		    (int)basin_num, old_basin, new_r[r], new_c[r], easting,
 		    northing);