# HG changeset patch # User siwaa # Date 1644240590 0 # Node ID 6a77442a35989e5ea162ba5e2b69e90d22bdf7bb # Parent e7965152f2b01ed7b71be221cf35f849a8aad682 "planemo upload for repository https://forgemia.inra.fr/record/carsolel/-/tree/master/tools commit 7298c614ca40b1e5bffb2a0bc6a6ea8b16b7fc37" diff -r e7965152f2b0 -r 6a77442a3598 stics4carsolel.bash --- a/stics4carsolel.bash Fri Jan 28 16:12:18 2022 +0000 +++ b/stics4carsolel.bash Mon Feb 07 13:29:50 2022 +0000 @@ -4,6 +4,8 @@ n_slots=${1}; csv_plan=${2}; meteo_archive=${4}; +station_archive=${5}; +sol_archive=${6}; sim_number=$(($(cat ${csv_plan} | wc -l) - 1)); b_size=1 @@ -17,8 +19,12 @@ cp -r /data/vle-2001/pkgs/CarSolEl_data/data . rm -rf data/meteo + rm -rf data/station + rm -rf data/sol cd data unzip ${meteo_archive} + unzip ${station_archive} + unzip ${sol_archive} cd .. fi diff -r e7965152f2b0 -r 6a77442a3598 stics4carsolel.xml --- a/stics4carsolel.xml Fri Jan 28 16:12:18 2022 +0000 +++ b/stics4carsolel.xml Mon Feb 07 13:29:50 2022 +0000 @@ -4,11 +4,13 @@ docker://registry.forgemia.inra.fr/record/carsolel - bash $__tool_directory__/stics4carsolel.bash \${GALAXY_SLOTS:-2} ${cvle_plan} ${output_file} ${meteo_archive}; + bash $__tool_directory__/stics4carsolel.bash \${GALAXY_SLOTS:-2} ${cvle_plan} ${output_file} ${meteo_archive} ${station_archive} ${soil_archive}; + + @@ -17,6 +19,8 @@ + + diff -r e7965152f2b0 -r 6a77442a3598 test-data/inputs/sol.zip Binary file test-data/inputs/sol.zip has changed diff -r e7965152f2b0 -r 6a77442a3598 test-data/inputs/station.zip Binary file test-data/inputs/station.zip has changed