Skip to content
Snippets Groups Projects
Commit cc833924 authored by Laura A DeCicco's avatar Laura A DeCicco
Browse files

Unifying argument names.

parent dda9c0f2
No related branches found
No related tags found
1 merge request!7Response to reviewer's comments.
......@@ -5,9 +5,9 @@
#' A list of statistic codes can be found here: \url{http://nwis.waterdata.usgs.gov/nwis/help/?read_file=stat&format=table}
#'
#' @param siteNumber string USGS site number. This is usually an 8 digit number
#' @param ParameterCd string USGS parameter code. This is usually an 5 digit number.
#' @param StartDate string starting date for data retrieval in the form YYYY-MM-DD.
#' @param EndDate string ending date for data retrieval in the form YYYY-MM-DD.
#' @param parameterCd string USGS parameter code. This is usually an 5 digit number.
#' @param startDate string starting date for data retrieval in the form YYYY-MM-DD.
#' @param endDate string ending date for data retrieval in the form YYYY-MM-DD.
#' @param interactive logical Option for interactive mode. If true, there is user interaction for error handling and data checks.
#' @param convert logical Option to include a conversion from cfs to cms (35.314667). The default is TRUE,
#' which is appropriate for using NWIS data in the EGRET package. Set this to FALSE to not include the conversion. If the parameter code is not 00060 (NWIS discharge),
......@@ -24,13 +24,13 @@
#' Daily <- getDVData('01594440','00060', '1985-01-01', '1985-03-31')
#' DailyCFS <- getDVData('01594440','00060', '1985-01-01', '1985-03-31',convert=FALSE)
#' DailySuspSediment <- getDVData('01594440','80154', '1985-01-01', '1985-03-31')
getDVData <- function (siteNumber,ParameterCd,StartDate,EndDate,interactive=TRUE,convert=TRUE,format="tsv"){
data <- retrieveNWISdvData(siteNumber,ParameterCd,StartDate,EndDate,interactive=interactive,format=format)
getDVData <- function (siteNumber,parameterCd,startDate,endDate,interactive=TRUE,convert=TRUE,format="tsv"){
data <- retrieveNWISdvData(siteNumber,parameterCd,startDate,endDate,interactive=interactive,format=format)
# need to setup conversion factor because the NWIS data are in cfs but we store in cms
names(data) <- c('agency', 'site', 'dateTime', 'value', 'code') # do a merge instead?
qConvert <- ifelse("00060" == ParameterCd, 35.314667, 1)
qConvert <- ifelse("00060" == parameterCd, 35.314667, 1)
qConvert<- ifelse(convert,qConvert,1)
localDaily <- populateDaily(data,qConvert,interactive=interactive)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment