From 518592cbcfcbbc60f23096a1946f1e7107c7878b Mon Sep 17 00:00:00 2001 From: Anna Petrasova Date: Tue, 14 Feb 2023 12:58:03 -0500 Subject: [PATCH 1/2] r.patch: disable parallelization when MASK is active --- raster/r.patch/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/raster/r.patch/main.c b/raster/r.patch/main.c index 4744538eac3..3779f836bec 100644 --- a/raster/r.patch/main.c +++ b/raster/r.patch/main.c @@ -113,6 +113,10 @@ int main(int argc, char *argv[]) "threads setting.")); nprocs = 1; #endif + if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) { + G_warning(_("Parallel processing disabled due to active MASK.")); + nprocs = 1; + } use_zero = (zeroflag->answer); no_support = (nosupportflag->answer); From 4acec22336d90cae3d955424e141e1e81810ee0d Mon Sep 17 00:00:00 2001 From: Anna Petrasova Date: Tue, 14 Feb 2023 14:01:38 -0500 Subject: [PATCH 2/2] fix formatting --- raster/r.patch/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/raster/r.patch/main.c b/raster/r.patch/main.c index 3779f836bec..4237172ddb3 100644 --- a/raster/r.patch/main.c +++ b/raster/r.patch/main.c @@ -113,10 +113,10 @@ int main(int argc, char *argv[]) "threads setting.")); nprocs = 1; #endif - if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) { - G_warning(_("Parallel processing disabled due to active MASK.")); - nprocs = 1; - } + if (nprocs > 1 && G_find_raster("MASK", G_mapset()) != NULL) { + G_warning(_("Parallel processing disabled due to active MASK.")); + nprocs = 1; + } use_zero = (zeroflag->answer); no_support = (nosupportflag->answer);