Mercurial > repos > greg > insect_phenology_model

changeset 44:c61d3d9d44db draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Mon, 23 Apr 2018 10:18:59 -0400
parents fd3c00392fce
children 315c5e1bc44a
files insect_phenology_model.xml
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/insect_phenology_model.xml	Mon Apr 23 09:49:08 2018 -0400
+++ b/insect_phenology_model.xml	Mon Apr 23 10:18:59 2018 -0400
@@ -32,7 +32,8 @@
 --egg_mortality $egg_mortality
 #if str($merge_ytd_temperature_data_cond.merge_ytd_temperature_data) == "yes":
     --input_ytd '$merge_ytd_temperature_data_cond.input_ytd'
-    --num_days_ytd $input_ytd.metadata.data_lines
+    --location '$merge_ytd_temperature_data_cond.location'
+    --num_days_ytd $merge_ytd_temperature_data_cond.input_ytd.metadata.data_lines
 #end if
 --input_norm '$input_norm'
 --insect '$insect'
@@ -44,7 +45,6 @@
 #if str($plot_nymph_life_stage) == "yes":
     --life_stages_nymph '$plot_nymph_life_stage_cond.life_stages_nymph'
 #end if
---location '$location'
 --max_clutch_size $max_clutch_size
 --min_clutch_size $min_clutch_size
 --nymph_mortality $nymph_mortality
@@ -73,10 +73,10 @@
                 <param name="input_ytd" type="data" format="csv" label="Year-to-date temperature data">
                     <validator type="expression" message="Year-to-date temperature data must have 6 columns">value is not None and value.metadata.columns==6</validator>
                 </param>
+                <param name="location" type="text" value="" optional="true" label="Location" help="Enter the location or leave blank to use the station name from 30 year normals data."/>
             </when>
             <when value="no"/>
         </conditional>
-        <param name="location" type="text" value="" optional="false" label="Location"/>
         <param name="insect" type="select" label="Select insect">
             <option value="BMSB" selected="True">Brown Marmorated Stink Bug</option>
         </param>
@@ -146,7 +146,6 @@
         <test>
             <param name="input_norm" value="30_year_normals.csv" ftype="csv"/>
             <param name="merge_ytd_temperature_data" value="no"/>
-            <param name="location" value="State College PA"/>
             <param name="replications" value="2"/>
             <param name="plot_generations_separately" value="no"/>
             <param name="plot_egg_life_stage" value="no"/>