diff --git a/DESCRIPTION b/DESCRIPTION index 896477807485421dbba3039003409d46d437790f..4ecfcea185913799d15b8f1d50e43638d5e04dd0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: SWATdoctR Type: Package Title: Finding the right diagnoses and treatments for SWAT+ models -Version: 0.1.18 +Version: 0.1.19 Author: c(person("Christoph", "Schürz", email = "christoph.schuerz@ufz.de", role = c("aut", "cre")), diff --git a/R/plot_mgt_harv.R b/R/plot_mgt_harv.R index c73ec3705894d91b0169c49f4df0789cfa465c11..c24872ceebf4ce1608b8e7c15ec0f5a3dac28f91 100644 --- a/R/plot_mgt_harv.R +++ b/R/plot_mgt_harv.R @@ -329,10 +329,10 @@ prepare_stress <- function(mgt_out, years) { filter(no_plntkill) %>% group_by(hru, year, op_typ) %>% summarise(var4 = max(var4), var5 = max(var5), var3 = max(var3), - var2 = max(var2), var1 = max(var1), .groups = 'drop') %>% + var1 = max(var1), var2 = max(var2), .groups = 'drop') %>% group_by(hru, op_typ) %>% mutate(var4 = diff1(var4), var5 = diff1(var5), var3 = diff1(var3), - var2 = diff1(var2), var1 = diff1(var1)) %>% + var1 = diff1(var1), var2 = diff1(var2)) %>% ungroup() %>% filter(year %in% years) %>% select(-hru, -year) @@ -343,7 +343,7 @@ prepare_stress <- function(mgt_out, years) { filter(operation == 'HARVEST') %>% group_by(hru, op_typ, grw_group) %>% summarise(var4 = max(var4), var5 = max(var5), var3 = max(var3), - var2 = max(var2), var1 = max(var1), .groups = 'drop') %>% + var1 = max(var1), var2 = max(var2), .groups = 'drop') %>% ungroup(.) %>% select(-hru, -grw_group)