Mercurial > repos > siwaa > redelac_stics_t

changeset 18:8293d67cd1a9 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://forgemia.inra.fr/redelac commit b972382172a3923486a799d46efe363d21e8ea1d"
author siwaa
date Thu, 09 Jul 2026 07:09:47 +0000
parents fa4e7fd1d3f7
children 8848db582840
files redelacSticsTool.R redelacSticsTool.xml
diffstat 2 files changed, 49 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/redelacSticsTool.R	Fri Jul 03 15:20:04 2026 +0000
+++ b/redelacSticsTool.R	Thu Jul 09 07:09:47 2026 +0000
@@ -137,10 +137,6 @@
 durGenT <-
   lubridate::as.duration(lubridate::interval(beforeGenTxtTime, afterGenTxtTime))
 
-afterGenTxtTime <- Sys.time()
-durGenT <-
-  lubridate::as.duration(lubridate::interval(beforeGenTxtTime, afterGenTxtTime))
-
 endTime <- Sys.time()
 
 dur <-
@@ -182,11 +178,12 @@
   "==================================================================================="
 )
 
-
 #
 # Simulation part
 #
 
+beforeSimsTime <- Sys.time()
+
 # List of successive USMs
 successive_usms_file <- ("successionPlan.csv")
 successive_usms_tab <-
@@ -254,8 +251,36 @@
     return(stics_wrapper(model_options = sim_options, situation = list_usms))
 
   }
+  
+afterSimsTime <- Sys.time()
+durSimsT <-
+  lubridate::as.duration(lubridate::interval(beforeSimsTime, afterSimsTime))
+durSimsTP <- lubridate::as.period(durSimsT)
 
-for (j in  1:length(casesUpcSol)) {
+sprintf(
+  'Simulations duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
+  lubridate::day(durSimsTP),
+  lubridate::hour(durSimsTP),
+  lubridate::minute(durSimsTP),
+  lubridate::second(durSimsTP)
+)
+print(
+  "==================================================================================="
+)
+
+#
+# Output part
+#
+
+beforeOutputsTime <- Sys.time()
+
+#for (j in  1:length(casesUpcSol)) {
+
+foreach(   			   
+    j = 1:length(casesUpcSol),
+    .options.future = list(packages =c("foreach", "tidyr", "arrow")
+    ) %dordopar% {
+
   splited <- strsplit(casesUpcSol[j], split = "-")[[1]]
 
   upc <- splited[1]
@@ -523,4 +548,20 @@
 
       ))
   }
-}
\ No newline at end of file
+}
+
+afterOutputsTime <- Sys.time()
+durOutT <-
+  lubridate::as.duration(lubridate::interval(beforeOutputsTime, afterOutputsTime))
+durOutTP <- lubridate::as.period(durOutT)
+
+sprintf(
+  'outputs generating duration: %g jour(s) %g heure(s) %g minute(s) %g seconde(s)',
+  lubridate::day(durOutTP),
+  lubridate::hour(durOutTP),
+  lubridate::minute(durOutTP),
+  lubridate::second(durOutTP)
+)
+print(
+  "==================================================================================="
+)
--- a/redelacSticsTool.xml	Fri Jul 03 15:20:04 2026 +0000
+++ b/redelacSticsTool.xml	Thu Jul 09 07:09:47 2026 +0000
@@ -1,4 +1,4 @@
-<tool id="redelacSticsTool" name="redelacSticsTool" version="1.0.19">
+<tool id="redelacSticsTool" name="redelacSticsTool" version="1.0.20">
   <description>to run Stics for REDELAC</description>
   <requirements>
     <container type="singularity">docker://registry.forge.inrae.fr/redelac/redelac-toolbox/sticsrpacks:5337507635242b3ad0f3559a1a6b666512ecf002