Merge pull request #85 from boshek/master

Merging in split and merge algorithm

.Rbuildignore

@@ -3,4 +3,5 @@ changelog.txt
 .travis.yml
 ^.*\.Rproj$
 ^\.Rproj\.user$
-README.md
+README.md
+

.gitignore

@@ -1,4 +1,5 @@
 .Rproj.user
 .Rhistory
 .RData
-*.Rproj
+*.Rproj
+

DESCRIPTION

@@ -1,17 +1,20 @@
 Package: rLakeAnalyzer
 Title: Lake Physics Tools
 Maintainer: Luke Winslow <[email protected]>
-Version: 1.9.1
+Version: 1.10.0
 Author: Luke Winslow, Jordan Read, Richard Woolway, Jennifer Brentrup, Taylor
-    Leach, Jake Zwart
+    Leach, Jake Zwart, Sam Albers, Doug Collinge
 Description: Standardized methods for calculating common important derived
     physical features of lakes including water density based based on
     temperature, thermal layers, thermocline depth, lake number, Wedderburn
     number, Schmidt stability and others.
+Depends: R (>= 2.10)    
 Imports:
     plyr
 Suggests:
-    testthat
+    testthat,
+    knitr,
+    rmarkdown
 License: GPL (>= 2)
 Packaged: 2014-07-06 09:09:24 UTC; Luke
 Repository: https://github.com/GLEON/rLakeAnalyzer

NAMESPACE

@@ -7,10 +7,15 @@ export(wedderburn.number, layer.density, lake.number, uStar, water.density,
 	   schmidt.plot, center.buoyancy, ts.center.buoyancy, internal.energy, 
 			 ts.internal.energy, epi.temperature, hypo.temperature, whole.lake.temperature, 
 			 approx.bathy)
+export(depth.filter)
+export(wtr.layer)
 
 import("plyr")
 importFrom("grDevices", "colorRampPalette")
 importFrom("graphics", "abline", "axis", "filled.contour", "legend",
            "lines", "plot", "segments", "title")
 importFrom("stats", "approx")
 importFrom("utils", "read.table")
+
+
+

R/data.R

@@ -0,0 +1,15 @@
+#' Late Summer Profile
+#' 
+#' Late summer water profile taken from Quesnel Lake, British Columbia, Canada. Profile taken with Sea-Bird
+#'   SBE19plus.
+#'
+#' \describe{
+#'   \item{depth}{Depth, m}
+#'   \item{temper}{Temperature, degC}
+#'   \item{salinity}{Salinity, PSU}
+#'   \item{oxygen}{Oxygen, ml/l}
+#'   \item{oxygen.sat}{Oxygen saturation, percent saturation}
+#'   \item{density}{Density, kg/m^3}
+#'   ...
+#' }
+"latesummer"