Merge pull request #18 from jfisher-usgs/master

Merge with upstream

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: wrv
 Title: Wood River Valley Groundwater-Flow Model
-Version: 1.1.4
+Version: 1.1.5
 Authors@R: c(
     person(given=c("Jason", "C."), family="Fisher", role=c("aut", "cre"), email="jfisher@usgs.gov", comment=c(ORCID="0000-0001-9032-8912")),
     person(given=c("Allan", "H."), family="Wylie", role="ctb", email="Allan.Wylie@idwr.idaho.gov"),
@@ -43,4 +43,4 @@ ByteCompile: true
 LazyData: true
 LazyDataCompression: xz
 VignetteBuilder: knitr
-RoxygenNote: 6.0.1
+RoxygenNote: 6.1.0

NEWS.md

@@ -1,3 +1,9 @@
+# wrv 1.1.5
+
+- In `inlmisc::AddScaleBar` function calls, remove `offset` argument and replace with `inset`.
+
+- In `inlmisc::PlotGraph` function calls, change `fill` argument.
+
 # wrv 1.1.4
 
 - Substitute the recommended **viridis** package for its 'lite' version **viridisLite**.

inst/doc/sir20165080_AppendixD.R

@@ -828,7 +828,7 @@ d[d[, 2] < 0, 2] <- 0
 d[d[, 3] > 0, 3] <- 0
 ylab <- paste("Total flow across water table, in", c("cubic meters per day", "acre-feet per year"))
 col <- c("#67A9CF", "#C80C0B")
-PlotGraph(d, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(d, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=TRUE,
           center.date.labels=TRUE, seq.date.by="year")
 legend("topright", c("Recharge", "Discharge"), col=col, lty=1,
@@ -844,7 +844,7 @@ y <- c(y, y[length(y)])
 x <- tr.stress.periods
 ylab <- paste("Total withdrawals from wells, in", c("cubic meters per day", "acre-feet per year"))
 col <- "#C80C0B"
-PlotGraph(x, y, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(x, y, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=TRUE,
           center.date.labels=TRUE, seq.date.by="year")
 
@@ -907,7 +907,7 @@ x <- tr.stress.periods
 y <- rbind(m, m[nrow(m), , drop=FALSE])
 ylab <- paste("Seepage rate, in", c("cubic meters per day", "acre-feet per year"))
 col <- "#67A9CF"
-PlotGraph(x, y, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(x, y, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=c(FALSE, TRUE, FALSE),
           center.date.labels=TRUE, seq.date.by="year")
 
@@ -922,7 +922,7 @@ x <- tr.stress.periods
 y <- rbind(m, m[nrow(m), , drop=FALSE])
 ylab <- paste("Seepage rate, in", c("cubic meters per day", "acre-feet per year"))
 col <- "#67A9CF"
-PlotGraph(x, y, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(x, y, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=FALSE,
           center.date.labels=TRUE, seq.date.by="year")
 
@@ -1490,7 +1490,7 @@ ylab <- paste("Total stream-aquifer flow exchange, in", c("cubic meters per day"
 d[d[, 2] < 0, 2] <- 0
 d[d[, 3] > 0, 3] <- 0
 col <- c("#67A9CF", "#C80C0B")
-PlotGraph(d, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(d, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=TRUE,
           center.date.labels=TRUE, seq.date.by="year")
 legend("bottomright", c("Recharge", "Discharge"), col=col, lty=1,
@@ -1738,7 +1738,7 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 ## ----graph_drain_stn_cross, echo=FALSE, fig.width=fin.graph.short[1], fig.height=fin.graph.short[2], fig.scap=sprintf("{%s}", v[1]), fig.cap=sprintf("{%s}", v[2])----
 ylab <- paste("Groundwater discharge, in", c("cubic meters per day", "acre-feet per year"))
 col <- "#C80C0B"
-PlotGraph(d.drain.1, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(d.drain.1, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=FALSE,
           center.date.labels=TRUE, seq.date.by="year")
 
@@ -1749,7 +1749,7 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 ## ----graph_drain_silver_crk, echo=FALSE, fig.width=fin.graph.short[1], fig.height=fin.graph.short[2], fig.scap=sprintf("{%s}", v[1]), fig.cap=sprintf("{%s}", v[2])----
 ylab <- paste("Groundwater discharge, in", c("cubic meters per day", "acre-feet per year"))
 col <- "#C80C0B"
-PlotGraph(d.drain.2, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(d.drain.2, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=FALSE,
           center.date.labels=TRUE, seq.date.by="year")
 
@@ -1963,7 +1963,7 @@ legend("topleft",
        col=c("#F02311", "#F0D878", "#7FAF1B"), pt.bg=c(NA, "#F0D878", "#7FAF1B"),
        pt.lwd=1, pt.cex=1, inset=0.02, cex=0.7, box.lty=1, box.lwd=0.5,
        bg="#FFFFFFE7", title=expression(bold("EXPLANATION")))
-AddScaleBar(asp=1, "m", loc="topright", offset=c(-0.4, -0.5))
+AddScaleBar(unit="m", loc="topright", inset=0.1)
 plt <- c(grconvertX(loc[1:2], "user", "nfc"), grconvertY(loc[3:4], "user", "nfc"))
 par(plt=plt, bg="#FFFFFFCC", new=TRUE)
 m <- seq(0.5 - buff, dim(r)[1] + 0.5 + buff, by=1)

inst/doc/sir20165080_AppendixD.Rnw

@@ -1460,7 +1460,7 @@ d[d[, 2] < 0, 2] <- 0
 d[d[, 3] > 0, 3] <- 0
 ylab <- paste("Total flow across water table, in", c("cubic meters per day", "acre-feet per year"))
 col <- c("#67A9CF", "#C80C0B")
-PlotGraph(d, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(d, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=TRUE,
           center.date.labels=TRUE, seq.date.by="year")
 legend("topright", c("Recharge", "Discharge"), col=col, lty=1,
@@ -1478,7 +1478,7 @@ y <- c(y, y[length(y)])
 x <- tr.stress.periods
 ylab <- paste("Total withdrawals from wells, in", c("cubic meters per day", "acre-feet per year"))
 col <- "#C80C0B"
-PlotGraph(x, y, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(x, y, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=TRUE,
           center.date.labels=TRUE, seq.date.by="year")
 @
@@ -1553,7 +1553,7 @@ x <- tr.stress.periods
 y <- rbind(m, m[nrow(m), , drop=FALSE])
 ylab <- paste("Seepage rate, in", c("cubic meters per day", "acre-feet per year"))
 col <- "#67A9CF"
-PlotGraph(x, y, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(x, y, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=c(FALSE, TRUE, FALSE),
           center.date.labels=TRUE, seq.date.by="year")
 @
@@ -1570,7 +1570,7 @@ x <- tr.stress.periods
 y <- rbind(m, m[nrow(m), , drop=FALSE])
 ylab <- paste("Seepage rate, in", c("cubic meters per day", "acre-feet per year"))
 col <- "#67A9CF"
-PlotGraph(x, y, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(x, y, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=FALSE,
           center.date.labels=TRUE, seq.date.by="year")
 @
@@ -2412,7 +2412,7 @@ ylab <- paste("Total stream-aquifer flow exchange, in", c("cubic meters per day"
 d[d[, 2] < 0, 2] <- 0
 d[d[, 3] > 0, 3] <- 0
 col <- c("#67A9CF", "#C80C0B")
-PlotGraph(d, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(d, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=TRUE,
           center.date.labels=TRUE, seq.date.by="year")
 legend("bottomright", c("Recharge", "Discharge"), col=col, lty=1,
@@ -2782,7 +2782,7 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 <<graph_drain_stn_cross, echo=FALSE, fig.width=fin.graph.short[1], fig.height=fin.graph.short[2], fig.scap=sprintf("{%s}", v[1]), fig.cap=sprintf("{%s}", v[2])>>=
 ylab <- paste("Groundwater discharge, in", c("cubic meters per day", "acre-feet per year"))
 col <- "#C80C0B"
-PlotGraph(d.drain.1, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(d.drain.1, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=FALSE,
           center.date.labels=TRUE, seq.date.by="year")
 @
@@ -2795,7 +2795,7 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 <<graph_drain_silver_crk, echo=FALSE, fig.width=fin.graph.short[1], fig.height=fin.graph.short[2], fig.scap=sprintf("{%s}", v[1]), fig.cap=sprintf("{%s}", v[2])>>=
 ylab <- paste("Groundwater discharge, in", c("cubic meters per day", "acre-feet per year"))
 col <- "#C80C0B"
-PlotGraph(d.drain.2, ylab=ylab, col=col, fill=paste0(col, "66"),
+PlotGraph(d.drain.2, ylab=ylab, col=col, fill="tozeroy",
           conversion.factor=m3.per.d.to.af.per.yr, scientific=FALSE,
           center.date.labels=TRUE, seq.date.by="year")
 @
@@ -3012,7 +3012,7 @@ legend("topleft",
        col=c("#F02311", "#F0D878", "#7FAF1B"), pt.bg=c(NA, "#F0D878", "#7FAF1B"),
        pt.lwd=1, pt.cex=1, inset=0.02, cex=0.7, box.lty=1, box.lwd=0.5,
        bg="#FFFFFFE7", title=expression(bold("EXPLANATION")))
-AddScaleBar(asp=1, "m", loc="topright", offset=c(-0.4, -0.5))
+AddScaleBar(unit="m", loc="topright", inset=0.1)
 plt <- c(grconvertX(loc[1:2], "user", "nfc"), grconvertY(loc[3:4], "user", "nfc"))
 par(plt=plt, bg="#FFFFFFCC", new=TRUE)
 m <- seq(0.5 - buff, dim(r)[1] + 0.5 + buff, by=1)

inst/doc/sir20165080_AppendixE.R

@@ -190,8 +190,7 @@ p <- DrawEllipse(mean(xlim), land.elev - depth.to.water,
 polygon(p, border=NA, col=cols[2], lty=1, lwd=1)
 polygon(c(xlim, rev(xlim)), c(rep(land.elev, 2), rep(land.elev, 2) - depth.to.water),
         border=NA, col=cols[1])
-AddScaleBar(asp, unit="meters", loc="bottomright", offset=c(-0.3, 0.1),
-            lab.vert.exag=TRUE)
+AddScaleBar(unit="meters", vert.exag=asp, loc="bottom", inset=0.12)
 legend("bottom", leg, fill=cols, horiz=TRUE, inset=-0.15,
        cex=0.7, bty="n", xpd=TRUE, xjust=0.5, yjust=0, border=NA)
 text(xlim[1], ylim[2], "B",  cex=0.7, pos=3, font=4)
@@ -292,10 +291,9 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 ylab <- paste("Tributary basin underflow, in", c("cubic meters per day", "acre-feet per year"))
 labs <- paste0(mo, "-month sampling window")
 cols <- c("#00C176", "#1F1F1F")
-fill <- paste0(cols, c("98", "4E"))
 d <- rbind(d.dt, d.dt[nrow(d.dt), , drop=FALSE])
 d[nrow(d), "Date"] <- d[nrow(d), "Date"] + diff(d$Date)[1]
-PlotGraph(d, ylab=ylab, col=cols, fill=fill, conversion.factor=m3.per.d.to.af.per.yr,
+PlotGraph(d, ylab=ylab, col=cols, fill="tozeroy", conversion.factor=m3.per.d.to.af.per.yr,
           center.date.labels=TRUE, scientific=c(FALSE, FALSE, FALSE),
           seq.date.by="year")
 legend("topright", labs, col=cols, lty=1, inset=0.02, cex=0.7,
@@ -308,10 +306,9 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 ## ----graph_flow_rf, echo=FALSE, fig.width=fin.graph.short[1], fig.height=fin.graph.short[2], fig.scap=sprintf("{%s}", v[1]), fig.cap=sprintf("{%s}", v[2])----
 labs <- paste("Reduction factor of", rf)
 cols <- c("#F02311", "#1F1F1F")
-fill <- paste0(cols, c("98", "4E"))
 d <- rbind(d.rf, d.rf[nrow(d.rf), , drop=FALSE])
 d[nrow(d), "Date"] <- d[nrow(d), "Date"] + diff(d$Date)[1]
-PlotGraph(d, ylab=ylab, col=cols, fill=fill, conversion.factor=m3.per.d.to.af.per.yr,
+PlotGraph(d, ylab=ylab, col=cols, fill="tozeroy", conversion.factor=m3.per.d.to.af.per.yr,
           center.date.labels=TRUE, scientific=c(FALSE, FALSE, FALSE),
           seq.date.by="year")
 legend("topright", labs, col=cols, lty=1, inset=0.02, cex=0.7,
@@ -324,10 +321,9 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 ## ----graph_flow_av, echo=FALSE, fig.width=fin.graph.short[1], fig.height=fin.graph.short[2], fig.scap=sprintf("{%s}", v[1]), fig.cap=sprintf("{%s}", v[2])----
 labs <- paste(av * 100, "percent")
 cols <- c("#02779E", "#1F1F1F", "#FFCC00")
-fill <- paste0(cols, "4E")
 d <- rbind(d.av, d.av[nrow(d.av), , drop=FALSE])
 d[nrow(d), "Date"] <- d[nrow(d), "Date"] + diff(d$Date)[1]
-PlotGraph(d, ylab=ylab, col=cols, fill=fill, conversion.factor=m3.per.d.to.af.per.yr,
+PlotGraph(d, ylab=ylab, col=cols, fill="tozeroy", conversion.factor=m3.per.d.to.af.per.yr,
           center.date.labels=TRUE, scientific=c(FALSE, FALSE, FALSE),
           seq.date.by="year")
 legend("topright", labs, col=cols, lty=1, inset=0.02, cex=0.7,

inst/doc/sir20165080_AppendixE.Rnw

@@ -361,8 +361,7 @@ RotateLine <- function(m, ang=90) {
     polygon(p, border=NA, col=cols[2], lty=1, lwd=1)
     polygon(c(xlim, rev(xlim)), c(rep(land.elev, 2), rep(land.elev, 2) - depth.to.water),
             border=NA, col=cols[1])
-    AddScaleBar(asp, unit="meters", loc="bottomright", offset=c(-0.3, 0.1),
-                lab.vert.exag=TRUE)
+    AddScaleBar(unit="meters", vert.exag=asp, loc="bottom", inset=0.12)
     legend("bottom", leg, fill=cols, horiz=TRUE, inset=-0.15,
            cex=0.7, bty="n", xpd=TRUE, xjust=0.5, yjust=0, border=NA)
     text(xlim[1], ylim[2], "B",  cex=0.7, pos=3, font=4)
@@ -714,10 +713,9 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 ylab <- paste("Tributary basin underflow, in", c("cubic meters per day", "acre-feet per year"))
 labs <- paste0(mo, "-month sampling window")
 cols <- c("#00C176", "#1F1F1F")
-fill <- paste0(cols, c("98", "4E"))
 d <- rbind(d.dt, d.dt[nrow(d.dt), , drop=FALSE])
 d[nrow(d), "Date"] <- d[nrow(d), "Date"] + diff(d$Date)[1]
-PlotGraph(d, ylab=ylab, col=cols, fill=fill, conversion.factor=m3.per.d.to.af.per.yr,
+PlotGraph(d, ylab=ylab, col=cols, fill="tozeroy", conversion.factor=m3.per.d.to.af.per.yr,
           center.date.labels=TRUE, scientific=c(FALSE, FALSE, FALSE),
           seq.date.by="year")
 legend("topright", labs, col=cols, lty=1, inset=0.02, cex=0.7,
@@ -732,10 +730,9 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 <<graph_flow_rf, echo=FALSE, fig.width=fin.graph.short[1], fig.height=fin.graph.short[2], fig.scap=sprintf("{%s}", v[1]), fig.cap=sprintf("{%s}", v[2])>>=
 labs <- paste("Reduction factor of", rf)
 cols <- c("#F02311", "#1F1F1F")
-fill <- paste0(cols, c("98", "4E"))
 d <- rbind(d.rf, d.rf[nrow(d.rf), , drop=FALSE])
 d[nrow(d), "Date"] <- d[nrow(d), "Date"] + diff(d$Date)[1]
-PlotGraph(d, ylab=ylab, col=cols, fill=fill, conversion.factor=m3.per.d.to.af.per.yr,
+PlotGraph(d, ylab=ylab, col=cols, fill="tozeroy", conversion.factor=m3.per.d.to.af.per.yr,
           center.date.labels=TRUE, scientific=c(FALSE, FALSE, FALSE),
           seq.date.by="year")
 legend("topright", labs, col=cols, lty=1, inset=0.02, cex=0.7,
@@ -750,10 +747,9 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 <<graph_flow_av, echo=FALSE, fig.width=fin.graph.short[1], fig.height=fin.graph.short[2], fig.scap=sprintf("{%s}", v[1]), fig.cap=sprintf("{%s}", v[2])>>=
 labs <- paste(av * 100, "percent")
 cols <- c("#02779E", "#1F1F1F", "#FFCC00")
-fill <- paste0(cols, "4E")
 d <- rbind(d.av, d.av[nrow(d.av), , drop=FALSE])
 d[nrow(d), "Date"] <- d[nrow(d), "Date"] + diff(d$Date)[1]
-PlotGraph(d, ylab=ylab, col=cols, fill=fill, conversion.factor=m3.per.d.to.af.per.yr,
+PlotGraph(d, ylab=ylab, col=cols, fill="tozeroy", conversion.factor=m3.per.d.to.af.per.yr,
           center.date.labels=TRUE, scientific=c(FALSE, FALSE, FALSE),
           seq.date.by="year")
 legend("topright", labs, col=cols, lty=1, inset=0.02, cex=0.7,

inst/doc/sir20165080_AppendixF.R

@@ -112,7 +112,7 @@ d <- d[order(d$MonthDay), ]
 col <- c("#1B9E77", "#D95F02", "#7570B3")
 ylab <- paste("Snow water equivalent, in", c("meters", "inches"))
 xlim <- range(d[, 1])
-PlotGraph(d, xlim=xlim, ylab=ylab, col=col, fill=paste0(col, "66"), lty=1,
+PlotGraph(d, xlim=xlim, ylab=ylab, col=col, fill="tozeroy", lty=1,
           seq.date.by="month", conversion.factor=39.3701,
           center.date.labels=TRUE)
 xat <- seq(xlim[1], xlim[2], by="month")
@@ -141,7 +141,7 @@ FUN <- function(i, col) {
   d[nrow(d), 1] <- d[nrow(d), 1] + diff(d[, 1])[1]
   ylab <- paste("Monthly precipitation, in", c("meters", "feet"))
   col <- c(col, "#333333")
-  PlotGraph(d, ylab=ylab, col=col, fill=paste0(col, "66"), lty=1,
+  PlotGraph(d, ylab=ylab, col=col, fill="tozeroy", lty=1,
             conversion.factor=m.to.ft, center.date.labels=TRUE,
             seq.date.by="year")
   leg <- c("Adjusted for spring melt", "Recorded at weather station")

inst/doc/sir20165080_AppendixF.Rnw

@@ -268,7 +268,7 @@ d <- d[order(d$MonthDay), ]
 col <- c("#1B9E77", "#D95F02", "#7570B3")
 ylab <- paste("Snow water equivalent, in", c("meters", "inches"))
 xlim <- range(d[, 1])
-PlotGraph(d, xlim=xlim, ylab=ylab, col=col, fill=paste0(col, "66"), lty=1,
+PlotGraph(d, xlim=xlim, ylab=ylab, col=col, fill="tozeroy", lty=1,
           seq.date.by="month", conversion.factor=39.3701,
           center.date.labels=TRUE)
 xat <- seq(xlim[1], xlim[2], by="month")
@@ -355,7 +355,7 @@ FUN <- function(i, col) {
   d[nrow(d), 1] <- d[nrow(d), 1] + diff(d[, 1])[1]
   ylab <- paste("Monthly precipitation, in", c("meters", "feet"))
   col <- c(col, "#333333")
-  PlotGraph(d, ylab=ylab, col=col, fill=paste0(col, "66"), lty=1,
+  PlotGraph(d, ylab=ylab, col=col, fill="tozeroy", lty=1,
             conversion.factor=m.to.ft, center.date.labels=TRUE,
             seq.date.by="year")
   leg <- c("Adjusted for spring melt", "Recorded at weather station")

inst/doc/sir20165080_AppendixH.R

@@ -530,7 +530,7 @@ ylab <- paste("Stream-aquifer flow exchange, in", c("cubic meters per day", "cub
 xlim <- as.Date(c("1995-01-01", "2011-01-01"), tz="MST")
 d <- d.rech[, c("Date", "nKet_Hai")]
 col <- "#C80C0B"
-PlotGraph(d, ylab=ylab, xlim=xlim, col=col, fill=paste0(col, "66"),
+PlotGraph(d, ylab=ylab, xlim=xlim, col=col, fill="tozeroy",
           conversion.factor=1 / cfs.to.m3.per.d,
           scientific=c(FALSE, TRUE, FALSE), center.date.labels=TRUE,
           seq.date.by="year")
@@ -545,7 +545,7 @@ d[, 3] <- d[, 2]
 d[!is.na(d[, 2]) & d[, 2] < 0, 2] <- 0
 d[!is.na(d[, 3]) & d[, 3] > 0, 3] <- 0
 col <- c("#67A9CF", "#C80C0B")
-PlotGraph(d, ylab=ylab, xlim=xlim, col=col, fill=paste0(col, "66"),
+PlotGraph(d, ylab=ylab, xlim=xlim, col=col, fill="tozeroy",
           conversion.factor=1 / cfs.to.m3.per.d,
           scientific=c(FALSE, TRUE, FALSE), center.date.labels=TRUE,
           seq.date.by="year")
@@ -559,7 +559,7 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 ## ----graph_willowcr, echo=FALSE, fig.width=fin.graph.short[1], fig.height=fin.graph.short[2], fig.scap=sprintf("{%s}", v[1]), fig.cap=sprintf("{%s}", v[2])----
 d <- d.rech[, c("Date", "WillowCr")]
 col <- "#C80C0B"
-PlotGraph(d, ylab=ylab, xlim=xlim, col=col, fill=paste0(col, "66"),
+PlotGraph(d, ylab=ylab, xlim=xlim, col=col, fill="tozeroy",
           conversion.factor=1 / cfs.to.m3.per.d,
           scientific=c(FALSE, TRUE, FALSE), center.date.labels=TRUE,
           seq.date.by="year")
@@ -571,7 +571,7 @@ v <- c(paste("Graph showing", paste0(tolower(substr(v, 1, 1)), substr(v, 2, ncha
 ## ----graph_silverabv, echo=FALSE, fig.width=fin.graph.short[1], fig.height=fin.graph.short[2], fig.scap=sprintf("{%s}", v[1]), fig.cap=sprintf("{%s}", v[2])----
 d <- d.rech[, c("Date", "SilverAbv")]
 col <- "#C80C0B"
-PlotGraph(d, ylab=ylab, xlim=xlim, col=col, fill=paste0(col, "66"),
+PlotGraph(d, ylab=ylab, xlim=xlim, col=col, fill="tozeroy",
           conversion.factor=1 / cfs.to.m3.per.d,
           scientific=c(FALSE, TRUE, FALSE), center.date.labels=TRUE,
           seq.date.by="year")