-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merging master updates to dev (#119)
* Update rvn_download.R Updated Raven url to https from http * Update rvn_rvi_write_template.R Added SAC-SMA template to rvn_rvi_write_template * Minor fixes, added rvn_csv_read, added blended templates to rvi templates, updated .dat tables closes #114 closes #117
- Loading branch information
Showing
15 changed files
with
308 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ Package: RavenR | |
| Type: Package | ||
| Title: Raven Hydrological Modelling Framework R Support and Analysis | ||
| Version: 2.2.1 | ||
| Date: 2023-08-16 | ||
| Date: 2024-05-06 | ||
| Authors@R: c( | ||
| person("Robert", "Chlumsky", email = "[email protected]", role = c("cre","aut"), comment = c(ORCID = "0000-0002-1303-5064")), | ||
| person("James", "Craig", email = "[email protected]", role = c("ctb","aut"), comment = c(ORCID = "0000-0003-2715-7166")), | ||
|
|
@@ -52,6 +52,6 @@ URL: https://github.com/rchlumsk/RavenR | |
| License: GPL-3 | ||
| Encoding: UTF-8 | ||
| LazyData: TRUE | ||
| RoxygenNote: 7.2.2 | ||
| RoxygenNote: 7.3.1 | ||
| VignetteBuilder: knitr | ||
| LinkingTo: Rcpp | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| #' @title Read in generic Raven output csv files | ||
| #' | ||
| #' @description | ||
| #' Reads in output csv files produced by Raven. | ||
| #' | ||
| #' @details | ||
| #' Expects a full file path to the Raven output file. | ||
| #' | ||
| #' The timezone is provided by the tzone argument as "UTC" by default, and should be adjusted by | ||
| #' the user to the local time zone as needed, based on the model run. | ||
| #' | ||
| #' @param ff full file path to the csv file | ||
| #' @param tzone string indicating the timezone of the data in ff | ||
| #' @param xtsformat boolean whether to return in xts format (if date and/or hour found) | ||
| #' @return \item{data frame (as xts if set with \code{xtsformat}) read from the file} | ||
| #' @seealso \code{\link{rvn_hyd_read}} for reading Hydrographs output files | ||
| #' | ||
| #' @examples | ||
| #' # create full file path | ||
| #' ff <- system.file("extdata","ReservoirStages.csv", package="RavenR") | ||
| #' | ||
| #' # read in the Reservoir file with the generic call | ||
| #' myres <- rvn_csv_read(ff) | ||
| #' | ||
| #' # view contents | ||
| #' head(myres) | ||
| #' | ||
| #' @export rvn_csv_read | ||
| #' @importFrom xts xts | ||
| #' @importFrom dplyr %>% | ||
| #' @importFrom xts xts | ||
| #' @importFrom utils read.csv | ||
| rvn_csv_read <- function(ff=NA, tzone="UTC", xtsformat=TRUE) { | ||
|
|
||
| if (missing(ff)) { | ||
| stop("Requires the full file path to the Raven csv output file.") | ||
| } | ||
|
|
||
| #read output | ||
| dd <- read.csv(ff,header=TRUE,nrows=5) | ||
| # careful in date-time formats; excel can screw it up if csv is saved over. This works for | ||
| # an untouched Raven output file | ||
|
|
||
| cols <- colnames(dd) | ||
| classes <- rep(NA,length(cols)) | ||
| if ("time" %in% cols) { | ||
| classes[which(cols=="time")] <- "integer" | ||
| } | ||
| if ("date" %in% cols) { | ||
| classes[which(cols=="date")] <- "Date" | ||
| } | ||
| if ("hour" %in% cols) { | ||
| classes[which(cols=="hour")] <- "character" | ||
| } | ||
|
|
||
| # re-read with specified colClasses | ||
| dd <- read.csv(ff,header=TRUE,colClasses = classes,na.strings=c("---",'NA')) | ||
|
|
||
| dt <- NULL | ||
| if ("date" %in% cols) { | ||
| if ("hour" %in% cols) { | ||
| dt <- as.POSIXct(paste(dd$date,dd$hour), format="%Y-%m-%d %H:%M:%S", tz=tzone) | ||
| } else { | ||
| dt <- as.Date(dd$date) | ||
| } | ||
| # check if dt converted properly | ||
| if (any(is.na(dt))) { | ||
| warning("date and time failed to convert from date and hour columns, please check file format.") | ||
| dt <- NULL | ||
| } | ||
| } | ||
|
|
||
| # change all dots to underscore | ||
| newcols <- cols %>% | ||
| gsub("\\.\\.\\.","\\.\\.",x=.) %>% | ||
| gsub("\\.\\.","\\.",x=.) %>% | ||
| gsub("\\.","_",x=.) | ||
|
|
||
| # trim all last underscores | ||
| for (i in 1:length(newcols)) { | ||
| if (rvn_substrRight(newcols[i],1) == "_") { | ||
| newcols[i] <- rvn_substrMRight(newcols[i],1) | ||
| } | ||
| } | ||
| colnames(dd) <- newcols | ||
|
|
||
| # change to xtsformat if desired | ||
| if (xtsformat & !is.null(dt)) { | ||
| dd <- xts(order.by=dt,x=dd) | ||
| } | ||
|
|
||
| return(dd) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.