From 49b41fd697864ef8ad9ac06d651761e31385e2e8 Mon Sep 17 00:00:00 2001 From: aho Date: Mon, 4 Apr 2022 12:12:17 +0200 Subject: [PATCH 1/2] Correct email address --- R/Eno.R | 4 ++-- R/Filter.R | 4 ++-- man/Eno.Rd | 4 ++-- man/Filter.Rd | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/R/Eno.R b/R/Eno.R index fd5c3acc..45bf7172 100644 --- a/R/Eno.R +++ b/R/Eno.R @@ -13,8 +13,8 @@ #' #'@keywords datagen #'@author History:\cr -#'0.1 - 2011-05 (V. Guemas, \email{virginie.guemas at bsc.es}) - Original code\cr -#'1.0 - 2013-09 (N. Manubens, \email{nicolau.manubens at bsc.es}) - Formatting to R CRAN +#'0.1 - 2011-05 (V. Guemas, \email{virginie.guemas@bsc.es}) - Original code\cr +#'1.0 - 2013-09 (N. Manubens, \email{nicolau.manubens@bsc.es}) - Formatting to R CRAN #'@examples #'# See examples on Load() to understand the first lines in this example #' \dontrun{ diff --git a/R/Filter.R b/R/Filter.R index 143de597..051b5add 100644 --- a/R/Filter.R +++ b/R/Filter.R @@ -15,8 +15,8 @@ #' #'@keywords datagen #'@author History:\cr -#'0.1 - 2012-02 (V. Guemas, \email{virginie.guemas at bsc.es}) - Original code\cr -#'1.0 - 2012-02 (N. Manubens, \email{nicolau.manubens at bsc.es}) - Formatting to CRAN +#'0.1 - 2012-02 (V. Guemas, \email{virginie.guemas@bsc.es}) - Original code\cr +#'1.0 - 2012-02 (N. Manubens, \email{nicolau.manubens@bsc.es}) - Formatting to CRAN #'@examples #'# Load sample data as in Load() example: #'example(Load) diff --git a/man/Eno.Rd b/man/Eno.Rd index 330687dc..f0d0034b 100644 --- a/man/Eno.Rd +++ b/man/Eno.Rd @@ -56,7 +56,7 @@ PlotEquiMap(eno, sampleData$lon, sampleData$lat) } \author{ History:\cr -0.1 - 2011-05 (V. Guemas, \email{virginie.guemas at bsc.es}) - Original code\cr -1.0 - 2013-09 (N. Manubens, \email{nicolau.manubens at bsc.es}) - Formatting to R CRAN +0.1 - 2011-05 (V. Guemas, \email{virginie.guemas@bsc.es}) - Original code\cr +1.0 - 2013-09 (N. Manubens, \email{nicolau.manubens@bsc.es}) - Formatting to R CRAN } \keyword{datagen} diff --git a/man/Filter.Rd b/man/Filter.Rd index 15c9401a..d9320845 100644 --- a/man/Filter.Rd +++ b/man/Filter.Rd @@ -44,7 +44,7 @@ PlotAno(InsertDim(ensmod, 2, 1), sdates = startDates, fileout = } \author{ History:\cr -0.1 - 2012-02 (V. Guemas, \email{virginie.guemas at bsc.es}) - Original code\cr -1.0 - 2012-02 (N. Manubens, \email{nicolau.manubens at bsc.es}) - Formatting to CRAN +0.1 - 2012-02 (V. Guemas, \email{virginie.guemas@bsc.es}) - Original code\cr +1.0 - 2012-02 (N. Manubens, \email{nicolau.manubens@bsc.es}) - Formatting to CRAN } \keyword{datagen} -- GitLab From 8a440742e75c512bc8adfe80441886354496e9e7 Mon Sep 17 00:00:00 2001 From: aho Date: Mon, 4 Apr 2022 16:09:00 +0200 Subject: [PATCH 2/2] Correct email address format --- DESCRIPTION | 4 ++-- NEWS.md | 3 +++ R/Load.R | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 49307522..ceccf73a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,12 +1,12 @@ Package: s2dverification Title: Set of Common Tools for Forecast Verification -Version: 2.10.1 +Version: 2.10.2 Authors@R: c( person("BSC-CNS", role = c("aut", "cph")), person("Virginie", "Guemas", , "virginie.guemas@bsc.es", role = "aut"), person("Nicolau", "Manubens", , "nicolau.manubens@bsc.es", role = "aut"), person("An-Chi", "Ho", , "an.ho@bsc.es", role = c("ctb", "cre")), - person("Nuria", "Perez-Zanon", , "nuria.perez@bsc.es", role = "ctb"), + person("Nuria", "Perez-Zanon", , "nuria.perez@bsc.es", role = "aut"), person("Javier", "Garcia-Serrano", , "javier.garcia@bsc.es", role = "aut"), person("Neven", "Fuckar", , "neven.fuckar@bsc.es", role = "aut"), person("Louis-Philippe", "Caron", , "louis-philippe.caron@bsc.es", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 4cb48700..efc82986 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +# s2dverification 2.10.2 (Release date: 2022-04-04) +- Correct email addresses format + # s2dverification 2.10.1 (Release date: 2022-02-22) - Renew the outdated email addresses diff --git a/R/Load.R b/R/Load.R index 6b136ec9..240ee865 100644 --- a/R/Load.R +++ b/R/Load.R @@ -2127,7 +2127,7 @@ Load <- function(var, exp = NULL, obs = NULL, sdates, nmember = NULL, }) - if (class(errors) == 'try-error') { + if (is(errors, 'try-error')) { invisible(list(load_parameters = load_parameters)) } else { # Before ending, the data is arranged in the common format, with the following -- GitLab