Skip to content

Commit

Permalink
version 2.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dannycbowman authored and cran-robot committed Feb 29, 2020
1 parent 10e1452 commit c7c95db
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 15 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Package: rNOMADS
Type: Package
Title: An R Interface to the NOAA Operational Model Archive and
Distribution System
Version: 2.4.1
Date: 2019-3-2
Version: 2.4.2
Date: 2020-2-29
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: stringr (>= 1.2.0), fields (>= 9.0), GEOmap (>= 2.3-5), MBA,
RCurl (>= 1.95-4.7), XML (>= 3.98.1.9), uuid (>= 0.1-2)
RCurl (>= 1.95-4.7), XML (>= 3.99-0.3), 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 @@ -17,7 +17,7 @@ URL: <https://bovineaerospace.wordpress.com/category/r/ >,
<https://r-forge.r-project.org/projects/rnomads/ >,
<https://www.r-project.org >
NeedsCompilation: no
Packaged: 2019-03-02 05:37:58 UTC; dantayaga
Packaged: 2020-02-29 04:09:10 UTC; dantayaga
Author: Daniel C. Bowman [aut, cre]
Repository: CRAN
Date/Publication: 2019-03-04 08:00:03 UTC
Date/Publication: 2020-02-29 05:30:03 UTC
10 changes: 5 additions & 5 deletions MD5
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
69283f19afa5c1146f5e410660e7f39b *DESCRIPTION
6fb8bebea136ac8131967dfe6b5d406b *DESCRIPTION
390e84088e5d6fef202002db75860464 *NAMESPACE
8a29fb48bd1a036dcafedb75489dc19d *NEWS
c718f1a469c8436f9e40fe62f31c2f7c *NEWS
a11f6e0f930740109ae9b34335796b21 *R/GetArchiveGrib.R
3d3616ae851730c99ca81b34c9add562 *R/GetDODS.R
56c60352d659f91659a3c2f0fce4671a *R/GetRealTimeGrib.R
de13ba34ff7f328e9dc3097c982d1f50 *R/Models.R
08d02247d80a9e7f3368d7f3582f056c *R/RNomadsTools.R
01fa0ac77b01330c8608968e6e9de5f7 *R/Models.R
4c8952204823df150efb295e4601f3b5 *R/RNomadsTools.R
7c474ab346a5149f4c40c020d625752d *R/ReadGrib.R
0f253778c7757b7016e434fec3a542aa *R/onAttach.R
55ec436080700d7f6a3023c81b875a8a *R/onAttach.R
e1094799c652a311619b92483183a5fc *inst/CITATION
81c30cc1ca803cde5a9e254641a31d46 *man/ArchiveGribGrab.Rd
a4ae1bccff1f268c029a9aec22fce458 *man/BuildProfile.Rd
Expand Down
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,6 @@ DODS (openDAP-alt) remains nonfunctioning, but decided to release a new version
2-4.1
DODS functionality is restored (on the NOMADS side, not my doing).
This release fixes an issue with ArchiveGribGrab.

2-4.2
Adjusted DODS to make sure it is compatible with the upcoming NOMADS port change
2 changes: 1 addition & 1 deletion R/Models.R
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ NOMADSRealTimeList <- function(url.type, abbrev = NULL) {

grib.abbrevs <- stringr::str_replace(stringr::str_replace(basename(grib.filter), "filter_", ""), ".pl", "")
dods.abbrevs <- basename(gds.alt)
dods.base.url <- paste0(prefix, "://nomads.ncep.noaa.gov:9090/dods/")
dods.base.url <- paste0(prefix, "://nomads.ncep.noaa.gov:443/dods/")
if(is.null(abbrev)) {
if(url.type == "grib") {
good.abbrevs <- which(!is.na(grib.abbrevs))
Expand Down
11 changes: 8 additions & 3 deletions R/RNomadsTools.R
Original file line number Diff line number Diff line change
Expand Up @@ -316,9 +316,14 @@ LinkExtractor <- function(url) {

meat <- stringr::str_extract(hrefs, "href=\".*\"")

links <- stringr::str_replace_all(
stringr::str_replace(meat, "href=", ""), "\"", "")

links <- stringr::str_replace_all(
stringr::str_replace(meat, "href=", ""),
"\"", "")

links <- stringr::str_replace_all(links, "http:", "https:")

links <- stringr::str_replace_all(links, ":80", ":443")

return(links)
}

Expand Down
2 changes: 1 addition & 1 deletion R/onAttach.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.onAttach <- function(libname, pkgname) {
packageStartupMessage(paste0(c("\n****\nWelcome to rNOMADS 2.4.0 \"Latinum-plated bucket\"!\n",
packageStartupMessage(paste0(c("\n****\nWelcome to rNOMADS 2.4.2 \"Pandaemonium Fortress\"!\n",
"Questions? Follow @rNOMADS_r on Twitter or send a message to rnomads-user@lists.r-forge.r-project.org\n",
"Using rNOMADS as a data source for a publication? Please cite it!\n",
"I'm an early career researcher and every citation matters.\n****\n")))
Expand Down

0 comments on commit c7c95db

Please sign in to comment.