# HG changeset patch # User siwaa # Date 1664265248 0 # Node ID eec09c643933ad13af15442f9e1ee71c972feebd # Parent a08cdfcedd4cb0dd4a1159cb6cd46fc180d83a26 "planemo upload for repository https://forgemia.inra.fr/record/RECORD/-/tree/e3ed8beeb31a8c8b7e90d80ae3267feb06fc3c90 commit e3ed8beeb31a8c8b7e90d80ae3267feb06fc3c90-dirty" diff -r a08cdfcedd4c -r eec09c643933 tool_SUNFLO.xml --- 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 @@ - + - docker://registry.forgemia.inra.fr/record/record/azodyn_sunflo:image-azodynsunflo-1.1 + docker://registry.forgemia.inra.fr/record/record/azodyn_sunflo:image-azodynsunflo-1.2 - 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}; @@ -26,11 +28,11 @@ - + - - + + diff -r a08cdfcedd4c -r eec09c643933 tool_defaults_SUNFLO.xml --- 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 @@ - + - docker://registry.forgemia.inra.fr/record/record/azodyn_sunflo:image-azodynsunflo-1.1 + docker://registry.forgemia.inra.fr/record/record/azodyn_sunflo:image-azodynsunflo-1.2 - /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};