--- a/insect_phenology_model.xml	Thu Sep 28 14:03:43 2017 -0400
+++ b/insect_phenology_model.xml	Thu Nov 09 08:08:59 2017 -0500
@@ -14,26 +14,18 @@
 -i $min_clutch_size
 -j $nymph_mort
 -k $old_nymph_accum
--n $temperature_data.metadata.data_lines
+-n $input.metadata.data_lines
 -o '$output'
 -p $oviposition
 -q $photoperiod
 -s $replications
 -t $se_plot
--u $year
--v '$temperature_data'
+-v '$input'
 -y $young_nymph_accum
     ]]></command>
     <inputs>
-        <param name="location" type="select" label="Global Historical Climatology Network Station">
-            <options from_file="ghcnd_stations.txt">
-                <column name="name" index="1"/>
-                <column name="value" index="0"/>
-                <column name="state" index="2"/>
-            </options>
-        </param>
-        <param name="temperature_data" type="data" format="csv" label="Temperature data" />
-        <param name="year" type="integer" value="2017" min="1995" label="Temperature data year" />
+        <param name="location" type="text" value="" optional="false" label="Location" />
+        <param name="input" type="data" format="csv" label="Temperature data" />
         <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" />
@@ -51,13 +43,12 @@
         </param>
     </inputs>
     <outputs>
-        <data name="output" format="pdf" label="${tool.name} ${location}, ${year} on ${on_string}" />
+        <data name="output" format="pdf" label="${tool.name} ${location}, on ${on_string}" />
     </outputs>
     <tests>
         <test>
-            <param name="temperature_data" value="asheville2014.csv" ftype="csv" />
-            <param name="location" value="asheville:35.58" />
-            <param name="year" value="2014" />
+            <param name="input" value="asheville2014.csv" ftype="csv" />
+            <param name="location" value="State College" />
             <param name="replications" value="3" />
             <output name="output" file="output.pdf" ftype="pdf" compare="contains" />
         </test>
@@ -73,7 +64,6 @@
 
  * **Location** - the location associated with the selected temperature data.
  * **Temperature data** - select the dataset from your history containing the temperature data.
- * **Temperature data year** - the year during which the temperature data was recorded.
  * **Number of replications** - number of replications.
  * **Critical photoperiod for diapause induction/termination** - critical photoperiod for diapause induction/termination.
  * **Adjustment rate for egg mortality** - adjustment rate for egg mortality.