diff --git a/DESCRIPTION b/DESCRIPTION index e4093e5..e74ea6a 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: @@ -27,21 +28,23 @@ Imports: readxl, sf, stringr, - euptf2, - SWATprepR, utils, writexl -Remotes: - github::tkdweber/euptf2 - github::biopsichas/SWATprepR Suggests: devtools, + euptf2, knitr, + Rdpack, rmarkdown, - roxygen2 + roxygen2, + SWATprepR VignetteBuilder: knitr +Remotes: + github::biopsichas/SWATprepR, + github::tkdweber/euptf2 Encoding: UTF-8 +Language: English LazyData: true Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.3 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) 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) } }