From b21cf5fc5a6e40bc04a6331f84308291114c45ba Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Thu, 7 Dec 2023 10:27:44 +0100 Subject: [PATCH 01/11] Update DESCRIPTION fix dependencies again --- DESCRIPTION | 2 -- 1 file changed, 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index e4093e5..1b9c01b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -27,12 +27,10 @@ Imports: readxl, sf, stringr, - euptf2, SWATprepR, utils, writexl Remotes: - github::tkdweber/euptf2 github::biopsichas/SWATprepR Suggests: devtools, From 50a6325862895dd4ba8b10bba565e885601accdc Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Thu, 7 Dec 2023 10:29:17 +0100 Subject: [PATCH 02/11] Update DESCRIPTION --- DESCRIPTION | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 1b9c01b..811c8db 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -30,8 +30,7 @@ Imports: SWATprepR, utils, writexl -Remotes: - github::biopsichas/SWATprepR +Remotes: github::biopsichas/SWATprepR Suggests: devtools, knitr, From 98f0e4573940269b0e9e9fec2cbd45da415d7b9f Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Thu, 7 Dec 2023 11:42:10 +0100 Subject: [PATCH 03/11] Update DESCRIPTION move to suggests --- DESCRIPTION | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 811c8db..652969a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -27,11 +27,10 @@ Imports: readxl, sf, stringr, - SWATprepR, utils, writexl -Remotes: github::biopsichas/SWATprepR Suggests: + SWATprepR, devtools, knitr, rmarkdown, From 0fe96b0ae19c9628057722bdf53366f563b1913e Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Fri, 8 Dec 2023 09:58:07 +0100 Subject: [PATCH 04/11] Update NAMESPACE --- NAMESPACE | 4 ---- 1 file changed, 4 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 8619390..ee4970e 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -6,10 +6,6 @@ export(reanalysis3_daily) export(reanalysis3_swatinput) export(swat_weather_input_chain) importFrom(RColorBrewer,brewer.pal) -importFrom(SWATprepR,add_weather) -importFrom(SWATprepR,load_template) -importFrom(SWATprepR,prepare_climate) -importFrom(SWATprepR,prepare_wgn) importFrom(abind,abind) importFrom(crayon,blue) importFrom(crayon,green) From 548f571f67d4785015e0af25c01682c7157f2575 Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Fri, 8 Dec 2023 09:58:14 +0100 Subject: [PATCH 05/11] Update metnorenal3.R --- R/metnorenal3.R | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/R/metnorenal3.R b/R/metnorenal3.R index f077cd0..f5dbb91 100644 --- a/R/metnorenal3.R +++ b/R/metnorenal3.R @@ -790,7 +790,6 @@ reanalysis3_daily <- function(path, outpath = NULL, verbose = FALSE, precision = #' @importFrom readr read_csv #' @importFrom stringr str_split str_remove #' @importFrom writexl write_xlsx -#' @importFrom SWATprepR prepare_climate add_weather prepare_wgn load_template reanalysis3_swatinput <- function(path, swat_setup, @@ -1000,9 +999,9 @@ reanalysis3_swatinput <- # if it is null, then write just the climate files if(verbose){cat(green(italic(("writing weather station files\n"))))} SWATprepR::prepare_climate(meteo_lst, - swat_setup, - period_starts = start, - period_ends = end) + swat_setup, + period_starts = start, + period_ends = end) } } From 16f15babd2c3d8b4c4d5114bceaa8d83bb0872ab Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Fri, 8 Dec 2023 10:10:21 +0100 Subject: [PATCH 06/11] Update DESCRIPTION --- DESCRIPTION | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 652969a..13459c2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,14 +1,15 @@ Type: Package Package: miljotools -Title: An R package hosting a variety of useful functions for environmental data handling and anaylsis +Title: An R package hosting a variety of useful functions for + environmental data handling and anaylsis Version: 0.3.1 Author: Moritz Shore Maintainer: Moritz Shore -Description: A few useful functions for environemental data processing and analysis. +Description: A few useful functions for environemental data processing and + analysis. License: GPL (>= 3) URL: https://moritzshore.github.io/miljotools/ BugReports: https://github.com/moritzshore/miljotools/issues -Language: English Depends: R (>= 4.0) Imports: @@ -30,14 +31,17 @@ Imports: utils, writexl Suggests: - SWATprepR, devtools, knitr, rmarkdown, - roxygen2 + roxygen2, + SWATprepR VignetteBuilder: knitr +Remotes: + github::biopsichas/SWATprepR Encoding: UTF-8 +Language: English LazyData: true Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.3 From 2034dd884e93fc1b6d152c325c480cc57c857bfb Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Fri, 8 Dec 2023 10:20:34 +0100 Subject: [PATCH 07/11] Update DESCRIPTION --- DESCRIPTION | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DESCRIPTION b/DESCRIPTION index 13459c2..c508aaa 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -32,6 +32,7 @@ Imports: writexl Suggests: devtools, + euptf2, knitr, rmarkdown, roxygen2, @@ -40,6 +41,7 @@ VignetteBuilder: knitr Remotes: github::biopsichas/SWATprepR + github::tkdweber/euptf2 Encoding: UTF-8 Language: English LazyData: true From f4554f9320f0dc35a9221778b14318a103607415 Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Fri, 8 Dec 2023 10:59:19 +0100 Subject: [PATCH 08/11] Update DESCRIPTION --- DESCRIPTION | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c508aaa..03bc74e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -28,20 +28,18 @@ Imports: readxl, sf, stringr, + SWATprepR, utils, writexl Suggests: devtools, - euptf2, knitr, rmarkdown, - roxygen2, - SWATprepR + roxygen2 VignetteBuilder: knitr -Remotes: +Remotes: github::biopsichas/SWATprepR - github::tkdweber/euptf2 Encoding: UTF-8 Language: English LazyData: true From 9678ca332d94c6b34a86627d7faeb075b14f9bc7 Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Fri, 8 Dec 2023 11:09:47 +0100 Subject: [PATCH 09/11] Update DESCRIPTION --- DESCRIPTION | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DESCRIPTION b/DESCRIPTION index 03bc74e..a025234 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -33,6 +33,7 @@ Imports: writexl Suggests: devtools, + euptf2, knitr, rmarkdown, roxygen2 @@ -40,6 +41,7 @@ VignetteBuilder: knitr Remotes: github::biopsichas/SWATprepR + github::tkdweber/euptf2 Encoding: UTF-8 Language: English LazyData: true From 96856fd044a08e58b17c89ddbd50ab5ad7764343 Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Fri, 8 Dec 2023 11:27:30 +0100 Subject: [PATCH 10/11] Update DESCRIPTION --- DESCRIPTION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a025234..2c26fc3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -28,7 +28,6 @@ Imports: readxl, sf, stringr, - SWATprepR, utils, writexl Suggests: @@ -36,11 +35,12 @@ Suggests: euptf2, knitr, rmarkdown, - roxygen2 + roxygen2, + SWATprepR VignetteBuilder: knitr Remotes: - github::biopsichas/SWATprepR + github::biopsichas/SWATprepR, github::tkdweber/euptf2 Encoding: UTF-8 Language: English From 36571392e211fa2eac8bdc1d191f34842046221c Mon Sep 17 00:00:00 2001 From: Moritz Shore Date: Fri, 8 Dec 2023 12:42:43 +0100 Subject: [PATCH 11/11] Update DESCRIPTION --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index 2c26fc3..e74ea6a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -34,6 +34,7 @@ Suggests: devtools, euptf2, knitr, + Rdpack, rmarkdown, roxygen2, SWATprepR