Adapt to be used for multi-solute definition

KWB-R · Jun 27, 2024 · ced3151 · ced3151
1 parent 55909fd
commit ced3151
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/R/prepare_atmosphere_input.R b/R/prepare_atmosphere_input.R
@@ -31,8 +31,15 @@ prepare_atmosphere_input <- function(
 )
 {
   required_parameters <- get_atmosphere_headers()
+  n_solutes_per_run <- 12
+  optional_parameters <- sapply(2:n_solutes_per_run, function(i) {
+    c(sprintf("cTop%d", i), sprintf("cBot%d", i))
+  }) %>% as.vector()
+
+
 
   is_given <- required_parameters %in% names(inputs)
+  is_given_optional <- optional_parameters %in% names(inputs)
   has_default <- required_parameters %in% names(defaults)
 
   if (any(is_missing <- !is_given & !has_default)) {
@@ -44,7 +51,9 @@ prepare_atmosphere_input <- function(
 
   dplyr::bind_cols(
     inputs[, required_parameters[is_given], drop = FALSE],
+    inputs[, optional_parameters[is_given_optional], drop = FALSE],
     defaults[, required_parameters[!is_given & has_default], drop = FALSE]
   ) %>%
-    dplyr::select(tidyselect::all_of(required_parameters))
+    dplyr::select(tidyselect::all_of(required_parameters),
+                  tidyselect::all_of(optional_parameters[is_given_optional]))
 }