From 58d4bf183b1224cdbb42f40ec728870cf790001d Mon Sep 17 00:00:00 2001 From: aho Date: Wed, 23 Feb 2022 12:24:35 +0100 Subject: [PATCH 1/4] Correct email address and change the maintainer --- DESCRIPTION | 7 ++++--- R/ArrayToNc.R | 2 +- R/NcClose.R | 2 +- R/NcOpen.R | 2 +- R/NcReadDims.R | 2 +- R/NcReadVarNames.R | 2 +- R/NcToArray.R | 2 +- man/ArrayToNc.Rd | 3 +-- man/NcClose.Rd | 3 +-- man/NcOpen.Rd | 3 +-- man/NcReadDims.Rd | 3 +-- man/NcReadVarNames.Rd | 3 +-- man/NcToArray.Rd | 15 ++++++++++----- 13 files changed, 25 insertions(+), 24 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index cce6a4a..06c3239 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,11 +1,12 @@ Package: easyNCDF Title: Tools to Easily Read/Write NetCDF Files into/from Multidimensional R Arrays -Version: 0.1.0 +Version: 0.1.1 Authors@R: c( person("BSC-CNS", role = c("aut", "cph")), person("Nicolau", "Manubens", , "nicolau.manubens@bsc.es", role = c("aut")), - person("Nuria", "Perez-Zanon", , "nuria.perez@bsc.es", role = c("ctb", "cre"), comment = c(ORCID = "0000-0001-8568-3071"))) + person("Nuria", "Perez-Zanon", , "nuria.perez@bsc.es", role = c("ctb"), comment = c(ORCID = "0000-0001-8568-3071")), + person("An-Chi", "Ho", , "an.ho@bsc.es", role = c("cre"))) Description: Set of wrappers for the 'ncdf4' package to simplify and extend its reading/writing capabilities into/from multidimensional R arrays. Depends: @@ -19,4 +20,4 @@ URL: https://earth.bsc.es/gitlab/es/easyNCDF/wikis/home BugReports: https://earth.bsc.es/gitlab/es/easyNCDF/issues LazyData: true SystemRequirements: netcdf development libraries -RoxygenNote: 5.0.0 +RoxygenNote: 7.0.1 diff --git a/R/ArrayToNc.R b/R/ArrayToNc.R index 68fdc76..e880f8e 100644 --- a/R/ArrayToNc.R +++ b/R/ArrayToNc.R @@ -1,6 +1,6 @@ #'Save multidimensional R arrays into NetCDF files #' -#'@author N. Manubens \email{nicolau.manubens at bsc.es} +#'@author N. Manubens \email{nicolau.manubens@bsc.es} #'@description This function takes as input one or a list of multidimensional R arrays and stores them in a NetCDF file, using the \code{ncdf4} package. The full path and name of the resulting file must be specified. Metadata can be attached to the arrays and propagated into the NetCDF file in 3 possible ways:\cr #' \itemize{ #' \item{Via the list names if a list of arrays is provided:}{Each name in the input list, corresponding to one multidimensional array, will be interpreted as the name of the variable it contains.\cr diff --git a/R/NcClose.R b/R/NcClose.R index bd46c4c..3b9ba32 100644 --- a/R/NcClose.R +++ b/R/NcClose.R @@ -1,6 +1,6 @@ #'Close a NEtCDF File #' -#'@author N. Manubens \email{nicolau.manubens at bsc.es} +#'@author N. Manubens \email{nicolau.manubens@bsc.es} #' #'@description Close a \code{ncdf4} open connection to a file. #' diff --git a/R/NcOpen.R b/R/NcOpen.R index 0cd6ec2..240d742 100644 --- a/R/NcOpen.R +++ b/R/NcOpen.R @@ -1,6 +1,6 @@ #'Open a NetCDF File #' -#'@author N. Manubens \email{nicolau.manubens at bsc.es} +#'@author N. Manubens \email{nicolau.manubens@bsc.es} #' #'@description Silently opens a NetCDF file with \code{ncdf4::nc_open}. Returns NULL on failure. #' diff --git a/R/NcReadDims.R b/R/NcReadDims.R index 9cdff44..5dd146c 100644 --- a/R/NcReadDims.R +++ b/R/NcReadDims.R @@ -1,6 +1,6 @@ #'Read Dimensions of a NetCDF File #' -#'@author N. Manubens \email{nicolau.manubens at bsc.es} +#'@author N. Manubens \email{nicolau.manubens@bsc.es} #'@description Reads the dimension names and sizes of a set of variables in a NetCDF file, using the package \code{ncdf4}. The different variables in the file are considered to be stored along a dimension called 'var', so reading the dimensions of a variable 'foo' with dimensions 'lat' and 'lon' would result in a vector with the format c('var' = 1, 'lat' = n_lats, 'lon' = n_lons). #' #'@param file_to_read Path to the file to be read or a NetCDF object as returned by \code{easyNCDF::NcOpen} or \code{ncdf4::nc_open}. diff --git a/R/NcReadVarNames.R b/R/NcReadVarNames.R index 0af8959..abc906a 100644 --- a/R/NcReadVarNames.R +++ b/R/NcReadVarNames.R @@ -1,6 +1,6 @@ #'Read Names of Variables in a NetCDF File #' -#'@author N. Manubens \email{nicolau.manubens at bsc.es} +#'@author N. Manubens \email{nicolau.manubens@bsc.es} #' #'@description Reads the names of the variables in a NetCDF file and returns them as a vector of character strings. #' diff --git a/R/NcToArray.R b/R/NcToArray.R index 0fc047e..4adb473 100644 --- a/R/NcToArray.R +++ b/R/NcToArray.R @@ -1,6 +1,6 @@ #'Read Names of Variables in a NetCDF File #' -#'@author N. Manubens, \email{nicolau.manubens at bsc.es} +#'@author N. Manubens, \email{nicolau.manubens@bsc.es} #' #'@description Reads the names of the variables in a NetCDF file and returns them as a vector of character strings. #' diff --git a/man/ArrayToNc.Rd b/man/ArrayToNc.Rd index 379137d..c97f4ac 100644 --- a/man/ArrayToNc.Rd +++ b/man/ArrayToNc.Rd @@ -197,6 +197,5 @@ ArrayToNc(list(tos, lon, lat), 'tmp.nc') } \author{ -N. Manubens \email{nicolau.manubens at bsc.es} +N. Manubens \email{nicolau.manubens@bsc.es} } - diff --git a/man/NcClose.Rd b/man/NcClose.Rd index 4842168..ab61e60 100644 --- a/man/NcClose.Rd +++ b/man/NcClose.Rd @@ -33,6 +33,5 @@ print(a) print(a_from_file[1, , ]) } \author{ -N. Manubens \email{nicolau.manubens at bsc.es} +N. Manubens \email{nicolau.manubens@bsc.es} } - diff --git a/man/NcOpen.Rd b/man/NcOpen.Rd index 478204d..dd5aa5d 100644 --- a/man/NcOpen.Rd +++ b/man/NcOpen.Rd @@ -34,6 +34,5 @@ print(a_from_file[1, , ]) } \author{ -N. Manubens \email{nicolau.manubens at bsc.es} +N. Manubens \email{nicolau.manubens@bsc.es} } - diff --git a/man/NcReadDims.Rd b/man/NcReadDims.Rd index 9e909fc..324e426 100644 --- a/man/NcReadDims.Rd +++ b/man/NcReadDims.Rd @@ -33,6 +33,5 @@ print(a_from_file[1, , ]) } \author{ -N. Manubens \email{nicolau.manubens at bsc.es} +N. Manubens \email{nicolau.manubens@bsc.es} } - diff --git a/man/NcReadVarNames.Rd b/man/NcReadVarNames.Rd index e8ddcae..70b63bb 100644 --- a/man/NcReadVarNames.Rd +++ b/man/NcReadVarNames.Rd @@ -34,6 +34,5 @@ print(a_from_file[1, , ]) } \author{ -N. Manubens \email{nicolau.manubens at bsc.es} +N. Manubens \email{nicolau.manubens@bsc.es} } - diff --git a/man/NcToArray.Rd b/man/NcToArray.Rd index 9bf99e0..94822c0 100644 --- a/man/NcToArray.Rd +++ b/man/NcToArray.Rd @@ -4,9 +4,15 @@ \alias{NcToArray} \title{Read Names of Variables in a NetCDF File} \usage{ -NcToArray(file_to_read, dim_indices = NULL, vars_to_read = NULL, - drop_var_dim = FALSE, unlist = TRUE, expect_all_indices = FALSE, - allow_out_of_range = TRUE) +NcToArray( + file_to_read, + dim_indices = NULL, + vars_to_read = NULL, + drop_var_dim = FALSE, + unlist = TRUE, + expect_all_indices = FALSE, + allow_out_of_range = TRUE +) } \arguments{ \item{file_to_read}{Path to the file to be read or a NetCDF object as returned by \code{easyNCDF::NcOpen} or \code{ncdf4::nc_open}.} @@ -55,6 +61,5 @@ print(a_from_file[1, , ]) } \author{ -N. Manubens, \email{nicolau.manubens at bsc.es} +N. Manubens, \email{nicolau.manubens@bsc.es} } - -- GitLab From 8ca7ee5ec0a83a1827885eecd37b821e1f6cab1f Mon Sep 17 00:00:00 2001 From: aho Date: Wed, 23 Feb 2022 13:13:59 +0100 Subject: [PATCH 2/4] Change the license --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 06c3239..3f4377a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -15,7 +15,7 @@ Imports: ncdf4, ClimProjDiags, abind -License: LGPL-3 +License: Apache License 2.0 URL: https://earth.bsc.es/gitlab/es/easyNCDF/wikis/home BugReports: https://earth.bsc.es/gitlab/es/easyNCDF/issues LazyData: true -- GitLab From 32effbe1b22e812faea6e0e852e3debd33ce7a7e Mon Sep 17 00:00:00 2001 From: aho Date: Wed, 23 Feb 2022 13:25:55 +0100 Subject: [PATCH 3/4] delete lazyData --- DESCRIPTION | 1 - 1 file changed, 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 3f4377a..77d5317 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -18,6 +18,5 @@ Imports: License: Apache License 2.0 URL: https://earth.bsc.es/gitlab/es/easyNCDF/wikis/home BugReports: https://earth.bsc.es/gitlab/es/easyNCDF/issues -LazyData: true SystemRequirements: netcdf development libraries RoxygenNote: 7.0.1 -- GitLab From c99b467041d947700cc4626523d5e8463b14e702 Mon Sep 17 00:00:00 2001 From: aho Date: Wed, 23 Feb 2022 15:14:03 +0100 Subject: [PATCH 4/4] Correct URL --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 77d5317..e1d0bcc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -16,7 +16,7 @@ Imports: ClimProjDiags, abind License: Apache License 2.0 -URL: https://earth.bsc.es/gitlab/es/easyNCDF/wikis/home -BugReports: https://earth.bsc.es/gitlab/es/easyNCDF/issues +URL: https://earth.bsc.es/gitlab/es/easyNCDF/-/wikis/home +BugReports: https://earth.bsc.es/gitlab/es/easyNCDF/-/issues SystemRequirements: netcdf development libraries RoxygenNote: 7.0.1 -- GitLab