Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r.watershed: Keep 0 accumulation with -a as 0 as opposed to null #2169

Merged
merged 2 commits into from Feb 16, 2022
Merged

r.watershed: Keep 0 accumulation with -a as 0 as opposed to null #2169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aebdc3
r.watershed: Keep 0 accumulation with -a as 0 as opposed to null
HuidaeCho Feb 4, 2022
568fb50
apply the same change to seg
HuidaeCho Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 12 additions & 22 deletions raster/r.watershed/ram/close_maps.c
View file
Open in desktop
Expand Up @@ -34,34 +34,24 @@ int close_maps(void)
G_message("Writing out only positive flow accumulation values.");
G_message
("Cells with a likely underestimate for flow accumulation can no longer be identified.");
for (r = 0; r < nrows; r++) {
Rast_set_d_null_value(dbuf, ncols); /* reset row to all NULL */
for (c = 0; c < ncols; c++) {
dvalue = wat[SEG_INDEX(wat_seg, r, c)];
if (Rast_is_d_null_value(&dvalue) == 0 && dvalue) {
dvalue = ABS(dvalue);
dbuf[c] = dvalue;
sum += dvalue;
sum_sqr += dvalue * dvalue;
}
}
Rast_put_row(fd, dbuf, DCELL_TYPE);
}
}
else {
for (r = 0; r < nrows; r++) {
Rast_set_d_null_value(dbuf, ncols); /* reset row to all NULL */
for (c = 0; c < ncols; c++) {
dvalue = wat[SEG_INDEX(wat_seg, r, c)];
if (!Rast_is_d_null_value(&dvalue)) {
dbuf[c] = dvalue;
for (r = 0; r < nrows; r++) {
Rast_set_d_null_value(dbuf, ncols); /* reset row to all NULL */
for (c = 0; c < ncols; c++) {
dvalue = wat[SEG_INDEX(wat_seg, r, c)];
if (!Rast_is_d_null_value(&dvalue)) {
if (abs_acc) {
dvalue = ABS(dvalue);
sum += dvalue;
sum_sqr += dvalue * dvalue;
}
else
sum += ABS(dvalue);

dbuf[c] = dvalue;
sum_sqr += dvalue * dvalue;
}
Rast_put_row(fd, dbuf, DCELL_TYPE);
}
Rast_put_row(fd, dbuf, DCELL_TYPE);
}
Rast_close(fd);

Expand Down
2 changes: 1 addition & 1 deletion raster/r.watershed/seg/close_maps.c
View file
Open in desktop
Expand Up @@ -40,7 +40,7 @@ int close_maps(void)
for (c = 0; c < ncols; c++) {
/* dseg_get(&wat, &dvalue, r, c); */
dvalue = wabuf[c].wat;
if (Rast_is_d_null_value(&dvalue) == 0 && dvalue) {
if (!Rast_is_d_null_value(&dvalue)) {
if (abs_acc) {
dvalue = fabs(dvalue);
sum += dvalue;
Expand Down