Mercurial > repos > siwaa > carboseq_s
changeset 8:5fdc9d0c223b draft
"planemo upload for repository https://forgemia.inra.fr/carboseq/record-projet-carboseq/-/tree/43e7f4ebfe4e552bf684936df0a050cb6def5aab/toos/CarboSeqSimulator commit 43e7f4ebfe4e552bf684936df0a050cb6def5aab-dirty"
| author | siwaa |
|---|---|
| date | Fri, 30 Aug 2024 13:29:48 +0000 |
| parents | 366449cab681 |
| children | 2af4b1e46d90 |
| files | carboseqSimulator.xml carboseqUnsplit.R carboseqUnsplit.xml run.r |
| diffstat | 4 files changed, 23 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/carboseqSimulator.xml Thu Aug 29 14:58:19 2024 +0000 +++ b/carboseqSimulator.xml Fri Aug 30 13:29:48 2024 +0000 @@ -1,4 +1,4 @@ -<tool id="CarboSeqSimulator" name="CarboSeqSimulator" version="1.0.13"> +<tool id="CarboSeqSimulator" name="CarboSeqSimulator" version="1.0.14"> <description>To run the CarboSeq simulator</description> <requirements> <container type="singularity">docker://registry.forgemia.inra.fr/csopra/csopralibs:siwaa</container>
--- a/carboseqUnsplit.R Thu Aug 29 14:58:19 2024 +0000 +++ b/carboseqUnsplit.R Fri Aug 30 13:29:48 2024 +0000 @@ -1,13 +1,26 @@ -resU <- list(SOC=data.frame(), forcings=data.frame()) +resU <- data.frame() + +listFiles <- list.files('./inputs') + +# restoring the order first + +orderVec <- c() for (i in list.files('./inputs')) { load(file.path('.', 'inputs',i)) - resU$SOC <- rbind(resU$SOC, res$SOC); - resU$forcings <- rbind(resU$forcings, res$forcings) + orderVec <- c(orderVec, res$ID[1]); + rm(res) + } + +listFilesReOrder <- listFiles[order(orderVec)] + +for (i in listFilesReOrder) { + load(file.path('.', 'inputs',i)) + resU<- rbind(resU, res); rm(res) } res <-resU -save(res, file = 'csopraRes.Rdata') \ No newline at end of file +save(res, file = 'csopraRes.Rdata') \ No newline at end of file
--- a/carboseqUnsplit.xml Thu Aug 29 14:58:19 2024 +0000 +++ b/carboseqUnsplit.xml Fri Aug 30 13:29:48 2024 +0000 @@ -1,4 +1,4 @@ -<tool id="CarboSeqUnsplit" name="CarboSeqUnsplit" version="1.0.1"> +<tool id="CarboSeqUnsplit" name="CarboSeqUnsplit" version="1.0.3"> <description>To unsplit CarboSeq results</description> <requirements> <container type="singularity">docker://registry.forgemia.inra.fr/csopra/csopralibs:siwa</container>
--- a/run.r Thu Aug 29 14:58:19 2024 +0000 +++ b/run.r Fri Aug 30 13:29:48 2024 +0000 @@ -118,8 +118,8 @@ preprocessorInputs = ppi) print("between load an sim") modeltoolbox::runSims(maxCores = NBCores) - # res <- modeltoolbox::getYearlySOCResults() - res <- modeltoolbox::readSocForcingsResults() + res <- modeltoolbox::getYearlySOCResults() + # res <- modeltoolbox::readSocForcingsResults() fileName <- "resRun.RData" filePath <- file.path(srcOut, fileName) save(res, file = filePath) @@ -148,8 +148,8 @@ modeltoolbox::loadCSVs(maxCores = NBCores, cinputCalculator = "cinest", preprocessorInputs = ppi) modeltoolbox::runSims(maxCores = NBCores) - # res <- modeltoolbox::getYearlySOCResults() - res <- modeltoolbox::readSocForcingsResults() + res <- modeltoolbox::getYearlySOCResults() + # res <- modeltoolbox::readSocForcingsResults() fileName <- "resRun.RData" filePath <- file.path(srcOut, fileName) save(res, file = filePath)