diff --git a/RBBGCMuso/.gitignore b/RBBGCMuso/.gitignore index c066a39..3a33369 100644 --- a/RBBGCMuso/.gitignore +++ b/RBBGCMuso/.gitignore @@ -1 +1,4 @@ inst/doc +swp$ +'~'$ +'#'$ \ No newline at end of file diff --git a/RBBGCMuso/R/.Rhistory b/RBBGCMuso/R/.Rhistory index afef2e4..9968464 100644 --- a/RBBGCMuso/R/.Rhistory +++ b/RBBGCMuso/R/.Rhistory @@ -4,3 +4,37 @@ ls() rm(list=ls) rm(list=ls()) ls() +stop("asdf") +ls() +?registerDoParallel +getDoParallel() +?clusterExport +vignette(parallel) +vignette("parallel") +stopCluster(cl) +?registerDoParallel +list.files() +list.files() +?intersect +library(hash) +hash(list.files()) +hash(1 +) +?hash +hash( a=1, b=2, c=3 ) +list.files() +setwd("~/Documents/tmp") +list.files() +list.files() +list.files() +list.files() +list.files() +paste("a","b",collapse = "/") +paste("a","b",sep = "/") +list.files() +24000*100000 +24000*100000/1000000 +exit()) +exit() +quit() +y diff --git a/RBBGCMuso/R/setupMuso.R b/RBBGCMuso/R/setupMuso.R index 8204ca8..0383548 100644 --- a/RBBGCMuso/R/setupMuso.R +++ b/RBBGCMuso/R/setupMuso.R @@ -226,17 +226,17 @@ setupMuso <- function(executable=NULL, outputNames=outputName, inputLoc=inputLoc, iniInput=iniInput, - metInput=metInput, - epcInput=epcInput, - thinInput=thinInput, - CO2Input=CO2Input, - mowInput=mowInput, - grazInput=grazInput, - harvInput=harvInput, - plougInput=plougInput, - fertInput=fertInput, - irrInput=irrInput, - nitInput=nitInput, + metInput=inputs$metInput, + epcInput=inputs$epcInput, + thinInput=inputs$thinInput, + CO2Input=inputs$CO2Input, + mowInput=inputs$mowInput, + grazInput=inputs$grazInput, + harvInput=inputs$harvInput, + plougInput=inputs$plougInput, + fertInput=inputs$fertInput, + irrInput=inputs$irrInput, + nitInput=inputs$nitInput, inputFiles=inputFiles, numData=numData, startyear=startyear, diff --git a/RBBGCMuso_0.4.0.0-0.tar.gz b/RBBGCMuso_0.4.0.0-0.tar.gz index 2a5b07a..143787d 100644 Binary files a/RBBGCMuso_0.4.0.0-0.tar.gz and b/RBBGCMuso_0.4.0.0-0.tar.gz differ