| Previous changeset 50:927321ed0322 (2018-08-07) Next changeset 52:e2d12bafe9d7 (2018-08-08) |
|
Commit message:
Uploaded |
|
modified:
insect_phenology_model.R |
| b |
| diff -r 927321ed0322 -r 3f827fe31756 insect_phenology_model.R --- a/insect_phenology_model.R Tue Aug 07 12:59:06 2018 -0400 +++ b/insect_phenology_model.R Wed Aug 08 14:16:32 2018 -0400 |
| b |
| @@ -564,11 +564,13 @@ process_vittelogenic_adults = FALSE; process_diapausing_adults = FALSE; process_total_adults = FALSE; +process_total = FALSE; for (life_stage in life_stages) { if (life_stage=="Total") { process_eggs = TRUE; process_nymphs = TRUE; process_adults = TRUE; + process_total = TRUE; } else if (life_stage=="Egg") { process_eggs = TRUE; } else if (life_stage=="Nymph") { @@ -1436,6 +1438,14 @@ temperature_data_frame_F2 = append_vector(temperature_data_frame_F2, F2_total_adults, "TOTALADULT.F2"); temperature_data_frame_F2 = append_vector(temperature_data_frame_F2, F2_total_adults.std_error, "TOTALADULT.F2.SE"); } + if (process_total) { + temperature_data_frame_P = append_vector(temperature_data_frame_P, P, "ALL.TOTAL.P"); + temperature_data_frame_P = append_vector(temperature_data_frame_P, P.std_error, "ALL.TOTAL.P.SE"); + temperature_data_frame_F1 = append_vector(temperature_data_frame_F1, F1, "ALL.TOTAL.F1"); + temperature_data_frame_F1 = append_vector(temperature_data_frame_F1, F1.std_error, "ALL.TOTAL.F1.SE"); + temperature_data_frame_F2 = append_vector(temperature_data_frame_F2, F2, "ALL.TOTAL.F2"); + temperature_data_frame_F2 = append_vector(temperature_data_frame_F2, F2.std_error, "ALL.TOTAL.F2.SE"); + } } # Save the analyzed data for combined generations. |