Small changes, including to dated sequence

Author: ryanrbart

DESCRIPTION

@@ -18,7 +18,8 @@ Imports:
     tools,
     purrr,
     lhs,
-    readr
+    readr,
+    tibble
 RoxygenNote: 6.0.1
 Suggests: testthat,
     knitr,

R/generate_input_files.R

@@ -14,9 +14,7 @@ generate_input_files <- function(input_rhessys,
                                  option_sets_def_par,
                                  option_sets_par,
                                  option_sets_hdr,
-                                 option_sets_dated_seq,
-                                 world_hdr_prefix,
-                                 world_file){
+                                 option_sets_dated_seq){
 
 
   # ---------------------------------------------------------------------
@@ -36,7 +34,7 @@ generate_input_files <- function(input_rhessys,
       for (bb in seq_along(option_sets_def_par[[aa]]$group_id)){
 
         change_def_file(def_file = names(option_sets_def_par)[aa],
-                        par_sets = dplyr::select(option_sets_def_par[[aa]], -group_id)[bb,],
+                        par_sets = as_tibble(dplyr::select(option_sets_def_par[[aa]], -group_id))[bb,],
                         file_name_ext = as.character(option_sets_def_par[[aa]]$group_id[bb]))
       }
       print(paste("New def files written for file", names(option_sets_def_par)[aa]))

R/make_clim_base_file.R

@@ -23,7 +23,7 @@ make_clim_base_file <- function(input_clim_base,
     path <- dirname(clim_base_path)
     name_no_ext <- tools::file_path_sans_ext(basename(clim_base_path))
     ext <- tools::file_ext(clim_base_path)
-    dated_name_ext <- paste(input_dated_seq$name, "_", clim_dated_ext, sep="")
+    dated_name_ext <- unique(paste(input_dated_seq$name, "_", clim_dated_ext, sep=""))
     path_new <- file.path(path, name_no_ext)
     dated_path_name_ext <- file.path(path_new,dated_name_ext)
     dated_file_name <- paste(dated_name_ext, ".", input_dated_seq$type, sep="")
@@ -44,8 +44,12 @@ make_clim_base_file <- function(input_clim_base,
 
     # Make and output dated sequence file
     dated_seq_file <- file.path(path_new, dated_file_name)
-    make_dated_seq(input_dated_seq = dplyr::select(input_dated_seq,-name,-type), dated_seq_file = dated_seq_file)
-
+    for (aa in seq_along(dated_file_type)){
+      tmp = input_dated_seq %>% 
+        dplyr::filter(type==dated_file_type[aa]) %>% 
+        dplyr::select(-name,-type)
+      make_dated_seq(input_dated_seq = tmp, dated_seq_file = dated_seq_file[aa])
+    }
   } else {
 
     # Output standard clim file

R/run_rhessys.R

@@ -48,9 +48,7 @@ run_rhessys <- function(parameter_method = c("all_combinations", "lhc", "monte_c
                        option_sets_def_par = option_sets$option_sets_def_par,
                        option_sets_par = option_sets$option_sets_par,
                        option_sets_hdr = option_sets$option_sets_hdr,
-                       option_sets_dated_seq = option_sets$option_sets_dated_seq,
-                       world_hdr_prefix = world_hdr_prefix,
-                       world_file = world_file)
+                       option_sets_dated_seq = option_sets$option_sets_dated_seq)
 
   # ---------------------------------------------------------------------