Merge pull request #3722 from Akash-paluvai/fix-modeloutdir-assumption

Remove hardcoded assumption that model output lives in outdir/out

Author: mdietze

modules/assim.sequential/R/sda.enkf_refactored.R

@@ -379,7 +379,7 @@ sda.enkf <- function(settings,
 
     #----chaning the extension of nc files to a more specific date related name
    files <-  list.files(
-      path = file.path(settings$outdir, "out"),
+      path = settings$modeloutdir,
       "*.nc$",
       recursive = TRUE,
       full.names = TRUE)

modules/uncertainty/R/run.ensemble.analysis.R

@@ -241,7 +241,7 @@ read.ensemble.ts <- function(settings, ensemble.id = NULL, variable = NULL,
     for(var in seq_along(variables)){
       out.tmp <- PEcAn.utils::read.output(
         run.id,
-        file.path(settings$outdir, "out", run.id),
+        file.path(settings$modeloutdir, run.id),
         start.year,
         end.year,
         variables[var])