From e44dee411ac3242a01a4b3b24878d42ce5a2b3b9 Mon Sep 17 00:00:00 2001 From: dschlaep Date: Tue, 4 Oct 2016 16:20:50 +0200 Subject: [PATCH] Fix to merge of 'dailyNRCS_Maestas2016_ResilienceResistance' - bumped minor version number: added functionality Former-commit-id: 9df98a891e8f78c23efe6f5bd2921c3c2b65fcf2 [formerly 7c00ab3795bb2f117c6b162c37222d8dfa0b31ab] Former-commit-id: b28f6fb784fa5bb7fba10dc82ce017f7cd36c048 --- DESCRIPTION | 4 ++-- R/2_SWSF_p4of5_Code_v51.R | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 37767647..3311e74e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: rSWSF Title: SOILWAT Simulation Framework -Version: 1.6.4 -Date: 2016-09-30 +Version: 1.7.0 +Date: 2016-10-04 Authors@R: c(person("Daniel", "Schlaepfer", email = "daniel.schlaepfer@unibas.ch", role = c("aut", "cre")), person("Caitlin", "Andrews", role = "ctb", person("Ryan", "Murphy", role = "ctb") diff --git a/R/2_SWSF_p4of5_Code_v51.R b/R/2_SWSF_p4of5_Code_v51.R index 5badecdd..ae208415 100644 --- a/R/2_SWSF_p4of5_Code_v51.R +++ b/R/2_SWSF_p4of5_Code_v51.R @@ -4205,7 +4205,7 @@ do_OneSite <- function(i_sim, i_labels, i_SWRunInformation, i_sw_input_soillayer rm(Table1) } - nv_new <- nv + length(cats) + nv_new <- nv + length(RR) resMeans[nv:(nv_new - 1)] <- RR nv <- nv_new