Merge pull request #181 from lawinslow/master

Standardize hypsometry data.frame headers
GLEON · Sep 28, 2015 · 857f53c · 857f53c
2 parents 402464f + 8b39e82
commit 857f53c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: glmtools
 Type: Package
 Title: glmtools
-Version: 0.10.1
+Version: 0.10.2
 Date: 2013-09-18
 Authors@R: c( person("Jordan", "Read", role = c("aut","cre"),
     email = "jread@usgs.gov"),

diff --git a/R/compare_to_field.R b/R/compare_to_field.R
@@ -57,8 +57,8 @@ compare_to_field <- function(nc_file, field_file, nml_file, metric, as_value = F
     bthD <- NA
   } else {
     hypso <- get_hypsography(file = nml_file)
-    bthA <- hypso$Areas
-    bthD <- hypso$Depths
+    bthA <- hypso$areas
+    bthD <- hypso$depths
   }
   compare_data <- resample_to_field(nc_file, field_file, ...)
 

diff --git a/R/get_hypsography.R b/R/get_hypsography.R
@@ -6,7 +6,7 @@
 #'
 #'@param glm_nml a nml (a list) for GLM config
 #'@param file a string with the path to the GLM glm.nml file
-#'@return glm_bth a data.frame with \code{Depths} and \code{Areas}
+#'@return glm_bth a data.frame with \code{depths} and \code{areas}
 #'@keywords methods
 #'@author
 #'Jordan S. Read
@@ -32,6 +32,6 @@ get_hypsography <- function(glm_nml, file){
   bthA	<-	rev(get_nml_value(glm_nml,'A')) # (As of GLMv2.0, nml has areas in m^2, no conversion needed)
   bthZ	<-	rev(max_elev-heights)
   glm_bth	<-	data.frame(bthZ,bthA)
-  names(glm_bth)	<-	c("Depths","Areas")
+  names(glm_bth)	<-	c("depths","areas")
   return(glm_bth)
 }
diff --git a/man/get_hypsography.Rd b/man/get_hypsography.Rd
@@ -12,7 +12,7 @@ get_hypsography(glm_nml, file)
 \item{file}{a string with the path to the GLM glm.nml file}
 }
 \value{
-glm_bth a data.frame with \code{Depths} and \code{Areas}
+glm_bth a data.frame with \code{depths} and \code{areas}
 }
 \description{
 Retrieves hypsography information from glm_nml object or file.  \cr