Skip to content
Snippets Groups Projects
Commit 2ab51b21 authored by Ruben Heinrich's avatar Ruben Heinrich
Browse files

[base] Moved two lines for testing utility

parent ae7e99b6
No related branches found
No related tags found
1 merge request!6Merge branch 7 fixed functionality into master
...@@ -29,10 +29,10 @@ OGS6 <- R6::R6Class("OGS6", ...@@ -29,10 +29,10 @@ OGS6 <- R6::R6Class("OGS6",
assertthat::assert_that(assertthat::is.string(sim_path)) assertthat::assert_that(assertthat::is.string(sim_path))
assertthat::assert_that(assertthat::is.string(ogs_bin_path)) assertthat::assert_that(assertthat::is.string(ogs_bin_path))
if(!test_mode){ sim_path <- validate_is_dir_path(sim_path)
sim_path <- validate_is_dir_path(sim_path) ogs_bin_path <- validate_is_dir_path(ogs_bin_path)
ogs_bin_path <- validate_is_dir_path(ogs_bin_path)
if(!test_mode){
if(!dir.exists(sim_path)){ if(!dir.exists(sim_path)){
dir.create(sim_path) dir.create(sim_path)
}else{ }else{
...@@ -87,7 +87,6 @@ OGS6 <- R6::R6Class("OGS6", ...@@ -87,7 +87,6 @@ OGS6 <- R6::R6Class("OGS6",
if(!is.null(private$.gml)){ if(!is.null(private$.gml)){
warning("Overwriting gml and geometry variable of OGS6 object", warning("Overwriting gml and geometry variable of OGS6 object",
call. = FALSE) call. = FALSE)
} }
private$.gml <- gml private$.gml <- gml
private$.geometry <- paste0(gml$name, ".gml") private$.geometry <- paste0(gml$name, ".gml")
...@@ -220,31 +219,14 @@ OGS6 <- R6::R6Class("OGS6", ...@@ -220,31 +219,14 @@ OGS6 <- R6::R6Class("OGS6",
get_status = function(){ get_status = function(){
flag <- TRUE flag <- TRUE
impl_classes <- get_implemented_classes()
#.gml for(i in seq_len(length(impl_classes))){
#flag <- obj_is_defined(flag, private$.gml, "gml") status_call <- paste0("get_obj_status(flag, private$.",
names(impl_classes)[[i]], ")")
#.vtu
flag <- get_list_status(flag, private$.meshes, "mesh") flag <- eval(parse(text = status_call))
}
#.prj
flag <- get_list_status(flag, private$.processes, "process")
flag <- obj_is_defined(flag, private$.time_loop, "time_loop")
flag <- obj_is_defined(flag, private$.local_coordinate_system,
"local_coordinate_system", is_opt = TRUE)
flag <- get_list_status(flag, private$.media, "medium", is_opt = TRUE)
flag <- get_list_status(flag, private$.parameters, "parameter")
flag <- get_list_status(flag, private$.curves, "curve", is_opt = TRUE)
flag <- get_list_status(flag, private$.process_variables,
"process_variable")
flag <- get_list_status(flag, private$.nonlinear_solvers,
"nonlinear_solver")
flag <- get_list_status(flag, private$.linear_solvers,
"linear_solver")
flag <- get_list_status(flag, private$.test_definition,
"vtkdiff", is_opt = TRUE)
flag <- obj_is_defined(flag, private$.insitu,
"insitu", is_opt = TRUE)
if(flag){ if(flag){
cat(paste0("Your simulation object has all necessary components.\n", cat(paste0("Your simulation object has all necessary components.\n",
......
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