Mercurial > repos > greg > insect_phenology_model

changeset 105:375a2b8e7207 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Tue, 05 Dec 2017 11:21:23 -0500
parents d6e37828b094
children aa1890120743
files insect_phenology_model.xml
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/insect_phenology_model.xml	Tue Dec 05 11:13:23 2017 -0500
+++ b/insect_phenology_model.xml	Tue Dec 05 11:21:23 2017 -0500
@@ -5,14 +5,14 @@
     </requirements>
     <command detect_errors="exit_code"><![CDATA[
 Rscript '$__tool_directory__/insect_phenology_model.R'
--a $adult_mort
--b $adult_accum
--c $egg_mort
+-a $adult_mortality
+-b $adult_accumulation
+-c $egg_mortality
 -e '$location'
 -f $max_clutch_size
 -i $min_clutch_size
--j $nymph_mort
--k $old_nymph_accum
+-j $nymph_mortality
+-k $old_nymph_accumulation
 -n $input.metadata.data_lines
 -o '$output'
 -p $oviposition
@@ -20,7 +20,7 @@
 -s $replications
 -t $std_error_plot
 -v '$input'
--y $young_nymph_accum
+-y $young_nymph_accumulation
 -x '$insect']]></command>
     <inputs>
         <param name="input" type="data" format="csv" label="Temperature data" />
@@ -30,15 +30,15 @@
         </param>
         <param name="replications" type="integer" value="10" min="1" label="Number of replications" />
         <param name="photoperiod" type="float" value="13.5" min="0" label="Critical photoperiod for diapause induction/termination" />
-        <param name="egg_mort" type="integer" value="1" min="0" label="Adjustment rate for egg mortality" />
-        <param name="nymph_mort" type="integer" value="1" min="0" label="Adjustment rate for nymph mortality" />
-        <param name="adult_mort" type="integer" value="1" min="0" label="Adjustment rate for adult mortality" />
+        <param name="egg_mortality" type="integer" value="1" min="0" label="Adjustment rate for egg mortality" />
+        <param name="nymph_mortality" type="integer" value="1" min="0" label="Adjustment rate for nymph mortality" />
+        <param name="adult_mortality" type="integer" value="1" min="0" label="Adjustment rate for adult mortality" />
         <param name="oviposition" type="integer" value="1" min="0" label="Adjustment oviposition rate" />
         <param name="min_clutch_size" type="integer" value="0" min="0" label="Adjustment of minimum clutch size" />
         <param name="max_clutch_size" type="integer" value="0" min="0" label="Adjustment of maximum clutch size" />
-        <param name="young_nymph_accum" type="integer" value="0" min="0" label="Adjustment of degree-days accumulation (egg->young nymph)" />
-        <param name="old_nymph_accum" type="integer" value="0" min="0" label="Adjustment of degree-days accumulation (young nymph->old nymph)" />
-        <param name="adult_accum" type="integer" value="0" min="0" label="Adjustment of degree-days accumulation (old nymph->adult)" />
+        <param name="young_nymph_accumulation" type="integer" value="0" min="0" label="Adjustment of degree-days accumulation (egg->young nymph)" />
+        <param name="old_nymph_accumulation" type="integer" value="0" min="0" label="Adjustment of degree-days accumulation (young nymph->old nymph)" />
+        <param name="adult_accumulation" type="integer" value="0" min="0" label="Adjustment of degree-days accumulation (old nymph->adult)" />
         <param name="std_error_plot" type="select" label="Plot standard error?">
             <option value="1" selected="True">Yes</option>
             <option value="0">No</option>