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

Changed variable to not call global.

parent 5e2c42d9
No related branches found
No related tags found
1 merge request!25Crannifying.
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
#' #'
#' Merges the flow data from the daily record into the sample record. #' Merges the flow data from the daily record into the sample record.
#' #'
#' @param localDaily dataframe containing the daily data, default is Daily #' @param Daily dataframe containing the daily data, default is Daily
#' @param localSample dataframe containing the sample data, default is Sample #' @param Sample dataframe containing the sample data, default is Sample
#' @param interactive logical Option for interactive mode. If true, there is user interaction for error handling and data checks. #' @param interactive logical Option for interactive mode. If true, there is user interaction for error handling and data checks.
#' @keywords data import USGS WRTDS #' @keywords data import USGS WRTDS
#' @export #' @export
...@@ -13,13 +13,14 @@ ...@@ -13,13 +13,14 @@
#' # These examples require an internet connection to run #' # These examples require an internet connection to run
#' Daily <- getNWISDaily('01594440','00060', '1985-01-01', '1985-03-31') #' Daily <- getNWISDaily('01594440','00060', '1985-01-01', '1985-03-31')
#' Sample <- getNWISSample('01594440','01075', '1985-01-01', '1985-03-31') #' Sample <- getNWISSample('01594440','01075', '1985-01-01', '1985-03-31')
#' Sample <- mergeReport() #' Sample <- mergeReport(Daily, Sample)
mergeReport<-function(localDaily = Daily, localSample = Sample, interactive=TRUE){ mergeReport<-function(Daily, Sample, interactive=TRUE){
if (interactive){ if (interactive){
dataOverview(localDaily, localSample) dataOverview(Daily, Sample)
} }
newSample <- merge(localDaily[,c("Date","Q","LogQ")],localSample,by = "Date",all.y = TRUE) newSample <- merge(Daily[,c("Date","Q","LogQ")],Sample,by = "Date",all.y = TRUE)
return(newSample) return(newSample)
} }
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