diff --git a/NAMESPACE b/NAMESPACE index a3ad75ff6f708fdbf186ab589ce3c267cb576c46..d1f23a14c11d21f38b22794b4fca3d3e7ae57002 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -14,6 +14,7 @@ export(SelectorChecker) export(Sort) export(Start) export(Step) +export(chunk) export(indices) export(values) import(abind) diff --git a/R/ByChunks.R b/R/ByChunks.R index 5f0bba5783974ee912825b25c2449e26893d5f72..1aa2ac507506d721eb5628e6bf206b7d16c6f4e1 100644 --- a/R/ByChunks.R +++ b/R/ByChunks.R @@ -691,7 +691,7 @@ ByChunks <- function(step_fun, cube_headers, ..., chunks = 'auto', split_dims_to_alter <- which(names(split_dims[[k]]) %in% names_dims_to_alter) chunks_split_dims[split_dims_to_alter] <- unlist(chunks[names(split_dims[[k]])[split_dims_to_alter]]) chunks_indices_split_dims[split_dims_to_alter] <- chunk_indices[names(split_dims[[k]])[split_dims_to_alter]] - start_call[[names(split_dims)[k]]] <- .chunk(chunks_indices_split_dims, chunks_split_dims, + start_call[[names(split_dims)[k]]] <- chunk(chunks_indices_split_dims, chunks_split_dims, eval(start_call[[names(split_dims)[k]]])) dims_to_alter_to_remove <- which(names_dims_to_alter %in% names(split_dims[[k]])) if (length(dims_to_alter_to_remove) > 0) { @@ -704,7 +704,7 @@ ByChunks <- function(step_fun, cube_headers, ..., chunks = 'auto', if (length(dims_to_alter) > 0) { for (call_dim in names(attr(start_call, 'Dimensions'))[dims_to_alter]) { - start_call[[call_dim]] <- .chunk(chunk_indices[call_dim], chunks[[call_dim]], + start_call[[call_dim]] <- chunk(chunk_indices[call_dim], chunks[[call_dim]], eval(start_call[[call_dim]])) } } diff --git a/R/Utils.R b/R/Utils.R index a4255c1790057b2328dba51c076842064514883c..7a42afdb673c43d4043b562060e9280b56f94175 100644 --- a/R/Utils.R +++ b/R/Utils.R @@ -1,6 +1,7 @@ #'@import abind #'@importFrom ClimProjDiags Subset -.chunk <- function(chunk, n_chunks, selectors) { +#'@export +chunk <- function(chunk, n_chunks, selectors) { if (any(chunk > n_chunks)) { stop("Requested chunk index out of bounds.") } diff --git a/inst/chunking/load_process_save_chunk.R b/inst/chunking/load_process_save_chunk.R index c50c79bede193acf76da7343619b9383ac25a6ab..82d452cdf691f76a45a4124223f9a76d1b4593ab 100644 --- a/inst/chunking/load_process_save_chunk.R +++ b/inst/chunking/load_process_save_chunk.R @@ -52,7 +52,7 @@ for (input in 1:length(data)) { split_dims_to_alter <- which(names(split_dims[[k]]) %in% names_dims_to_alter) chunks_split_dims[split_dims_to_alter] <- unlist(chunks[names(split_dims[[k]])[split_dims_to_alter]]) chunks_indices_split_dims[split_dims_to_alter] <- chunk_indices[names(split_dims[[k]])[split_dims_to_alter]] - start_call[[names(split_dims)[k]]] <- .chunk(chunks_indices_split_dims, chunks_split_dims, + start_call[[names(split_dims)[k]]] <- startR::chunk(chunks_indices_split_dims, chunks_split_dims, eval(start_call[[names(split_dims)[k]]])) dims_to_alter_to_remove <- which(names_dims_to_alter %in% names(split_dims[[k]])) if (length(dims_to_alter_to_remove) > 0) { @@ -63,7 +63,7 @@ for (input in 1:length(data)) { } if (length(dims_to_alter) > 0) { for (call_dim in names_dims_to_alter) { - start_call[[call_dim]] <- .chunk(chunk_indices[call_dim], chunks[[call_dim]], + start_call[[call_dim]] <- startR::chunk(chunk_indices[call_dim], chunks[[call_dim]], eval(start_call[[call_dim]])) } }