locdir: now used in all examples. Should Fix #31

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: rdwd
 Title: Select and Download Climate Data from 'DWD' (German Weather Service)
-Version: 1.5.8
+Version: 1.5.9
 Date: 2021-06-09
 Depends: R(>= 2.10)
 Imports: berryFunctions (>= 1.18.19), pbapply

R/checkIndex.R

@@ -29,7 +29,7 @@ checkIndex <- function(
   excludefp=TRUE,
   fast=FALSE,
   warn=!quiet,
-  logfile=localtestdir(".", "misc/ExampleTests/warnings.txt"),
+  logfile=berryFunctions::packagePath(file="misc/ExampleTests/warnings.txt"),
   quiet=rdwdquiet()
   )
 {

R/dataDWD.R

@@ -36,7 +36,7 @@
 #' # find FTP files for a given station name and file path:
 #' link <- selectDWD("Fuerstenzell", res="hourly", var="wind", per="recent")
 #' # download file:
-#' fname <- dataDWD(link, dir=tempdir(), read=FALSE) ; fname
+#' fname <- dataDWD(link, dir=locdir(), read=FALSE) ; fname
 #' # dir="DWDdata" is the default directory to store files
 #' # unless force=TRUE, already obtained files will not be downloaded again
 #' 
@@ -52,7 +52,7 @@
 #' 
 #' # current and historical files:
 #' link <- selectDWD("Potsdam", res="daily", var="kl", per="hr"); link
-#' potsdam <- dataDWD(link, dir=tempdir())
+#' potsdam <- dataDWD(link, dir=locdir())
 #' potsdam <- do.call(rbind, potsdam) # this will partly overlap in time
 #' plot(TMK~MESS_DATUM, data=tail(potsdam,1500), type="l")
 #' # The straight line marks the jump back in time

R/plotRadar.R

@@ -16,7 +16,7 @@
 #' # See homepage in the section 'See Also'
 #' \dontrun{ ## Excluded from CRAN checks: requires internet connection
 #' link <- "seasonal/air_temperature_mean/16_DJF/grids_germany_seasonal_air_temp_mean_188216.asc.gz"
-#' rad <- dataDWD(link, base=gridbase, joinbf=TRUE, dir=tempdir())
+#' rad <- dataDWD(link, base=gridbase, joinbf=TRUE, dir=locdir())
 #' radp <- plotRadar(rad, proj="seasonal", extent=rad@extent, main="plotRadar ex")
 #' plotRadar(radp, ylim=c(52,54), project=FALSE) # reuses main
 #' 
@@ -27,7 +27,7 @@
 #' 
 #' # several layers
 #' url <- "daily/Project_TRY/pressure/PRED_199606_daymean.nc.gz"  #  5 MB
-#' nc <- dataDWD(url, base=gridbase, joinbf=TRUE, dir=localtestdir())
+#' nc <- dataDWD(url, base=gridbase, joinbf=TRUE, dir=locdir())
 #' 
 #' ncp3 <- plotRadar(nc, main=paste(nc@title, nc@z[[1]]), layer=1:3,
 #'                   col=terrain.colors(100), proj="nc", extent="nc")

R/readDWD.R

@@ -315,8 +315,8 @@ return(dat)
 #' durl <- selectDWD(res="multi_annual", var="mean_81-10", per="")[9]
 #' murl <- selectDWD(res="multi_annual", var="mean_81-10", per="", meta=TRUE)[9]
 #' 
-#' ma_temp <- dataDWD(durl, dir=localtestdir())
-#' ma_meta <- dataDWD(murl, dir=localtestdir())
+#' ma_temp <- dataDWD(durl, dir=locdir())
+#' ma_meta <- dataDWD(murl, dir=locdir())
 #' 
 #' head(ma_temp)
 #' head(ma_meta)
@@ -388,7 +388,7 @@ out
 #' \dontrun{ # Excluded from CRAN checks, but run in localtests
 #' 
 #' link <- selectDWD(id=10381, res="subdaily", var="standard_format", per="r")
-#' file <- dataDWD(link, dir=localtestdir(), read=FALSE)
+#' file <- dataDWD(link, dir=locdir(), read=FALSE)
 #' sf <- readDWD(file)
 #' 
 #' sf2 <- readDWD(file, fast=FALSE) # 20 secs!
@@ -499,7 +499,7 @@ return(sf)
 #' if(length(link)!=1) stop("length of link should be 1, but is ", length(link),
 #'                 ":\n", berryFunctions::truncMessage(link,prefix="",sep="\n"))
 #' 
-#' file <- dataDWD(link, dir=localtestdir(), read=FALSE)
+#' file <- dataDWD(link, dir=locdir(), read=FALSE)
 #' meta <- readDWD(file)
 #' head(meta)
 #' 
@@ -584,7 +584,7 @@ stats
 #' 
 #' SF_link <- "/daily/radolan/historical/bin/2017/SF201712.tar.gz"
 #' SF_file <- dataDWD(url=SF_link, base=gridbase, joinbf=TRUE,   # 204 MB
-#'                      dir=localtestdir(), read=FALSE)
+#'                      dir=locdir(), read=FALSE)
 #' # exdir radardir set to speed up my tests:
 #' SF_exdir <- "C:/Users/berry/Desktop/DWDbinarySF"
 #' if(!file.exists(SF_exdir)) SF_exdir <- tempdir()
@@ -599,7 +599,7 @@ stats
 #' 
 #' RW_link <- "hourly/radolan/reproc/2017_002/bin/2017/RW2017.002_201712.tar.gz"
 #' RW_file <- dataDWD(url=RW_link, base=gridbase, joinbf=TRUE,   # 25 MB
-#'                   dir=localtestdir(), read=FALSE)
+#'                   dir=locdir(), read=FALSE)
 #' RW_exdir <- "C:/Users/berry/Desktop/DWDbinaryRW"
 #' if(!file.exists(RW_exdir)) RW_exdir <- tempdir()
 #' RW_rad <- readDWD(RW_file, selection=1:10, exdir=RW_exdir)
@@ -702,7 +702,7 @@ return(invisible(list(dat=rbmat, meta=rbmeta)))
 #' rasterbase <- paste0(gridbase,"/seasonal/air_temperature_mean")
 #' ftp.files <- indexFTP("/16_DJF", base=rasterbase, dir=tempdir())
 #' localfiles <- dataDWD(ftp.files[1:2], base=rasterbase, joinbf=TRUE,
-#'                       dir=localtestdir(), read=FALSE)
+#'                       dir=locdir(), read=FALSE)
 #' rf <- readDWD(localfiles[1])
 #' rf <- readDWD(localfiles[1]) # runs faster at second time due to skip=TRUE
 #' raster::plot(rf)
@@ -767,7 +767,7 @@ return(invisible(r))
 #' 
 #' url <- "daily/Project_TRY/pressure/PRED_199606_daymean.nc.gz"  #  5 MB
 #' url <- "daily/Project_TRY/humidity/RH_199509_daymean.nc.gz"    # 25 MB
-#' file <- dataDWD(url, base=gridbase, joinbf=TRUE, dir=localtestdir(), read=FALSE)
+#' file <- dataDWD(url, base=gridbase, joinbf=TRUE, dir=locdir(), read=FALSE)
 #' nc <- readDWD(file)
 #' ncp <- plotRadar(nc, main=paste(nc@title, nc@z[[1]]), layer=1:3,
 #'                  col=seqPal(), proj="nc", extent="nc")
@@ -934,7 +934,7 @@ return(invisible(rf))
 #' \dontrun{ # Excluded from CRAN checks, but run in localtests
 #' 
 #' # File selection and download:
-#' datadir <- localtestdir()
+#' datadir <- locdir()
 #' radbase <- paste0(gridbase,"/hourly/radolan/historical/asc/")
 #' radfile <- "2018/RW-201809.tar" # 25 MB to download
 #' file <- dataDWD(radfile, base=radbase, joinbf=TRUE, dir=datadir,

R/runLocalTests.R

@@ -3,16 +3,16 @@
 #' data downloads, these tests are not run automatically on CRAN.
 #' @return Time taken to run tests in minutes
 #' @author Berry Boessenkool, \email{berry-b@@gmx.de}, Apr-Oct 2019
-#' @seealso [localtestdir()]
+#' @seealso [locdir()]
 #' @keywords debugging
 #' @importFrom grDevices dev.off pdf
 #' @importFrom graphics par title
 #' @importFrom utils tail
 #' @export
 #' 
 #' @param dir_data  Reusable data location. Preferably not under version control.
-#'                  DEFAULT: [localtestdir()]
-#' @param dir_exmpl Reusable example location. DEFAULT: localtestdir(folder="misc/ExampleTests")
+#'                  DEFAULT: [locdir()]
+#' @param dir_exmpl Reusable example location. DEFAULT: local directory
 #' @param fast      Exclude many tests? DEFAULT: FALSE
 #' @param devcheck  Run `devtools::check()`? DEFAULT: !fast
 #' @param radar     Test reading radar example files. DEFAULT: !fast
@@ -25,8 +25,8 @@
 #' @param quiet Suppress progress messages? DEFAULT: FALSE through [rdwdquiet()]
 #' 
 runLocalTests <- function(
-dir_data=localtestdir(),
-dir_exmpl=localtestdir(folder="misc/ExampleTests"),
+dir_data=locdir(),
+dir_exmpl=berryFunctions::packagePath(file="misc/ExampleTests"),
 fast=FALSE,              # ca 0.1 minutes (always, even if fast=T)
 devcheck=!fast,          # ca 1.0 minutes
 radar=!fast,             # ca 0.3 minutes
@@ -112,7 +112,7 @@ testthat::test_that("readRadarFile works", {
 trr <- function(file, ext="radolan", readdwd=FALSE) # trr: test reading radar data
   {
   main <- deparse(substitute(file))
-  file2 <- localtestdir(folder="misc", file=file)
+  file2 <- berryFunctions::packagePath(file=paste0("misc/",file))
   rrf <- if(readdwd) readDWD(file2, toraster=FALSE) else dwdradar::readRadarFile(file2)
   rrr <- raster::raster(rrf$dat)
   rrp <- projectRasterDWD(rrr, extent=ext)

R/updateIndexes.R

@@ -141,7 +141,7 @@ tools::resaveRdaFiles( "data/formatIndex.rda", version=2)
 messaget("Checking readVars parameter abbreviations...")
 urls <- selectDWD("Potsdam","","","", quiet=TRUE, mindex=metaIndex, findex=fileIndex)
 urls <- urls[!  (grepl("1*_minute", urls) & !grepl("meta_data", urls))     ]
-files <- dataDWD(urls, dir=localtestdir(), read=F)
+files <- dataDWD(urls, dir=locdir(), read=F)
 rv <- readVars(files, quiet=TRUE) # quiet, message through nkurzmissing
 #str(rv, max.level=1)
 k <- unlist(lapply(rv, function(x)x$Kurz))

misc/vign/index.Rmd

@@ -425,7 +425,7 @@ there's yet more data at <https://opendata.dwd.de/weather>.
 A helper function to reduce code duplication:
 
 ```{r readDWD_gridded}
-ddir <- localtestdir()
+ddir <- locdir()
 tdir <- tempdir()
 project_and_plot <- function(x, main1, main2, main3=NULL, ...)
   {
@@ -537,7 +537,7 @@ Since Version 1.4.18 (2021-04-08), the default is `dbin=TRUE`. Report errors [he
 If you do not use this, your plots may look partially shifted like this and have the wrong units (image from 2020-06-16 21:30 CEST):
 ```{r wrong_binary, eval=FALSE}
 url <- "ftp://opendata.dwd.de/weather/radar/radolan/rw/raa01-rw_10000-latest-dwd---bin"
-rw_file <- dataDWD(url, dir=tempdir(), read=FALSE, dbin=FALSE)
+rw_file <- dataDWD(url, dir=locdir(), read=FALSE, dbin=FALSE)
 rw_orig <- dwdradar::readRadarFile(rw_file)
 raster::plot(raster::raster(rw_orig$dat))
 ```
@@ -646,15 +646,15 @@ Obtain time series of values at a selected location in gridded data.
 ```{r grid_loc_val_index}
 library(rdwd)
 # select data
-index <- indexFTP(folder="annual/air_temperature_max", base=gridbase, dir=localtestdir())
+index <- indexFTP(folder="annual/air_temperature_max", base=gridbase, dir=locdir())
 index <- index[-(1:2)] # exclude description files
 index <- index[as.numeric(substr(index,62,65))>=2013] # after year 2013
 index
 ```
 
 ```{r grid_loc_val_downloadread}
 # download & read data:
-tempmax <- dataDWD(index, base=gridbase, joinbf=TRUE, dir=localtestdir())
+tempmax <- dataDWD(index, base=gridbase, joinbf=TRUE, dir=locdir())
 names(tempmax) <- substr(names(tempmax), 62, 65)
 ```
 
@@ -1033,7 +1033,7 @@ phenocrop_base <- paste0(sub("climate$", "phenology", dwdbase),
 # pheno_urls <- indexFTP("", base=phenocrop_base, dir="Pheno")
 kohl_url <- "PH_Jahresmelder_Landwirtschaft_Kulturpflanze_Weisskohl_1951_1990_hist.txt"# 9 MB
 kohl_file <- dataDWD(base=phenocrop_base, url=kohl_url, joinbf=TRUE, 
-                     dir=localtestdir(), read=FALSE) 
+                     dir=locdir(), read=FALSE) 
 kohl <- read.table(kohl_file, sep=";", header=TRUE)
 summary(kohl)
 ```