Skip to content
Snippets Groups Projects
Commit eaf29100 authored by Johannes Boog's avatar Johannes Boog
Browse files

[bugfix] namespace imports]

parent 4568a827
No related branches found
No related tags found
1 merge request!54[bugfix] make all OGS6 benchmarks work.
Package: r2ogs6
Type: Package
Title: An API to the multi-physics simulator OpenGeoSys-v6
Version: 0.2.0
Version: 0.6.41
Authors@R: c(person(given = "Ruben",
family = "Heinrich",
role = c("aut"),
......@@ -33,27 +33,22 @@ Suggests:
devtools,
ggplot2,
BiocManager,
rhdf5
rhdf5,
rmarkdown
Imports:
purrr,
xml2,
tibble,
R6,
stringr,
readr,
assertthat,
crayon,
utils,
rmarkdown,
curl,
dplyr,
rlang,
doParallel,
reticulate,
config,
sticky,
foreach
RoxygenNote: 7.1.2
RoxygenNote: 7.2.1
VignetteBuilder: knitr
Depends:
R (>= 2.10)
......@@ -67,4 +67,11 @@ export(prj_time_stepping)
export(prj_tl_process)
export(prj_vtkdiff)
export(read_in_prj)
importFrom(R6,R6Class)
importFrom(crayon,green)
importFrom(crayon,red)
importFrom(crayon,yellow)
importFrom(doParallel,registerDoParallel)
importFrom(dplyr,bind_cols)
importFrom(dplyr,bind_rows)
importFrom(foreach,"%dopar%")
......@@ -399,7 +399,7 @@ construct_add_call <- function(object, nested_call = FALSE) {
}
#For lists we need to use recursion
if(class(object) == "list"){
if(inherits(object, "list")){
element_strs <- lapply(object, function(x){construct_add_call(x, TRUE)})
......
......@@ -5,6 +5,7 @@
#' OGS6
#' @description Constructor for the \code{OGS6} base class
#' @export
#' @importFrom R6 R6Class
OGS6 <- R6::R6Class("OGS6",
public = list(
......@@ -171,6 +172,9 @@ OGS6 <- R6::R6Class("OGS6",
#' @examples
#' ogs6_obj <- OGS6$new(sim_name = "my_sim", sim_path = "my/path")
#' ogs6_obj$get_status()
#' @importFrom crayon red
#' @importFrom crayon yellow
#' @importFrom crayon green
get_status = function(print_status = TRUE){
assertthat::assert_that(assertthat::is.flag(print_status))
......
......@@ -5,6 +5,7 @@
#'OGS6_Chain
#'@description Constructor for the OGS6_Chain base class
#'@export
#' @importFrom R6 R6Class
OGS6_Chain <- R6::R6Class(
"OGS6_Chain",
......
......@@ -100,6 +100,7 @@ OGS6_Ensemble <- R6::R6Class(
#' This is implementented via the 'parallel' package.
#' @param overwrite flag: Should existing files be overwritten?
#'@param verbose flag
#'@importFrom doParallel registerDoParallel
run_simulation = function(parallel = FALSE,
overwrite = T,
verbose = F){
......@@ -186,6 +187,7 @@ OGS6_Ensemble <- R6::R6Class(
#' Defaults to first timestep.
#'@param end_at_timestep number: Optional: Timestep to end at. Defaults
#' to last timestep.
#'@importFrom dplyr bind_rows
get_point_data = function(pvd_id = 1,
point_ids,
keys,
......
......@@ -24,6 +24,7 @@
#' ))
#' )
#' @export
#' @importFrom R6 R6Class
OGS6_gml <- R6::R6Class(
"OGS6_gml",
public = list(
......
......@@ -3,6 +3,7 @@
#' OGS6_h5
#' @description Small class to wrap \code{h5} data into the \code{r2ogs6} workflow.
#' @export
#' @importFrom R6 R6Class
OGS6_h5 <- R6::R6Class("OGS6_h5",
public = list(
#' @description This function will be called automatically after a
......@@ -78,6 +79,7 @@ OGS6_h5 <- R6::R6Class("OGS6_h5",
#' ogs6_h5 <- OGS6_h5$new(h5_path)
#' df <- ogs6_h5$get_df("/t_0", "pressure")
#' \dontrun{df <- ogs6_obj$h5s[[1]]$get_df("/t_0", "pressure")}
#' @importFrom dplyr bind_cols
get_df = function(group, names = "geometry") {
assertthat::is.string(group)
......
......@@ -3,6 +3,7 @@
#' MSH files are a legacy format from OGS5. It is recommended to switch to VTU
#' files.
#' @export
#' @importFrom R6 R6Class
OGS6_msh <- R6::R6Class("OGS6_msh",
public = list(
#' @description reates new OGS6_vtu object..
......
......@@ -5,6 +5,7 @@
#' OGS6_pvd
#' @description Constructor for the OGS6_pvd base class
#' @export
#' @importFrom R6 R6Class
OGS6_pvd <- R6::R6Class(
"OGS6_pvd",
public = list(
......@@ -260,6 +261,7 @@ OGS6_pvd <- R6::R6Class(
},
# Returns a dataframe with all of the CellData
#' @importFrom dplyr bind_rows
get_data = function(data_type,
ids,
keys,
......
......@@ -5,6 +5,7 @@
#' OGS6_vtu
#' @description Constructor for the `OGS6_vtu` base class
#' @export
#' @importFrom R6 R6Class
OGS6_vtu <- R6::R6Class(
"OGS6_vtu",
public = list(
......@@ -244,7 +245,7 @@ OGS6_vtu <- R6::R6Class(
),
private = list(
#' @importFrom dplyr bind_rows
get_data = function(data_type,
ids,
keys){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment