Skip to content

Commit

Permalink
version 2.3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
dannycbowman authored and cran-robot committed Jul 18, 2018
1 parent 28f052b commit d7a205e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 16 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ Package: rNOMADS
Type: Package
Title: An Interface to the NOAA Operational Model Archive and
Distribution System
Version: 2.3.9
Date: 2018-1-13
Version: 2.3.10
Date: 2018-7-17
Authors@R: c(person(given="Daniel C.",family="Bowman", role=c("aut", "cre"),
email="danny.c.bowman@gmail.com"))
Depends: R (>= 3.4.0), rvest (>= 0.3.2)
Imports: scrapeR (>= 0.1.6), stringr (>= 1.2.0), fields (>= 9.0),
GEOmap (>= 2.3-5), MBA, RCurl (>= 1.95-4.7), XML (>= 3.98.1.9),
xml2 (>= 1.1.1)
xml2 (>= 1.1.1), uuid (>= 0.1-2)
Description: An interface to the National Oceanic and Atmospheric Administration's Operational Model Archive and Distribution System (NOMADS, see <http://nomads.ncep.noaa.gov/> for more information) that allows R users to quickly and efficiently download global and regional weather model data for processing. rNOMADS currently supports a variety of models ranging from global weather data to an altitude of over 40 km, to high resolution regional weather models, to wave and sea ice models. It can also retrieve archived NOMADS models. rNOMADS can retrieve binary data in grib format as well as import ascii data directly into R by interfacing with the GrADS-DODS system.
License: GPL (>= 3)
Maintainer: Daniel C. Bowman <danny.c.bowman@gmail.com>
Expand All @@ -18,7 +18,7 @@ URL: <https://bovineaerospace.wordpress.com/category/r/ >,
<https://r-forge.r-project.org/projects/rnomads/ >,
<https://www.r-project.org >
NeedsCompilation: no
Packaged: 2018-01-15 03:59:13 UTC; dantayaga
Packaged: 2018-07-18 02:46:22 UTC; dantayaga
Author: Daniel C. Bowman [aut, cre]
Repository: CRAN
Date/Publication: 2018-01-15 04:55:08 UTC
Date/Publication: 2018-07-18 04:20:03 UTC
6 changes: 3 additions & 3 deletions MD5
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ce30b67eb3e2160d6b9cd2ce611959a6 *DESCRIPTION
278bfa04538fd32d31eddad5447b9789 *DESCRIPTION
390e84088e5d6fef202002db75860464 *NAMESPACE
00ebe9b1f82a4e608e495174aa6ad541 *NEWS
fcb8dc6a9dff60494fba64d7ef3e8c44 *NEWS
25d1b075adf63d775b2003a6b13f7f3c *R/GetArchiveGrib.R
3d3616ae851730c99ca81b34c9add562 *R/GetDODS.R
573e507bae1e1f85f4ff251ecff230dc *R/GetRealTimeGrib.R
350c74c638277ac783906247a4a8fb4c *R/Models.R
9a4cd02bb95fe1bb070ee928915afdd1 *R/RNomadsTools.R
312bf9dec3e4e9b7b92b4f6252ffa87d *R/ReadGrib.R
7c474ab346a5149f4c40c020d625752d *R/ReadGrib.R
52f408d5e1ed74804c5d5a4408a11e40 *R/onAttach.R
e1094799c652a311619b92483183a5fc *inst/CITATION
81c30cc1ca803cde5a9e254641a31d46 *man/ArchiveGribGrab.Rd
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@ I am planning a major revamp to ReadGrib soon, so this is an interim release.
I expect the next release to be 2-4.1

2-3.9
Big plans for 2-4.1 have been deferred; this is a release to fix a bug in wgrib inventory reading requests
Big plans for 2-4.1 have been deferred; this is a release to fix a bug in wgrib inventory reading requests and race conditions when running ReadGrib in parallel
17 changes: 10 additions & 7 deletions R/ReadGrib.R
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,11 @@ ReadGrib <- function(file.names, levels, variables, forecasts = NULL, domain = N
It should be a 4 element vector: c(LEFT LON, RIGHT LON, TOP LAT, BOTTOM LAT)")
} else {
if(domain.type == "latlon") {
wg2.pre <- paste0("wgrib2 ",
file.name,
" -inv my.inv ",
" -small_grib ",
domain[1], ":", domain[2], " ", domain[4], ":", domain[3],
" tmp.grb && wgrib2 tmp.grb")
uuid <- uuid::UUIDgenerate(use.time = T)
wg2.pre <- paste0("wgrib2 ", file.name,
" -inv my.inv ", " -small_grib ", domain[1],
":", domain[2], " ", domain[4], ":", domain[3],
" tmp.grb.",uuid," && wgrib2 tmp.grb.",uuid)
} else {
wg2.pre <- paste0('wgrib2 ',
file.name,
Expand Down Expand Up @@ -186,7 +185,11 @@ ReadGrib <- function(file.names, levels, variables, forecasts = NULL, domain = N
} else {
csv.str <- system(wg2.str, intern = TRUE)
}


if(domain.type == "latlon" & !is.null(domain)) {
file.remove(paste0("tmp.grb.",uuid))
}

#HERE IS THE EXTRACTION
model.data.vector <- strsplit(paste(gsub("\"", "", csv.str), collapse = ","), split = ",")[[1]]

Expand Down

0 comments on commit d7a205e

Please sign in to comment.