Skip to content

Commit 496c505

Browse files
jfisher-usgsjfisher-usgs
committed
Major changes with much of the src placed in inlmisc
1 parent 2125f34 commit 496c505

File tree

175 files changed

+8267
-9893
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+8267
-9893
lines changed

‎.Rbuildignore‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
.gitattributes
2-
.gitignore
3-
.RData
4-
.Rhistory
1+
^\.gitattributes$
2+
^\.gitignore$
3+
^\.RData$
4+
^\.Rhistory$
5+
^Makefile$
6+
^\.travis\.yml$
7+
58
extdata/.*[.]csv$
69
extdata/.*[.]kml$
710
extdata/.*[.]md$

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
/20*/
21
/.RData
32
/.Rhistory
43
/*.tar.gz
54
/*.zip
5+
6+
/src-i386
7+
/src-x64
8+
69
Thumbs.db

‎DESCRIPTION‎

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,44 @@
11
Package: wrv
2-
Type: Package
3-
Version: 1.0.3
4-
Date: 2016-8-12
52
Title: Wood River Valley Groundwater-Flow Model
6-
Author: Jason C. Fisher
7-
Maintainer: Jason C. Fisher <jfisher@usgs.gov>
8-
Depends: R (>= 3.2.0), sp, rgdal, raster
9-
Imports: methods, rgeos, igraph, dplyr
10-
Suggests: RCurl, knitr, xtable, sfsmisc, animation, viridis, colorspace
11-
SystemRequirements: PEST (>= 13.0, optional)
3+
Version: 1.1.0
4+
Authors@R: person("Jason", "Fisher", email="jfisher@usgs.gov", role=c("aut", "cre"))
125
Description: A processing program for the groundwater-flow model of the Wood
13-
River Valley aquifer system, south-central Idaho. Included in the package is
14-
MODFLOW-USG version 1.2, a U.S. Geological Survey groundwater-flow model.
6+
River Valley aquifer system, south-central Idaho. Included in the package is
7+
MODFLOW-USG version 1.3, a U.S. Geological Survey groundwater-flow model.
8+
Depends:
9+
R (>= 3.2.0)
10+
Imports:
11+
dplyr,
12+
grDevices,
13+
graphics,
14+
inlmisc,
15+
methods,
16+
sp,
17+
stats,
18+
raster,
19+
rgdal,
20+
rgeos
21+
Suggests:
22+
animation,
23+
dataRetrieval,
24+
git2r,
25+
knitr,
26+
leaflet,
27+
sfsmisc,
28+
viridis,
29+
xtable
30+
SystemRequirements: PEST (>= 13.0, optional)
1531
License: CC0
1632
Copyright: This software is in the public domain because it contains materials
17-
that originally came from the United States Geological Survey (USGS), an
18-
agency of the United States Department of Interior. For more information, see
19-
the official USGS copyright policy at
20-
http://www.usgs.gov/visual-id/credit_usgs.html#copyright
33+
that originally came from the United States Geological Survey (USGS), an
34+
agency of the United States Department of Interior. For more information,
35+
see the official USGS copyright policy at
36+
https://www2.usgs.gov/visual-id/credit_usgs.html
2137
URL: https://github.com/USGS-R/wrv
2238
BugReports: https://github.com/USGS-R/wrv/issues
23-
ByteCompile: yes
24-
LazyData: yes
39+
Encoding: UTF-8
40+
ByteCompile: true
41+
LazyData: true
2542
LazyDataCompression: xz
2643
VignetteBuilder: knitr
44+
RoxygenNote: 5.0.1

‎Makefile‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# prepare the package for release
2+
3+
PKGNAME := $(shell sed -n "s/Package: *\([^ ]*\)/\1/p" DESCRIPTION)
4+
PKGVERS := $(shell sed -n "s/Version: *\([^ ]*\)/\1/p" DESCRIPTION)
5+
PKGSRC := $(shell basename `pwd`)
6+
APPXC := sir20165080_AppendixC
7+
8+
all: docs install check clean
9+
10+
docs:
11+
R -q -e 'devtools::document()';\
12+
R -q -e 'devtools::clean_dll()';\
13+
14+
build:
15+
cd ..;\
16+
R CMD build --no-build-vignettes $(PKGSRC);\
17+
18+
install: build
19+
cd ..;\
20+
R CMD INSTALL $(PKGNAME)_$(PKGVERS).tar.gz;\
21+
22+
check:
23+
cd ..;\
24+
R CMD check --no-build-vignettes --as-cran $(PKGNAME)_$(PKGVERS).tar.gz;\
25+
26+
rd2tex:
27+
cd ..;\
28+
R CMD Rd2pdf --no-clean --no-preview --force $(PKGSRC);\
29+
cp -f .Rd2pdf*/Rd2.tex $(PKGSRC)/inst/misc;\
30+
$(RM) $(PKGSRC).pdf;\
31+
$(RM) -r .Rd2pdf*;\
32+
33+
vignettes: rd2tex
34+
R -q -e 'devtools::build_vignettes()';\
35+
R -q -e 'tools::compactPDF(paths='\''inst/doc'\'', gs_quality='\''ebook'\'')';\
36+
37+
datasets:
38+
cd ..;\
39+
R -q -e 'knitr::purl(input='\''$(PKGSRC)/vignettes/$(APPXC).Rnw'\'')';\
40+
Rscript $(APPXC).R
41+
mkdir -p $(PKGSRC)/data;\
42+
cp -i data/*.rda $(PKGSRC)/data;\
43+
$(RM) $(APPXC).R;\
44+
$(RM) -r data;\
45+
46+
clean:
47+
cd ..;\
48+
$(RM) -r $(PKGNAME).Rcheck/;\
49+
50+
.PHONY: all docs build install check rd2tex vignettes datasets clean

‎NAMESPACE‎

Lines changed: 9 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,9 @@
1-
2-
importFrom("grDevices", "axisTicks", "col2rgb", "dev.cur", "dev.new", "dev.off",
3-
"dev.size", "extendrange", "grey", "png", "rainbow", "xy.coords")
4-
importFrom("graphics", "abline", "arrows", "axTicks", "axis", "axis.Date",
5-
"box", "grconvertX", "grconvertY", "layout", "matplot", "mtext",
6-
"par", "plot.new", "plot.window", "polygon", "rect", "segments",
7-
"strheight", "strwidth", "symbols", "title")
8-
importFrom("methods", "as", "slot", "slot<-")
9-
importFrom("stats", "approxfun", "dist", "integrate", "median", "na.omit", "sd")
10-
importFrom("utils", "read.csv", "untar", "unzip", "write.csv", "write.table")
11-
12-
import("sp", "rgdal", "raster")
13-
14-
importFrom("rgeos", "append.poly", "gArea", "gBuffer", "gCentroid",
15-
"gDifference", "gDistance", "gIntersection", "gIntersects",
16-
"gIsValid", "gUnaryUnion", "gUnion")
17-
importFrom("igraph", "clusters")
18-
importFrom("dplyr", "arrange", "bind_rows", "filter", "group_by_", "left_join",
19-
"mutate", "summarise_")
20-
21-
export("AddBubbles",
22-
"AddColorKey",
23-
"AddInsetMap",
24-
"AddScaleBar",
25-
"BumpDisconnectCells",
26-
"BumpRiverStage",
27-
"DownloadFile",
28-
"ExportRasterStack",
29-
"ExtractAlongTransect",
30-
"GetDaysInMonth",
31-
"GetSeasonalMult",
32-
"GetWellConfig",
33-
"PlotCrossSection",
34-
"PlotGraph",
35-
"PlotMap",
36-
"ReadModflowBinary",
37-
"ReplaceInTemplate",
38-
"RmSmallCellChunks",
39-
"RunWaterBalance",
40-
"SetPolygons",
41-
"SummariseBudget",
42-
"ToScientific",
43-
"UpdateWaterBudget",
44-
"WriteModflowInput")
1+
# Generated by roxygen2: do not edit by hand
2+
3+
export(GetSeasonalMult)
4+
export(GetWellConfig)
5+
export(RunWaterBalance)
6+
export(UpdateWaterBudget)
7+
export(WriteModflowInput)
8+
import(raster)
9+
import(sp)

0 commit comments

Comments
 (0)