Merge pull request #207 from lawinslow/master

Fixed plotting issue and added whole.lake temp helper function

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: glmtools
 Type: Package
 Title: glmtools
-Version: 0.14.0
+Version: 0.14.1
 Date: 2016-03-28
 Authors@R: c( person("Jordan", "Read", role = c("aut","cre"),
     email = "[email protected]"),

NAMESPACE

@@ -37,6 +37,7 @@ export(sim_vars)
 export(summarize_sim)
 export(validate_sim)
 export(water.temperature)
+export(whole.lake.temperature)
 export(write_nml)
 import(GLMr)
 import(rLakeAnalyzer)

R/plot_var_compare.R

@@ -49,7 +49,7 @@ plot_var_compare = function(nc_file, field_file, var_name, fig_path = FALSE, res
   y = data$Depth
   z = data[,paste0('Observed_', var_name)]
   x_out = sort(unique(x))
-  y_out = sort(unique(mod_depths))
+  y_out = sort(unique(c(y, mod_depths)))
 
   #remove any NA values before the 2D interp
   x = x[!is.na(z)]

R/whole.lake.temperature.R

@@ -0,0 +1,16 @@
+#'@title Get volumetrically averaged whole lake temperature
+#'@details A metric function used like an rLakeAnalyzer function to be 
+#'called by \code{\link{sim_metrics}}
+#'@param wtr a water temperature vector
+#'
+#'@import rLakeAnalyzer
+#'
+#'@seealso \code{\link{sim_metrics}}, \code{\link{compare_to_field}}, \code{\link{validate_sim}}
+#'@export
+whole.lake.temperature <- function(wtr, depths, bthA, bthD){
+
+
+	avg_temp = layer.temperature(0,max(depths), wtr=wtr, depths=depths, bthA=bthA, bthD=bthD)
+
+	return(avg_temp)
+}