From 5d80bc4e32cf588602ca64577fe713c9eb85aa57 Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Mon, 21 Jan 2013 10:13:13 -0600
Subject: [PATCH] Took out flux unit from data retrieval.  I think it is only
 relevent in EGRET.

---
 R/fluxUnit.R             |  27 ---------------------------
 R/tabbedDataRetrievals.R |  22 ----------------------
 data/FLUX_UNIT.RData     | Bin 515 -> 0 bytes
 man/FLUX_UNIT.Rd         |  24 ------------------------
 man/fluxUnit-class.Rd    |  16 ----------------
 5 files changed, 89 deletions(-)
 delete mode 100644 R/fluxUnit.R
 delete mode 100644 data/FLUX_UNIT.RData
 delete mode 100644 man/FLUX_UNIT.Rd
 delete mode 100644 man/fluxUnit-class.Rd

diff --git a/R/fluxUnit.R b/R/fluxUnit.R
deleted file mode 100644
index 06190430..00000000
--- a/R/fluxUnit.R
+++ /dev/null
@@ -1,27 +0,0 @@
-#' fluxUnit class
-#'
-#' Some details about the fluxUnit class
-#'
-#' \describe{
-#'    \item{shortName}{A character specifying the short name.}
-#'
-#'    \item{unitFactor}{A numeric representing the conversion factor}
-#' 
-#'    \item{unitName}{A character specifying the full name.}
-#'  }
-#' @name fluxUnit-class
-#' @rdname fluxUnit-class
-#' @exportClass fluxUnit
-setClass("fluxUnit",
-	representation(
-		shortName  = "character",
-		unitFactor = "numeric",
-		unitName   = "character"
-	)	
-)
-# 
-# testFunc <- function (fluxUnitVar=FLUX_UNIT$POUNDS_DAY){
-#   unitFactorReturn <- fluxUnitVar@unitFactor
-#   return(unitFactorReturn)
-# }
-
diff --git a/R/tabbedDataRetrievals.R b/R/tabbedDataRetrievals.R
index 702d98a6..b9ef175e 100644
--- a/R/tabbedDataRetrievals.R
+++ b/R/tabbedDataRetrievals.R
@@ -45,28 +45,6 @@ NULL
 #' @keywords water flow data
 NULL
 
-#' Flux units included in dataRetrieval
-#'
-#' Flux units included:
-#' \tabular{lllll}{
-#' Number \tab ObjectName \tab shortName \tab unitFactor \tab unitName  \cr
-#' 1      \tab POUNDS_DAY \tab lbs/day   \tab 2.204623   \tab pounds/day\cr
-#' 2      \tab TONS_DAY   \tab tons/day  \tab 0.001102  \tab tons/day   \cr
-#' 3      \tab KG_DAY     \tab kg/day    \tab 1          \tab kg/day    \cr
-#' 4      \tab THOUSAND_KG_DAY\tab 10^3 kg/day \tab 0.001 \tab "thousands of kg/day\cr
-#' 5      \tab TONS_YEAR\tab tons/yr \tab 0.402619 \tab tons/year\cr
-#' 6      \tab THOUSAND_TONS_YEAR\tab 10^3 tons/yr \tab 0.000402619 \tab thousands of tons/year \cr
-#' 7      \tab MILLION_TONS_YEAR\tab 10^6 tons/yr \tab 4.02619e-07 \tab millions of tons/year\cr
-#' 8      \tab THOUSAND_KG_YEAR\tab 10^3 kg/yr \tab 0.36525 \tab thousands of kg/year\cr
-#' 9      \tab MILLION_KG_YEAR\tab 10^6 kg/yr \tab 0.00036525 \tab millions of kg/year\cr
-#' 10     \tab BILLION_KG_YEAR\tab 10^9 kg/yr \tab 3.6525e-07 \tab billions of kg/year \cr
-#' }
-#' 
-#'
-#' @name FLUX_UNIT
-#' @docType data
-NULL
-
 #' Example Sample Dataframe included in dataRetrieval
 #'
 #' Initial Sample data frame from the Choptank River
diff --git a/data/FLUX_UNIT.RData b/data/FLUX_UNIT.RData
deleted file mode 100644
index 204da95ef7c90190a251b615f925ce356e8b1a1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 515
zcmV+e0{s0SiwFP!000001`BeDFye~fVqjokVqoH9WME<jGFg~_1S1f0g0P!UXheLd
zpJxbAjWAGvi-D0@5?xVoMt)I=Ut(@5kRyO3!K0v{kdsubpORRqpn#@{t28gO#4Rzo
zB)<sA;{(Y!FfJBM(hzn<Q^^5RiN$oTg8b6F6tL-NI#`o)5{rw0E=E?)k(N_h5ehU4
zO)+~xVsdt3I=bn+DTyVCL8&E0nW<%oIY5DbU<~&?(|>dgK+l%s=b`wP`9I8W_Cb8|
zwZ$h@A>u6PnmJ%PA@Z#M@jIRk!*Wtx3yK<r>~tKC{lEYPSRKm-(MLb08XCkID<E5n
z<kWy9-%B4?{=wl?;gXE}(&9v5GEvA+Q=qrIp$Ve02ul#(JknI1|L8dmcXL8CrY08A
z%e8z8kYI+o7{k3*NtX)*T$*sWR}3Yb2gvbexEyaco8_a}^vmTq950%inUj+V)H)z;
z2bCMJ1db)#uO~QmntLC|;dBx7^gRGBH^bp_^Y;(VaZl94l{1k8ePA4JiQVCLGnzit
z{LEZ|%i&41b~svPmIti*ilI8Wpn_Zh{-J&@!SODRkubYL{QZ#mY~JojJpK?5|IlDZ
zKbLqEVNS57NLR-osDKb$9lDI5ucwcXr@tSDgaES9NaFl34QRqn7{Xv*0|0C7gPx2C
F001XV?Z^NC

diff --git a/man/FLUX_UNIT.Rd b/man/FLUX_UNIT.Rd
deleted file mode 100644
index ba1bbcc5..00000000
--- a/man/FLUX_UNIT.Rd
+++ /dev/null
@@ -1,24 +0,0 @@
-\docType{data}
-\name{FLUX_UNIT}
-\alias{FLUX_UNIT}
-\title{Flux units included in dataRetrieval}
-\description{
-  Flux units included: \tabular{lllll}{ Number \tab
-  ObjectName \tab shortName \tab unitFactor \tab unitName
-  \cr 1 \tab POUNDS_DAY \tab lbs/day \tab 2.204623 \tab
-  pounds/day\cr 2 \tab TONS_DAY \tab tons/day \tab 0.001102
-  \tab tons/day \cr 3 \tab KG_DAY \tab kg/day \tab 1 \tab
-  kg/day \cr 4 \tab THOUSAND_KG_DAY\tab 10^3 kg/day \tab
-  0.001 \tab "thousands of kg/day\cr 5 \tab TONS_YEAR\tab
-  tons/yr \tab 0.402619 \tab tons/year\cr 6 \tab
-  THOUSAND_TONS_YEAR\tab 10^3 tons/yr \tab 0.000402619 \tab
-  thousands of tons/year \cr 7 \tab MILLION_TONS_YEAR\tab
-  10^6 tons/yr \tab 4.02619e-07 \tab millions of
-  tons/year\cr 8 \tab THOUSAND_KG_YEAR\tab 10^3 kg/yr \tab
-  0.36525 \tab thousands of kg/year\cr 9 \tab
-  MILLION_KG_YEAR\tab 10^6 kg/yr \tab 0.00036525 \tab
-  millions of kg/year\cr 10 \tab BILLION_KG_YEAR\tab 10^9
-  kg/yr \tab 3.6525e-07 \tab billions of kg/year \cr }
-}
-\keyword{datasets}
-
diff --git a/man/fluxUnit-class.Rd b/man/fluxUnit-class.Rd
deleted file mode 100644
index 53ebb9cb..00000000
--- a/man/fluxUnit-class.Rd
+++ /dev/null
@@ -1,16 +0,0 @@
-\name{fluxUnit-class}
-\alias{fluxUnit-class}
-\title{fluxUnit class}
-\description{
-  Some details about the fluxUnit class
-}
-\details{
-  \describe{ \item{shortName}{A character specifying the
-  short name.}
-
-  \item{unitFactor}{A numeric representing the conversion
-  factor}
-
-  \item{unitName}{A character specifying the full name.} }
-}
-
-- 
GitLab