Merge pull request #23 from jfisher-usgs/master

Merge with upstream

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: wrv
 Title: Wood River Valley Groundwater-Flow Model
-Version: 1.1.6
+Version: 1.1.7
 Authors@R: c(
     person(given=c("Jason", "C."), family="Fisher", role=c("aut", "cre"), email="[email protected]", comment=c(ORCID="0000-0001-9032-8912")),
     person(given=c("Allan", "H."), family="Wylie", role="ctb", email="[email protected]"),
@@ -43,4 +43,4 @@ ByteCompile: true
 LazyData: true
 LazyDataCompression: xz
 VignetteBuilder: knitr
-RoxygenNote: 6.1.1
+RoxygenNote: 7.1.1

Makefile

@@ -15,7 +15,9 @@ APPXC   := sir20165080_AppendixC
 all: docs rd2tex install check clean
 
 docs:
-	R -q -e 'pkgload::load_all();roxygen2::roxygenize();pkgbuild::clean_dll()';\
+	R -q -e 'pkgload::load_all()';\
+	R -q -e 'roxygen2::roxygenize()';\
+	R -q -e 'pkgbuild::clean_dll()';\
 
 build:
 	cd ..;\

NEWS.md

@@ -1,3 +1,7 @@
+# wrv 1.1.7
+
+- Change package installation instructions to reflect that [GRAN](https://owi.usgs.gov/R/gran.html) is being decommissioned.
+
 # wrv 1.1.6
 
 - Fix bug in appendix D that was droping `"flow.sum"` column name when aggregating flows.

R/data.R

@@ -572,7 +572,7 @@
 #' ylab <- paste("Discharge in cubic", c("meters per day", "acre-foot per year"))
 #' inlmisc::PlotGraph(gage.disch, ylab = ylab, col = col, lty = 1:3,
 #'                    conversion.factor = 0.29611, seq.date.by = "year")
-#' leg <- sprintf("USGS \%s", names(gage.disch)[-1])
+#' leg <- sprintf("USGS %s", names(gage.disch)[-1])
 #' legend("topright", leg, col = col, lty = 1:3, inset = 0.02, cex = 0.7,
 #'        box.lty = 1, bg = "#FFFFFFE7")
 #'
@@ -621,7 +621,7 @@
 #' ylab <- paste("Gage height in", c("meters", "feet"))
 #' inlmisc::PlotGraph(gage.height, ylab = ylab, col = col, lty = 1:3,
 #'                    conversion.factor = 3.28084, seq.date.by = "year")
-#' leg <- sprintf("USGS \%s", names(gage.height)[-1])
+#' leg <- sprintf("USGS %s", names(gage.height)[-1])
 #' legend("topright", leg, col = col, lty = 1:3, inset = 0.02, cex = 0.7,
 #'        box.lty = 1, bg = "#FFFFFFE7")
 #'
@@ -1186,7 +1186,7 @@
 #' str(precipitation)
 #'
 #' d <- precipitation
-#' d <- data.frame(Date = as.Date(paste0(d$YearMonth, "15"), format = "\%Y\%m\%d"),
+#' d <- data.frame(Date = as.Date(paste0(d$YearMonth, "15"), format = "%Y%m%d"),
 #'                 Precip = d$Precip)
 #' zones <- c("Hailey", "Ketchum", "Picabo")
 #' d1 <- d[precipitation$PrecipZone == zones[1], ]

README.md

@@ -15,19 +15,13 @@ a U.S. Geological Survey (USGS) computer code that solves the groundwater-flow e
 
 ## Install
 
-You can install the stable version of **wrv** from [GRAN](https://owi.usgs.gov/R/gran.html),
-and its dependencies from [CRAN](https://cran.r-project.org/), using the following commands:
+You can install **wrv** from [GitHub](https://github.com/USGS-R/wrv),
+and its dependencies from [CRAN](https://cran.r-project.org/),
+using the following commands:
 
 ```r
-repos <- c("https://owi.usgs.gov/R", "https://cloud.r-project.org/")
-update.packages(ask = FALSE, repos = repos)
-install.packages("wrv", repos = repos, dependencies = TRUE)
-```
-
-Or use **devtools** to install the development version from GitHub.
-
-```r
-devtools::install_github("USGS-R/wrv", dependencies = TRUE)
+if (!requireNamespace("remotes")) install.packages("remotes")
+remotes::install_github("USGS-R/wrv", dependencies = TRUE)
 ```
 
 ## Run