Skip to content

Commit d8c8452

Browse files
mountaindbozmountaindboz
authored
Merge pull request #44 from rosehartman/main
NCRO 2022 data
2 parents 321bbeb + 5b332ec commit d8c8452

28 files changed

+2493
-171
lines changed

‎DESCRIPTION

+28-39
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,22 @@
11
Package: discretewq
2-
Title: Integrated Dataset of Discrete Water Quality in the San Francisco Estuary
2+
Title: Integrated Dataset of Discrete Water Quality in the San Francisco
3+
Estuary
34
Version: 2.4.0.9000
4-
Authors@R:
5-
c(person(given = "Samuel M",
6-
family = "Bashevkin",
7-
role = c("aut", "cre"),
8-
email = "sam.bashevkin@waterboards.ca.gov",
5+
Authors@R: c(
6+
person("Samuel M", "Bashevkin", , "sam.bashevkin@waterboards.ca.gov", role = c("aut", "cre"),
97
comment = c(ORCID = "0000-0001-7406-7089")),
10-
person(given = "Dave",
11-
family = "Bosworth",
12-
role = c("aut"),
13-
email = "David.Bosworth@water.ca.gov",
8+
person("Dave", "Bosworth", , "David.Bosworth@water.ca.gov", role = "aut",
149
comment = c(ORCID = "0000-0003-0740-3390")),
15-
person(given = "Sarah",
16-
family = "Perry",
17-
role = c("aut"),
18-
email = "Sarah.Perry@water.ca.gov",
10+
person("Sarah", "Perry", , "Sarah.Perry@water.ca.gov", role = "aut",
1911
comment = c(ORCID = "0000-0002-2561-8195")),
20-
person(given = "Elizabeth B",
21-
family = "Stumpner",
22-
role = c("aut"),
23-
email = "Elizabeth.Stumpner@water.ca.gov",
12+
person("Elizabeth B", "Stumpner", , "Elizabeth.Stumpner@water.ca.gov", role = "aut",
2413
comment = c(ORCID = "0000-0003-2356-2244")),
25-
person(given = "Rosemary",
26-
family = "Hartman",
27-
role = c("ctb"),
28-
email = "Rosemary.Hartman@water.ca.gov",
29-
comment = c(ORCID = "0000-0002-0642-183X")))
30-
Description: Produce an integrated dataset of discrete water quality measurements using any combination of the 16 source datasets included.
14+
person("Rosemary", "Hartman", , "Rosemary.Hartman@water.ca.gov", role = "ctb",
15+
comment = c(ORCID = "0000-0002-0642-183X"))
16+
)
17+
Description: Produce an integrated dataset of discrete water quality
18+
measurements using any combination of the 17 source datasets included.
3119
License: GPL-3
32-
Encoding: UTF-8
33-
LazyData: true
34-
LazyDataCompression: xz
35-
Roxygen: list(markdown = TRUE)
36-
RoxygenNote: 7.2.3
37-
Suggests:
38-
readr,
39-
purrr,
40-
spelling,
41-
testthat,
42-
covr,
43-
tibble,
44-
readxl,
45-
hms,
46-
dataRetrieval
4720
Depends:
4821
R (>= 2.10)
4922
Imports:
@@ -53,6 +26,22 @@ Imports:
5326
stringr,
5427
tidyr,
5528
wql
29+
Suggests:
30+
conflicted,
31+
covr,
32+
dataRetrieval,
33+
hms,
34+
purrr,
35+
readr,
36+
readxl,
37+
spelling,
38+
testthat,
39+
tibble
5640
Remotes:
5741
InteragencyEcologicalProgram/deltamapr
42+
Encoding: UTF-8
5843
Language: en-US
44+
LazyData: true
45+
LazyDataCompression: xz
46+
Roxygen: list(markdown = TRUE)
47+
RoxygenNote: 7.2.3

‎NEWS.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# discretewq (development version)
22

3+
* Added `DOP` water quality data.
4+
35
# discretewq 2.4.0
46

57
* Added temperature and conductivity to `USGS_CAWSC`

‎R/data.R

+35-1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,40 @@
8282
"DJFMP"
8383

8484

85+
# DOP -------------------------------------------------------------------
86+
87+
#' Directed Outflow Project water quality data
88+
#'
89+
#' Water quality data from the ICF/USBR Directed Outflow Project.
90+
#'
91+
#' @encoding UTF-8
92+
#' @format a tibble with 3,473 rows and 16 variables
93+
#' \describe{
94+
#' \item{Source}{Name of the source dataset.}
95+
#' \item{Station}{Station where sample was collected. Includes Station_Code
96+
#' and Habitat from the source dataset because multiple habitats are collected
97+
#' at each station.}
98+
#' \item{Latitude}{Latitude at start of zooplankton tow in decimal degrees.}
99+
#' \item{Longitude}{Longitude at start of zooplankton tow in decimal degrees.}
100+
#' \item{Field_coords}{Were lat/long coordinates collected in the field (TRUE), or do they represent the location of a fixed station (FALSE)?}
101+
#' \item{Date}{Date sample was collected.}
102+
#' \item{Datetime}{Date and time of sample collection.}
103+
#' \item{Depth}{Bottom depth at start of trawl (m).}
104+
#' \item{Secchi}{Secchi depth (cm).}
105+
#' \item{Temperature}{Temperature (°C) at surface.}
106+
#' \item{Salinity}{Salinity at surface.}
107+
#' \item{Conductivity}{Specific conductance (\eqn{\mu}S \ifelse{html}{\out{cm<sup>-1</sup>}}{\eqn{cm^{-1}}}) at surface.}
108+
#' \item{DissolvedOxygen}{Dissolved oxygen (mg/L) at surface.}
109+
#' \item{pH}{pH (dimensionless) at surface.}
110+
#' \item{TurbidityFNU}{Turbidity (FNU) at surface.}
111+
#' \item{Chlorophyll}{Chlorophyll-a concentration (\eqn{\mu}g \ifelse{html}{\out{L<sup>-1</sup>}}{\eqn{L^{-1}}}) at surface.}
112+
#' }
113+
#'
114+
#' @details More metadata and information on methods are available \href{https://portal.edirepository.org/nis/metadataviewer?packageid=edi.1187.4}{here}.
115+
#' @seealso \code{\link{wq}}
116+
"DOP"
117+
118+
85119
# EDSM --------------------------------------------------------------------
86120

87121
#' EDSM water quality data
@@ -234,7 +268,7 @@
234268
#' Water quality data from the California Department of Water Resources North Central Region Office.
235269
#'
236270
#' @encoding UTF-8
237-
#' @format a tibble with 10,250 rows and 49 variables
271+
#' @format a tibble with 10,652 rows and 49 variables
238272
#' \describe{
239273
#' \item{Source}{Name of the source dataset.}
240274
#' \item{Station}{Station where sample was collected.}

‎R/wq.R

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#' Choices include "20mm" (20mm Survey, \code{\link{twentymm}}),
66
#' "Baystudy" (Bay Study, \code{\link{baystudy}}),
77
#' "DJFMP" (Delta Juvenile Fish Monitoring Program, \code{\link{DJFMP}}),
8+
#' "DOP" (Directed Outflow Project \code{\link{DOP}})),
89
#' "EDSM" (Enhanced Delta Smelt Monitoring, \code{\link{EDSM}}),
910
#' "EMP" (Environmental Monitoring Program, \code{\link{EMP}}),
1011
#' "FMWT" (Fall Midwater Trawl, \code{\link{FMWT}}),
@@ -29,6 +30,7 @@
2930
#' "20mm",
3031
#' "Baystudy",
3132
#' "DJFMP",
33+
#' "DOP",
3234
#' "EDSM",
3335
#' "EMP",
3436
#' "FMWT",
@@ -60,6 +62,7 @@ wq <- function(Sources = NULL,
6062
"20mm",
6163
"Baystudy",
6264
"DJFMP",
65+
"DOP",
6366
"EDSM",
6467
"EMP",
6568
"FMWT",
@@ -105,6 +108,10 @@ wq <- function(Sources = NULL,
105108
WQ_list[["DJFMP"]] <- discretewq::DJFMP
106109
}
107110

111+
if ("DOP" %in% Sources) {
112+
WQ_list[["DOP"]] <- discretewq::DOP
113+
}
114+
108115
if ("EDSM" %in% Sources) {
109116
WQ_list[["EDSM"]] <- discretewq::EDSM
110117
}

‎README.Rmd

+4-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Data <- wq(
4646
"20mm",
4747
"Baystudy",
4848
"DJFMP",
49+
"DOP",
4950
"EDSM",
5051
"EMP",
5152
"FMWT",
@@ -81,7 +82,7 @@ CDFW. 2023a. Fall Midwater Trawl data. [https://filelib.wildlife.ca.gov/public/T
8182

8283
CDFW. 2023b. Summer Townet data. [https://filelib.wildlife.ca.gov/public/TownetFallMidwaterTrawl/TNS%20MS%20Access%20Data/TNS%20data/](https://filelib.wildlife.ca.gov/public/TownetFallMidwaterTrawl/TNS%20MS%20Access%20Data/TNS%20data/).
8384

84-
CDWR. 2022. Water Quality Evaluation Section, North Central Region Office. [https://wdl.water.ca.gov/waterdatalibrary/WaterQualityDataLib.aspx](https://wdl.water.ca.gov/waterdatalibrary/WaterQualityDataLib.aspx).
85+
CDWR. 2023. Water Quality Evaluation Section, North Central Region Office. [https://wdl.water.ca.gov/waterdatalibrary/WaterQualityDataLib.aspx](https://wdl.water.ca.gov/waterdatalibrary/WaterQualityDataLib.aspx).
8586

8687
Cloern, J. E., and T. S. Schraga. 2016. USGS Measurements of Water Quality in San Francisco Bay (CA), 1969-2015 (ver. 3.0 June 2017). U. S. Geological Survey data release. [doi:https://doi.org/10.5066/F7TQ5ZPR](https://doi.org/10.5066/F7TQ5ZPR)
8788

@@ -103,6 +104,8 @@ O’Rear, T., J. Durand, and P. Moyle. 2022. Suisun Marsh Fish Study. [https://w
103104

104105
Schraga, T. S., E. S. Nejad, C. A. Martin, and J. E. Cloern. 2020. USGS measurements of water quality in San Francisco Bay (CA), beginning in 2016 (ver. 3.0, March 2020). U. S. Geological Survey data release. [doi:https://doi.org/10.5066/F7D21WGF](https://doi.org/10.5066/F7D21WGF)
105106

107+
Schultz, A. A. and A. J. Kalmbach. 2023. Directed Outflow Project Lower Trophic Study ver 4. Environmental Data Initiative. [doi:10.6073/pasta/86a01140eb3bb756ee9f7f8dab8aefc4](https://portal.edirepository.org/nis/metadataviewer?packageid=edi.1187.4).
108+
106109
United States Fish and Wildlife Service, T. Senegal, R. Mckenzie, J. Speegle, B. Perales, D. Bridgman, K. Erly, S. Staiger, A. Arrambide, and M. Gilbert. 2022. Interagency Ecological Program and US Fish and Wildlife Service: San Francisco Estuary Enhanced Delta Smelt Monitoring Program data, 2016-2021 ver 8. Environmental Data Initiative. [doi:10.6073/pasta/e1a540c161b7be56b941df50fd7b44c5](https://portal.edirepository.org/nis/metadataviewer?packageid=edi.415.8)
107110

108111
U.S. Geological Survey. 2022. USGS water data for the Nation: U.S. Geological Survey National Water Information System database, accessed October 21, 2022, at

0 commit comments

Comments
 (0)