Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dataRetrieval
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Water
dataRetrieval
Commits
69037a63
Commit
69037a63
authored
10 years ago
by
Laura A DeCicco
Browse files
Options
Downloads
Patches
Plain Diff
Changed variable to not call global.
parent
5e2c42d9
No related branches found
No related tags found
1 merge request
!25
Crannifying.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
R/mergeReport.r
+7
-6
7 additions, 6 deletions
R/mergeReport.r
with
7 additions
and
6 deletions
R/mergeReport.r
+
7
−
6
View file @
69037a63
...
@@ -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
local
Daily dataframe containing the daily data, default is Daily
#' @param Daily dataframe containing the daily data, default is Daily
#' @param
local
Sample 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
(
local
Daily
,
local
Sample
)
dataOverview
(
Daily
,
Sample
)
}
}
newSample
<-
merge
(
local
Daily
[,
c
(
"Date"
,
"Q"
,
"LogQ"
)],
local
Sample
,
by
=
"Date"
,
all.y
=
TRUE
)
newSample
<-
merge
(
Daily
[,
c
(
"Date"
,
"Q"
,
"LogQ"
)],
Sample
,
by
=
"Date"
,
all.y
=
TRUE
)
return
(
newSample
)
return
(
newSample
)
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment