Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dependency fix #10

Merged
merged 11 commits into from
Dec 8, 2023
Merged

Dependency fix #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b21cf5f
Update DESCRIPTION
moritzshore Dec 7, 2023
50a6325
Update DESCRIPTION
moritzshore Dec 7, 2023
98f0e45
Update DESCRIPTION
moritzshore Dec 7, 2023
0fe96b0
Update NAMESPACE
moritzshore Dec 8, 2023
548f571
Update metnorenal3.R
moritzshore Dec 8, 2023
16f15ba
Update DESCRIPTION
moritzshore Dec 8, 2023
2034dd8
Update DESCRIPTION
moritzshore Dec 8, 2023
f4554f9
Update DESCRIPTION
moritzshore Dec 8, 2023
9678ca3
Update DESCRIPTION
moritzshore Dec 8, 2023
96856fd
Update DESCRIPTION
moritzshore Dec 8, 2023
3657139
Update DESCRIPTION
moritzshore Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
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:
Expand All @@ -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
4 changes: 0 additions & 4 deletions NAMESPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 3 additions & 4 deletions R/metnorenal3.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
}
}

Expand Down