Mercurial > repos > greg > insect_phenology_model
changeset 32:94afb3e484c3 draft
Uploaded
author | greg |
---|---|
date | Mon, 19 Mar 2018 11:00:30 -0400 (2018-03-19) |
parents | ef6aa8c21729 |
children | ef5add7dea47 |
files | insect_phenology_model.xml test-data/output1.csv test-data/output2.csv test-data/output3.csv test-data/output4.csv test-data/output_combined1.csv test-data/output_combined2.csv test-data/output_combined3.csv test-data/output_combined4.csv test-data/output_f1_3.csv test-data/output_f1_4.csv test-data/output_f2_3.csv test-data/output_f2_4.csv test-data/output_p_3.csv test-data/output_p_4.csv |
diffstat | 15 files changed, 23 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/insect_phenology_model.xml Mon Mar 19 10:30:30 2018 -0400 +++ b/insect_phenology_model.xml Mon Mar 19 11:00:30 2018 -0400 @@ -119,13 +119,13 @@ </param> </inputs> <outputs> - <data name="output_p" format="csv" label="${tool.name} (P generation) on ${on_string}"> + <data name="output_p" format="csv" label="${tool.name} (P) on ${on_string}"> <filter>plot_generations_separately == 'yes'</filter> </data> - <data name="output_f1" format="csv" label="${tool.name} (F1 generation) on ${on_string}"> + <data name="output_f1" format="csv" label="${tool.name} (F1) on ${on_string}"> <filter>plot_generations_separately == 'yes'</filter> </data> - <data name="output_f2" format="csv" label="${tool.name} (F2 generation) on ${on_string}"> + <data name="output_f2" format="csv" label="${tool.name} (F2) on ${on_string}"> <filter>plot_generations_separately == 'yes'</filter> </data> <data name="output_combined" format="csv" label="${tool.name} (combined generations) on ${on_string}"/> @@ -142,7 +142,7 @@ <param name="plot_egg_life_stage" value="no" /> <param name="life_stages_nymph" value="Young" /> <param name="life_stages_adult" value="Pre-vittelogenic" /> - <output name="output_combined" file="output1.csv" ftype="csv" compare="contains"/> + <output name="output_combined" file="output_combined1.csv" ftype="csv" compare="contains"/> <output_collection name="output_collection" type="list"> <element name="02_young_nymph_pop.pdf" file="plot.pdf" ftype="pdf" compare="contains"/> <element name="05_pre-vittelogenic_adult_pop.pdf" file="plot.pdf" ftype="pdf" compare="contains"/> @@ -153,7 +153,7 @@ <param name="location" value="State College PA" /> <param name="replications" value="2" /> <param name="plot_generations_separately" value="no" /> - <output name="output_combined" file="output2.csv" ftype="csv" compare="contains"/> + <output name="output_combined" file="output_combined2.csv" ftype="csv" compare="contains"/> <output_collection name="output_collection" type="list"> <element name="01_egg_pop.pdf" file="plot.pdf" ftype="pdf" compare="contains"/> <element name="04_total_nymph_pop.pdf" file="plot.pdf" ftype="pdf" compare="contains"/> @@ -168,7 +168,10 @@ <param name="plot_egg_life_stage" value="no" /> <param name="life_stages_nymph" value="Old" /> <param name="plot_adult_life_stage" value="no" /> - <output name="output_combined" file="output3.csv" ftype="csv" compare="contains"/> + <output name="output_p" file="output_p_3.csv" ftype="csv" compare="contains"/> + <output name="output_f1" file="output_f1_3.csv" ftype="csv" compare="contains"/> + <output name="output_f2" file="output_f2_3.csv" ftype="csv" compare="contains"/> + <output name="output_combined" file="output_combined3.csv" ftype="csv" compare="contains"/> <output_collection name="output_collection" type="list"> <element name="03_old_nymph_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/> </output_collection> @@ -177,7 +180,10 @@ <param name="input" value="state_college.csv" ftype="csv" /> <param name="location" value="State College PA" /> <param name="replications" value="2" /> - <output name="output_combined" file="output4.csv" ftype="csv" compare="contains"/> + <output name="output_p" file="output_p_4.csv" ftype="csv" compare="contains"/> + <output name="output_f1" file="output_f1_4.csv" ftype="csv" compare="contains"/> + <output name="output_f2" file="output_f2_4.csv" ftype="csv" compare="contains"/> + <output name="output_combined" file="output_combined4.csv" ftype="csv" compare="contains"/> <output_collection name="output_collection" type="list"> <element name="01_egg_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/> <element name="04_total_nymph_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
--- a/test-data/output1.csv Mon Mar 19 10:30:30 2018 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","YOUNGNYMPH","YOUNGNYMPHSE","PRE-VITADULT","PRE-VITADULTSE"
--- a/test-data/output2.csv Mon Mar 19 10:30:30 2018 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG","EGGSE","TOTALNYMPH","TOTALNYMPHSE","TOTALADULT","TOTALADULTSE"
--- a/test-data/output3.csv Mon Mar 19 10:30:30 2018 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","OLDNYMPH","OLDNYMPHSE"
--- a/test-data/output4.csv Mon Mar 19 10:30:30 2018 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG","EGGSE","TOTALNYMPH","TOTALNYMPHSE","TOTALADULT","TOTALADULTSE"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_combined1.csv Mon Mar 19 11:00:30 2018 -0400 @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","YOUNGNYMPH","YOUNGNYMPHSE","PRE-VITADULT","PRE-VITADULTSE"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_combined2.csv Mon Mar 19 11:00:30 2018 -0400 @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG","EGGSE","TOTALNYMPH","TOTALNYMPHSE","TOTALADULT","TOTALADULTSE"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_combined3.csv Mon Mar 19 11:00:30 2018 -0400 @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","OLDNYMPH","OLDNYMPHSE"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_combined4.csv Mon Mar 19 11:00:30 2018 -0400 @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG","EGGSE","TOTALNYMPH","TOTALNYMPHSE","TOTALADULT","TOTALADULTSE"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_f1_3.csv Mon Mar 19 11:00:30 2018 -0400 @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","OLDNYMPH-F1","OLDNYMPH-F1-SE"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_f1_4.csv Mon Mar 19 11:00:30 2018 -0400 @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG-F1","EGG-F1-SE","TOTALNYMPH-F1","TOTALNYMPH-F1-SE","TOTALADULT-F1","TOTALADULT-F1-SE"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_f2_3.csv Mon Mar 19 11:00:30 2018 -0400 @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","OLDNYMPH-F2","OLDNYMPH-F2-SE"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_f2_4.csv Mon Mar 19 11:00:30 2018 -0400 @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG-F2","EGG-F2-SE","TOTALNYMPH-F2","TOTALNYMPH-F2-SE","TOTALADULT-F2","TOTALADULT-F2-SE"