Arrange assert statments in wrapper function to speed up calculation of wbgt.Liljegren

Author: cas

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: HeatStress
 Type: Package
 Title: Calculate heat stress indices
-Version: 1.0.4
+Version: 1.0.5
 Date: 2017-03-03
 Author: A. Casanueva
 Maintainer: A.Casanueva <ana.casanueva@meteoswiss.ch>
@@ -12,3 +12,4 @@ Depends: R (>= 2.10.0)
 Suggests: testthat, assertthat
 Imports: stats
 Encoding: ISO-8859-1
+

NEWS

@@ -12,4 +12,7 @@ Changes in version 1.0.3
   * Change the interval to estimate Tg in `wbgt.Liljegren`.
 
 Changes in version 1.0.4
-  * Inclusion of more heat indices.
+  * Inclusion of more heat indices.
+  
+Changes in version 1.0.5
+  * Arrange assert statments in wrapper function to speed up calculation of wbgt.Liljegren.

R/calZenith.R

@@ -19,13 +19,6 @@
 #' 
 calZenith <- function(dates,lon,lat, hour=FALSE){
 
-  # assertion statements
-  assertthat::assert_that(is.numeric(lon), msg="'lon' is not an integer")
-  assertthat::assert_that(is.numeric(lat), msg="'lat' is not an integer")
-  assertthat::assert_that(is.logical(hour), msg="'hour' should be logical")
-  assertthat::assert_that(lon <= 180 & lon >=-180, msg="Invalid lon")
-  assertthat::assert_that(lat <= 90 & lon >=-90, msg="Invalid lat")
-
   # Internal constants used for conversion 
   EQTIME1 <- 229.18
   EQTIME2 <- 0.000075

R/degToRad.R

@@ -10,9 +10,6 @@
 
 degToRad <- function(angleDeg){
 
-  # assertion statements
-  assertthat::assert_that(is.numeric(angleDeg), msg="'angleDeg' is not an integer")
-
   degToRad <- pi * angleDeg / 180
   return(degToRad)
 }

R/diffusivity.R

@@ -12,11 +12,6 @@
 
 diffusivity <- function(Tk, Pair){
 
-  # assertion statements
-  assertthat::assert_that(is.numeric(Tk), msg="'Tk' is not an integer")
-  assertthat::assert_that(Tk > 200, msg="'Tk' should be in Kelvin")
-  assertthat::assert_that(is.numeric(Pair), msg="'Pair' is not an integer")
-  
   pcrit13 <- (36.4 * 218) ^ (1 / 3)
   tcrit512 <- (132 * 647.3) ^ (5 / 12)
   Tcrit12 <- (132 * 647.3) ^ 0.5

R/emis_atm.R

@@ -13,12 +13,6 @@
 
 emis_atm <- function(Tk, RH){
 
-  # assertion statements
-  assertthat::assert_that(is.numeric(Tk), msg="'Tk' is not an integer")
-  assertthat::assert_that(is.numeric(RH), msg="'RH' is not an integer")
-  assertthat::assert_that(Tk > 200, msg="'Tk' should be in Kelvin")
-  assertthat::assert_that(RH >= 0 & RH <= 1, msg="'RH' should be [0,1]")
-  
   e <- RH * esat(Tk)
   emis_atm <- 0.575 * e ^ 0.143
   return(emis_atm)

R/esat.R

@@ -11,10 +11,6 @@
 
 esat <- function(Tk){
 
-  # assertion statements
-  assertthat::assert_that(is.numeric(Tk), msg="'Tk' is not an integer")
-  assertthat::assert_that(Tk > 200, msg="'Tk' should be in Kelvin")
-  
   esat <- 6.1121 * exp(17.502 * (Tk - 273.15) / (Tk - 32.18))
   esat <- 1.004 * esat  #correction for moist air, if pressure is not available; for pressure > 800 mb
 

R/fTg.R

@@ -14,9 +14,7 @@
 fTg <- function(tas, relh, Pair, wind, min.speed, radiation, propDirect, 
                 zenith, SurfAlbedo=0.4, tolerance=1e-4){
 
-  # assertion statements
-  assertthat::assert_that(propDirect < 1, msg="'propDirect' should be [0,1]")  
-
+ 
   # Physical constants
   stefanb <- 0.000000056696
   cp <- 1003.5 # heat capaticy at constant pressure of dry air
@@ -67,7 +65,7 @@ fTg <- function(tas, relh, Pair, wind, min.speed, radiation, propDirect,
   }
 
   # Minimization (iteratively)
-  opt <- optimize(fr, range(Tair-2, Tair+10),Tair,Pair, tol=tolerance)
+  opt <- stats::optimize(fr, range(Tair-2, Tair+10),Tair,Pair, tol=tolerance)
   Tg <- opt$minimum - 273.15
 
   return(Tg)

R/fTnwb.R

@@ -24,8 +24,6 @@
 fTnwb <- function(tas, dewp, relh, Pair, wind, min.speed, radiation, propDirect, 
                   zenith, irad=1, SurfAlbedo=0.4, tolerance=1e-4){
 
-  # assertion statements
-  assertthat::assert_that(propDirect < 1, msg="'propDirect' should be [0,1]")  
 
   # Physical constants
   stefanb <- 0.000000056696
@@ -101,7 +99,7 @@ fTnwb <- function(tas, dewp, relh, Pair, wind, min.speed, radiation, propDirect,
   }
 
   # Minimization (iteratively)
-  opt <- optimize(fr, range(Tdew-1, Tair+1),Tair,Pair, tol=tolerance)
+  opt <- stats::optimize(fr, range(Tdew-1, Tair+1),Tair,Pair, tol=tolerance)
 
   Tnwb <- opt$minimum - 273.15
 

R/h_cylinder_in_air.R

@@ -16,15 +16,6 @@
 
 h_cylinder_in_air <- function(Tk, Pair, speed, min.speed, diam.wick){
 
-  # assertion statements
-  assertthat::assert_that(is.numeric(Tk), msg="'Tk' is not an integer")
-  assertthat::assert_that(Tk > 200, msg="'Tk' should be in Kelvin")
-  assertthat::assert_that(is.numeric(Pair), msg="'Pair' is not an integer")
-  assertthat::assert_that(is.numeric(speed), msg="'speed' is not an integer")
-  assertthat::assert_that(is.numeric(min.speed), msg="'min.speed' is not an integer")
-  assertthat::assert_that(is.numeric(diam.wick), msg="'diam.wick' is not an integer")
-  assertthat::assert_that(diam.wick < 1, msg="'diam.wick' should be meters")
-  
   # Constants
   m.air <- 28.97
   r.gas <- 8314.34