Skip to content

Commit e6312f6

Browse files
authored
Merge pull request #9 from brownag/v031
rgeomorphon v0.3.1
2 parents fa991ec + 75bce0d commit e6312f6

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: rgeomorphon
22
Type: Package
33
Title: A Lightweight Implementation of the Geomorphon Algorithm
4-
Version: 0.3.0
4+
Version: 0.3.1
55
Authors@R: person(given = "Andrew", family = "Brown", role = c("aut", "cre"), email = "brown.andrewg@gmail.com", comment = c(ORCID="0000-0002-4565-533X"))
66
Maintainer: Andrew Brown <brown.andrewg@gmail.com>
77
Description: A lightweight implementation of the geomorphon terrain
@@ -23,7 +23,7 @@ Enhances:
2323
parallel
2424
Encoding: UTF-8
2525
Language: en-US
26-
RoxygenNote: 7.3.2
26+
RoxygenNote: 7.3.3
2727
Roxygen: list(markdown = TRUE)
2828
URL: https://github.com/brownag/rgeomorphon/, https://humus.rocks/rgeomorphon/
2929
BugReports: https://github.com/brownag/rgeomorphon/issues

R/geomorphon.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -837,10 +837,10 @@ geomorphon_theme <- function(x, forms = "forms10") {
837837
#' output tile, ensuring seamless results when the tiles are later merged.
838838
#'
839839
#' @param x A `SpatRasterCollection` containing the buffered input tiles,
840-
#' typically from `geomorphons_create_tiles()`.
840+
#' typically from `.geomorphons_create_tiles()`.
841841
#' @param y A `SpatVector` of polygons defining the original, unbuffered extents
842842
#' of each tile. This is used for cropping the results. This is typically the
843-
#' output from `geomorphons_tile_extents()`.
843+
#' output from `.geomorphons_tile_extents()`.
844844
#' @param FUN The geomorphon function to apply to each tile (e.g.,
845845
#' [geomorphons()]).
846846
#' @param cell_buffer Integer. The number of cells to add as a buffer around
@@ -929,7 +929,7 @@ geomorphon_theme <- function(x, forms = "forms10") {
929929
#' source DEM to ensure a perfect match.
930930
#'
931931
#' @param x `SpatRasterCollection` of the final result tiles, typically from
932-
#' [geomorphons_process_tiles()].
932+
#' `.geomorphons_process_tiles()`.
933933
#' @param y `SpatExtent` object from the original, full DEM. Used to ensure
934934
#' the final output has the exact same extent. Default `NULL` uses full extent
935935
#' of `x`.

man/forms_matrix.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/forms_matrix_apply.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/geomorphon_chunks_needed.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/geomorphons.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/salton.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vignettes/geomorphons-tiled.Rmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ We can also pass the `nchunk` argument directly to `geomorphons()` to bypass the
147147
Now that `geomorphons()` will use a tiled approach, we can set up our parallel plan and execute the calculation.
148148

149149
```{r}
150-
# Set up a multisession future plan with 4 workers
151-
# This creates 4 background R sessions to do the work
152-
future::plan(multisession, workers = 4)
150+
# Set up a multisession future plan with 2 workers
151+
# This creates 2 background R sessions to do the work
152+
future::plan(multisession, workers = 2)
153153
```
154154

155155
Use the LAPPLY.FUN argument to pass `future.apply::future_lapply`. This tells `geomorphons()` to use the future backend for processing tiles
@@ -195,7 +195,7 @@ For example:
195195
```{r}
196196
# Example using the base R parallel package
197197
library(parallel)
198-
cl <- makeCluster(4)
198+
cl <- makeCluster(2)
199199
200200
g_forms_par <- geomorphons(
201201
dem,

0 commit comments

Comments
 (0)