浏览代码

r.watershed: skip NULL cells for streams

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@56579 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 12 年之前
父节点
当前提交
0a349b9be8
共有 2 个文件被更改,包括 2 次插入0 次删除
  1. 1 0
      raster/r.watershed/ram/do_cum.c
  2. 1 0
      raster/r.watershed/seg/do_cum.c

+ 1 - 0
raster/r.watershed/ram/do_cum.c

@@ -522,6 +522,7 @@ int do_cum_mfd(void)
 			swale_cells++;
 			swale_cells++;
 		    valued = wat[nbr_index];
 		    valued = wat[nbr_index];
 		    ele_nbr = alt[nbr_index];
 		    ele_nbr = alt[nbr_index];
+		    edge = Rast_is_c_null_value(&ele_nbr);
 		    if ((ABS(valued) + 0.5) >= threshold  &&
 		    if ((ABS(valued) + 0.5) >= threshold  &&
 		        ele_nbr > ele)
 		        ele_nbr > ele)
 			stream_cells++;
 			stream_cells++;

+ 1 - 0
raster/r.watershed/seg/do_cum.c

@@ -574,6 +574,7 @@ int do_cum_mfd(void)
 
 
 		    /* check for swale or stream cells */
 		    /* check for swale or stream cells */
 		    is_swale = FLAG_GET(flag_nbr[ct_dir], SWALEFLAG);
 		    is_swale = FLAG_GET(flag_nbr[ct_dir], SWALEFLAG);
+		    edge = FLAG_GET(flag_nbr[ct_dir], NULLFLAG);
 		    if (is_swale)
 		    if (is_swale)
 			swale_cells++;
 			swale_cells++;
 		    if ((ABS(wat_nbr[ct_dir]) + 0.5) >= threshold &&
 		    if ((ABS(wat_nbr[ct_dir]) + 0.5) >= threshold &&