Mercurial > repos > siwaa > sunflo

changeset 3:eec09c643933 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/record/RECORD/-/tree/e3ed8beeb31a8c8b7e90d80ae3267feb06fc3c90 commit e3ed8beeb31a8c8b7e90d80ae3267feb06fc3c90-dirty"
author siwaa
date Tue, 27 Sep 2022 07:54:08 +0000
parents a08cdfcedd4c
children 64b9de83b8e6
files tool_SUNFLO.xml tool_defaults_SUNFLO.xml
diffstat 2 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/tool_SUNFLO.xml	Mon Aug 29 10:10:12 2022 +0000
+++ b/tool_SUNFLO.xml	Tue Sep 27 07:54:08 2022 +0000
@@ -1,11 +1,13 @@
-<tool id="SUNFLO" name="SUNFLO crop model simulations" version="1.1.0">
+<tool id="SUNFLO" name="SUNFLO crop model simulations" version="1.2.0">
   <description></description>
   <requirements>
-    <container type="singularity">docker://registry.forgemia.inra.fr/record/record/azodyn_sunflo:image-azodynsunflo-1.1</container>
+    <container type="singularity">docker://registry.forgemia.inra.fr/record/record/azodyn_sunflo:image-azodynsunflo-1.2</container>
   </requirements>
   <command detect_errors="aggressive">
-    unzip ${input_meteo}; 
-    /bin/bash -c "Rscript --verbose /data/rAzodynSunflo.R sunflo_web.vpz sunflo ${file_input} ${file_outputs} \${GALAXY_SLOTS:-2}";
+    unzip ${input_meteo};
+    dos2unix -n ${file_input} internal_inputSUNFLO.csv;
+    dos2unix -n ${file_outputs} internal_outputSUNFLO.csv; 
+    /bin/bash -c "Rscript --verbose /data/rAzodynSunflo.R sunflo_simple.vpz sunflo internal_inputSUNFLO.csv internal_outputSUNFLO.csv \${GALAXY_SLOTS:-2}";
     zip temp_results.zip  simresults_*.txt;
     cp temp_results.zip ${simresults};
   </command>
@@ -26,11 +28,11 @@
     <assert_contents>
       <has_archive_member path="simresults_LAI.txt">
 	<has_text text="0;0;0;0" />
-	<has_text text="0.007252155941" />
+	<has_text text="0.007303977383" />
       </has_archive_member>
       <has_archive_member path="simresults_RDT.txt">
-	<has_text text="29.639416530" />
-	<has_text text="29.411414411" />
+	<has_text text="25.004733605" />
+	<has_text text="25.084471273" />
       </has_archive_member>
     </assert_contents>
     </output>
--- a/tool_defaults_SUNFLO.xml	Mon Aug 29 10:10:12 2022 +0000
+++ b/tool_defaults_SUNFLO.xml	Tue Sep 27 07:54:08 2022 +0000
@@ -1,10 +1,10 @@
-<tool id="SUNFLOdefaults" name="SUNFLO crop model default inputs and outputs" version="1.1.0">
+<tool id="SUNFLOdefaults" name="SUNFLO crop model default inputs and outputs" version="1.2.0">
   <description></description>
   <requirements>
-    <container type="singularity">docker://registry.forgemia.inra.fr/record/record/azodyn_sunflo:image-azodynsunflo-1.1</container>
+    <container type="singularity">docker://registry.forgemia.inra.fr/record/record/azodyn_sunflo:image-azodynsunflo-1.2</container>
   </requirements>
   <command detect_errors="aggressive">
-    /bin/bash -c "Rscript --verbose /data/rDefaultAzodynSunflo.R sunflo_web.vpz sunflo";
+    /bin/bash -c "Rscript --verbose /data/rDefaultAzodynSunflo.R sunflo_simple.vpz sunflo";
     cp file_default_input.csv ${inputs};
     cp file_default_output.csv ${outputs};
   </command>