Browse Source

r.geomorphon: remove multires-specific code (#1570)

The original code does not work: As the original developer explains, there
is no point in fixing it, because the intended use case can be
implemented with scripts around r.geomorphon instead of C code in it.

That said, leave multires.c be, it has been unused for a long time, but
the function in it might belong somewhere else.

This change addresses bug #1355.
Denis Ovsienko 3 years ago
parent
commit
dc409701a9

+ 0 - 28
locale/po/grassmods_ar.po

@@ -62072,23 +62072,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -62157,17 +62140,6 @@ msgid ""
 "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid ""
-"For multiresolution mode step must be greater than or equal to resolution of "
-"one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, fuzzy, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr "اسم ااملف المخرج"
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid ""

+ 0 - 26
locale/po/grassmods_bn.po

@@ -54963,23 +54963,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55040,15 +55023,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_cs.po

@@ -56336,23 +56336,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -56418,15 +56401,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_de.po

@@ -56222,23 +56222,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -56304,15 +56287,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_el.po

@@ -55307,23 +55307,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55386,15 +55369,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_es.po

@@ -56510,23 +56510,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -56592,15 +56575,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_fi.po

@@ -54984,23 +54984,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55061,15 +55044,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_fr.po

@@ -56166,23 +56166,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -56248,15 +56231,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_hu.po

@@ -55092,23 +55092,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55169,15 +55152,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_id_ID.po

@@ -54857,23 +54857,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -54934,15 +54917,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_it.po

@@ -56067,23 +56067,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -56149,15 +56132,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_ja.po

@@ -55918,23 +55918,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -56000,15 +55983,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_ko.po

@@ -55590,23 +55590,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55670,15 +55653,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 28
locale/po/grassmods_lv.po

@@ -58203,23 +58203,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -58287,17 +58270,6 @@ msgid ""
 "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid ""
-"For multiresolution mode step must be greater than or equal to resolution of "
-"one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid ""

+ 0 - 26
locale/po/grassmods_ml.po

@@ -54963,23 +54963,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55040,15 +55023,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_pl.po

@@ -56106,23 +56106,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -56187,15 +56170,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_pt.po

@@ -55648,23 +55648,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55728,15 +55711,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_pt_BR.po

@@ -55845,23 +55845,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55927,15 +55910,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_ro.po

@@ -55729,23 +55729,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55807,15 +55790,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_ru.po

@@ -55504,23 +55504,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55583,15 +55566,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_si.po

@@ -54963,23 +54963,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55040,15 +55023,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 28
locale/po/grassmods_sl.po

@@ -62399,23 +62399,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -62486,17 +62469,6 @@ msgid ""
 "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid ""
-"For multiresolution mode step must be greater than or equal to resolution of "
-"one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, fuzzy, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr "Ime izhodnega rastrskega sloja"
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid ""

+ 0 - 26
locale/po/grassmods_ta.po

@@ -54991,23 +54991,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55068,15 +55051,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_th.po

@@ -55180,23 +55180,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55259,15 +55242,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_tr.po

@@ -55815,23 +55815,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55895,15 +55878,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_uk.po

@@ -55175,23 +55175,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55252,15 +55235,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_vi.po

@@ -55181,23 +55181,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55260,15 +55243,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_zh.po

@@ -55537,23 +55537,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -55617,15 +55600,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 26
locale/po/grassmods_zh_CN.po

@@ -54858,23 +54858,6 @@ msgstr ""
 msgid "Comparison mode for zenith/nadir line-of-sight search"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:221
-msgid "Prefix for maps resulting from multiresolution approach"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:222 ../raster/r.geomorphon/main.c:230
-#: ../raster/r.geomorphon/main.c:238
-msgid "Multires"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:229
-msgid "Distance step for every iteration (zero to omit)"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:237
-msgid "Distance where search will start in multiple mode (zero to omit)"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:243
 msgid "Use meters to define search units (default is cells)"
 msgstr ""
@@ -54935,15 +54918,6 @@ msgstr ""
 msgid "Flatness distance should be between skip and search radius. Otherwise ignored"
 msgstr ""
 
-#: ../raster/r.geomorphon/main.c:399
-msgid "For multiresolution mode step must be greater than or equal to resolution of one cell"
-msgstr ""
-
-#: ../raster/r.geomorphon/main.c:403
-#, c-format
-msgid "<%s> is an incorrect prefix"
-msgstr ""
-
 #: ../raster/r.geomorphon/main.c:431
 #, c-format
 msgid "There may be a notable processing delay because the computational region is %lu times larger than necessary"

+ 0 - 1
raster/r.geomorphon/local_proto.h

@@ -83,7 +83,6 @@ GLOBAL int skip_cells;
 GLOBAL double search_distance, flat_distance;
 GLOBAL double flat_threshold, flat_threshold_height;
 GLOBAL struct Cell_head window;
-GLOBAL int cell_step;
 /* Zenith/nadir comparison modes. */
 GLOBAL enum
 {

+ 6 - 138
raster/r.geomorphon/main.c

@@ -32,13 +32,6 @@ typedef enum
     o_range, o_variance, o_elongation, o_azimuth, o_extend, o_width, o_size
 } outputs;
 
-typedef struct
-{
-    char name[100];
-    int fd;
-    CELL *forms_buffer;
-} MULTI;
-
 int main(int argc, char **argv)
 {
     struct
@@ -91,24 +84,20 @@ int main(int argc, char **argv)
         *par_comparison,
         *par_coords,
         *par_profiledata,
-        *par_profileformat,
-        *par_multi_prefix, *par_multi_step, *par_multi_start;
+        *par_profileformat;
     struct Flag *flag_units, *flag_extended;
 
     struct History history;
 
     int i;
-    int meters = 0, multires = 0, extended = 0; /* flags */
+    int meters = 0, extended = 0; /* flags */
     int oneoff;
     int row, cur_row, col;
     int nrows;
     int pattern_size;
-    int search_cells, step_cells, start_cells;
-    int num_of_steps;
-    double start_distance, step_distance;       /* multiresolution mode */
+    int search_cells;
     double skip_distance;
     double max_resolution;
-    char prefix[20];
     double oneoff_easting, oneoff_northing;
     int oneoff_row, oneoff_col;
     FILE *profile_file;
@@ -172,29 +161,6 @@ int main(int argc, char **argv)
         par_comparison->description =
             _("Comparison mode for zenith/nadir line-of-sight search");
 
-        par_multi_prefix = G_define_option();
-        par_multi_prefix->key = "prefix";
-        par_multi_prefix->type = TYPE_STRING;
-        par_multi_prefix->description =
-            _("Prefix for maps resulting from multiresolution approach");
-        par_multi_prefix->guisection = _("Multires");
-
-        par_multi_step = G_define_option();
-        par_multi_step->key = "step";
-        par_multi_step->type = TYPE_DOUBLE;
-        par_multi_step->answer = "0";
-        par_multi_step->description =
-            _("Distance step for every iteration (zero to omit)");
-        par_multi_step->guisection = _("Multires");
-
-        par_multi_start = G_define_option();
-        par_multi_start->key = "start";
-        par_multi_start->type = TYPE_DOUBLE;
-        par_multi_start->answer = "0";
-        par_multi_start->description =
-            _("Distance where search will start in multiple mode (zero to omit)");
-        par_multi_start->guisection = _("Multires");
-
         flag_units = G_define_flag();
         flag_units->key = 'm';
         flag_units->description =
@@ -207,7 +173,6 @@ int main(int argc, char **argv)
         par_coords = G_define_standard_option(G_OPT_M_COORDS);
         par_coords->description = _("Coordinates to profile");
         par_coords->guisection = _("Profile");
-        G_option_excludes(par_coords, par_multi_prefix, NULL);
         for (i = o_forms; i < o_size; i++)
             G_option_excludes(par_coords, opt_output[i], NULL);
 
@@ -239,7 +204,6 @@ int main(int argc, char **argv)
         double search_radius, skip_radius, start_radius, step_radius;
         double ns_resolution;
 
-        multires = (par_multi_prefix->answer) ? 1 : 0;
         if (!strcmp(par_comparison->answer, "anglev1"))
             compmode = ANGLEV1;
         else if (!strcmp(par_comparison->answer, "anglev2"))
@@ -256,7 +220,7 @@ int main(int argc, char **argv)
                                   opt_output[i]->answer);
                 num_outputs++;
             }
-        if (!num_outputs && !multires && !oneoff)
+        if (!num_outputs && !oneoff)
             G_fatal_error(_("At least one output is required, e.g. %s"),
                           opt_output[o_forms]->key);
 
@@ -339,31 +303,6 @@ int main(int argc, char **argv)
             G_warning(_("Flatness distance should be between skip and search radius. Otherwise ignored"));
             flat_distance = 0;
         }
-        if (multires) {
-            start_radius = atof(par_multi_start->answer);
-            start_cells =
-                meters ? (int)(start_radius / max_resolution) : start_radius;
-            if (start_cells <= skip_cells)
-                start_cells = skip_cells + 1;
-            start_distance =
-                (meters) ? start_radius : ns_resolution * start_cells;
-
-            step_radius = atof(par_multi_step->answer);
-            step_cells =
-                meters ? (int)(step_radius / max_resolution) : step_radius;
-            step_distance =
-                (meters) ? step_radius : ns_resolution * step_cells;
-            if (step_distance < ns_resolution)
-                G_fatal_error(_("For multiresolution mode step must be greater than or equal to resolution of one cell"));
-
-            if (G_legal_filename(par_multi_prefix->answer) < 0 ||
-                strlen(par_multi_prefix->answer) > 19)
-                G_fatal_error(_("<%s> is an incorrect prefix"),
-                              par_multi_prefix->answer);
-            strcpy(prefix, par_multi_prefix->answer);
-            strcat(prefix, "_");
-            num_of_steps = (int)ceil(search_distance / step_distance);
-        }                       /* end multires preparation */
 
         /* print information about distances */
         G_verbose_message("Search distance m: %f, cells: %d", search_distance,
@@ -390,15 +329,6 @@ int main(int argc, char **argv)
                            "computational region is %lu times larger than necessary"),
                           window_square / search_square);
         }
-        if (multires) {
-            G_verbose_message
-                ("Multiresolution mode: search start at: m: %f, cells: %d",
-                 start_distance, start_cells);
-            G_verbose_message
-                ("Multiresolution mode: search step is: m: %f, number of steps %d",
-                 step_distance, num_of_steps);
-            G_verbose_message("Prefix for output: %s", prefix);
-        }
     }
 
     generate_ternary_codes();
@@ -407,7 +337,7 @@ int main(int argc, char **argv)
     strcpy(elevation.elevname, opt_input->answer);
     open_map(&elevation);
 
-    if (!multires) {
+    if (1) {
         PATTERN *pattern;
         PATTERN patterns[4];
         void *pointer_buf;
@@ -418,7 +348,6 @@ int main(int argc, char **argv)
             4 * (search_distance * search_distance) * sin(DEGREE2RAD(45.));
         unsigned char oneoff_done = 0;
 
-        cell_step = 1;
         /* prepare outputs */
         for (i = o_forms; i < o_size; ++i)
             if (opt_output[i]->answer) {
@@ -712,66 +641,5 @@ int main(int argc, char **argv)
         }
 
         exit(EXIT_SUCCESS);
-    }                           /* end of NOT multiresolution */
-
-    if (multires) {
-        PATTERN *multi_patterns;
-        MULTI multiple_output[5];       /* ten form maps + all forms */
-        char *postfixes[] = { "scale_300", "scale_100", "scale_50", "scale_20", "scale_10" };   /* in pixels */
-        num_of_steps = 5;
-        multi_patterns = G_malloc(num_of_steps * sizeof(PATTERN));
-        /* prepare outputs */
-        for (i = 0; i < 5; ++i) {
-            multiple_output[i].forms_buffer = Rast_allocate_buf(CELL_TYPE);
-            strcpy(multiple_output[i].name, prefix);
-            strcat(multiple_output[i].name, postfixes[i]);
-            multiple_output[i].fd =
-                Rast_open_new(multiple_output[i].name, CELL_TYPE);
-        }
-
-        /* main loop */
-        for (row = 0; row < nrows; ++row) {
-            G_percent(row, nrows, 2);
-            cur_row = (row < row_radius_size) ? row :
-                ((row >=
-                  nrows - row_radius_size - 1) ? row_buffer_size - (nrows -
-                                                                    row -
-                                                                    1) :
-                 row_radius_size);
-
-            if (row > (row_radius_size) &&
-                row < nrows - (row_radius_size + 1))
-                shift_buffers(row);
-            for (col = 0; col < ncols; ++col) {
-                if (row < (skip_cells + 1) || row > nrows - (skip_cells + 2)
-                    || col < (skip_cells + 1) ||
-                    col > ncols - (skip_cells + 2) ||
-                    Rast_is_f_null_value(&elevation.elev[cur_row][col])) {
-                    for (i = 0; i < num_of_steps; ++i)
-                        Rast_set_c_null_value(&multiple_output[i].forms_buffer
-                                              [col], 1);
-                    continue;
-                }
-                cell_step = 10;
-                calc_pattern(&multi_patterns[0], row, cur_row, col, 0);
-            }
-
-            for (i = 0; i < num_of_steps; ++i)
-                Rast_put_row(multiple_output[i].fd,
-                             multiple_output[i].forms_buffer, CELL_TYPE);
-
-        }
-        G_percent(row, nrows, 2);       /* end main loop */
-
-        for (i = 0; i < num_of_steps; ++i) {
-            G_free(multiple_output[i].forms_buffer);
-            Rast_close(multiple_output[i].fd);
-            Rast_short_history(multiple_output[i].name, "raster", &history);
-            Rast_command_history(&history);
-            Rast_write_history(multiple_output[i].name, &history);
-        }
-        G_message("Multiresolution Done!");
-        exit(EXIT_SUCCESS);
-    }                           /* end of multiresolution */
-
+    }
 }

+ 2 - 3
raster/r.geomorphon/pattern.c

@@ -160,8 +160,7 @@ int calc_pattern(PATTERN * pattern, int row, int cur_row, int col,
                          (unsigned)j);
                 prof_dbl(step_name, height);
             }
-            j += cell_step;
-            /*             j++; *//* go to next cell */
+            j++; /* go to the next cell */
             target_northing =
                 Rast_row_to_northing(row + j * nextr[i] + 0.5, &window);
             target_easting =
@@ -254,7 +253,7 @@ int calc_pattern(PATTERN * pattern, int row, int cur_row, int col,
                 pattern->distance[i] = search_distance;
                 if (oneoff) {
                     /*
-                     * When cell_step == 1, which is always the case in the
+                     * Because the cell step is always 1, in the
                      * one-off mode, which is the only use case for e[] and
                      * n[], after the while() loop the distance to
                      * (target_easting,target_northing) is cur_distance and