Merge branch 'master' of github.com:PecanProject/pecan

PecanProject · Jan 27, 2015 · b6f9ed1 · b6f9ed1
2 parents 45f771a + 6c8a964
commit b6f9ed1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/utils/R/run.write.configs.R b/utils/R/run.write.configs.R
@@ -173,12 +173,12 @@ run.write.configs <- function(settings, write = TRUE) {
   } ### End of Ensemble
 
   logger.info("###### Finished writing model run config files #####")
-  logger.info("config files samples in ", paste0(settings$outdir, "run"))
+  logger.info("config files samples in ", file.path(settings$outdir, "run"))
 
   ### Save output from SA/Ensemble runs
   save(ensemble.samples, trait.samples, sa.samples, runs.samples, 
        file = file.path(settings$outdir, 'samples.Rdata'))
-  logger.info("parameter values for runs in ", paste0(settings$outdir, "samples.RData"))
+  logger.info("parameter values for runs in ", file.path(settings$outdir, "samples.RData"))
   options(scipen=scipen)
 }
 #==================================================================================================#

diff --git a/web/workflow.R b/web/workflow.R
@@ -83,7 +83,7 @@ if (length(which(commandArgs() == "--continue")) == 0) {
     }
 
     # met download
-    if(FALSE){  ## old approach
+    if(TRUE){  ## old approach
     if (input['input'] == 'Ameriflux') {
       # start/end date for weather
       start_date <- settings$run$start.date