ソースを参照

r.watershed: skip real depressions in basin extension

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@59898 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 11 年 前
コミット
1f366a5613
2 ファイル変更4 行追加0 行削除
  1. 2 0
      raster/r.watershed/ram/no_stream.c
  2. 2 0
      raster/r.watershed/seg/no_stream.c

+ 2 - 0
raster/r.watershed/ram/no_stream.c

@@ -15,6 +15,8 @@ int no_stream(int row, int col, CELL basin_num,
 	for (r = row - 1, rr = 0; r <= row + 1; r++, rr++) {
 	    for (c = col - 1, cc = 0; c <= col + 1; c++, cc++) {
 		if (r >= 0 && c >= 0 && r < nrows && c < ncols) {
+		    if (r == row && c == col)
+			continue;
 		    aspect = asp[SEG_INDEX(asp_seg, r, c)];
 		    if (aspect == drain[rr][cc]) {
 			dvalue = wat[SEG_INDEX(wat_seg, r, c)];

+ 2 - 0
raster/r.watershed/seg/no_stream.c

@@ -19,6 +19,8 @@ no_stream(int row, int col, CELL basin_num, double stream_length,
 	for (r = row - 1, rr = 0; r <= row + 1; r++, rr++) {
 	    for (c = col - 1, cc = 0; c <= col + 1; c++, cc++) {
 		if (r >= 0 && c >= 0 && r < nrows && c < ncols) {
+		    if (r == row && c == col)
+			continue;
 
 		    seg_get(&aspflag, (char *)&af, r, c);
 		    aspect = af.asp;