From 2551992b7065fe428327048b209bd86402c2a35f Mon Sep 17 00:00:00 2001 From: aho Date: Mon, 7 Nov 2022 12:40:30 +0100 Subject: [PATCH 1/3] Add encoding --- .Rbuildignore | 14 +++++++------- DESCRIPTION | 4 +++- NEWS.md | 9 +++++++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.Rbuildignore b/.Rbuildignore index 90018c7..2ef8ba9 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -6,16 +6,16 @@ ^README\.md$ #\..*\.RData$ #^vignettes$ -#^tests$ ^inst/doc$ -#^inst/doc/*$ -#^inst/doc/figures/$ -#^inst/doc/usecase/$ -#^inst/PlotProfiling\.R$ -.gitlab-ci.yml +^\.gitlab-ci\.yml$ +## unit tests should be ignored when building the package for CRAN +^tests$ +^inst/PlotProfiling\.R$ + # Suggested by http://r-pkgs.had.co.nz/package.html ^.*\.Rproj$ # Automatically added by RStudio, ^\.Rproj\.user$ # used for temporary files. ^README\.Rmd$ # An Rmarkdown file used to generate README.md ^cran-comments\.md$ # Comments for CRAN submission -^NEWS\.md$ # A news file written in Markdown +#^NEWS\.md$ # A news file written in Markdown +^\.gitlab-ci\.yml$ diff --git a/DESCRIPTION b/DESCRIPTION index 4c800e7..6b75f77 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: startR Title: Automatically Retrieve Multidimensional Distributed Data Sets -Version: 2.2.0-2 +Version: 2.2.1 Authors@R: c( person("Nicolau", "Manubens", , "nicolau.manubens@bsc.es", role = c("aut")), person("An-Chi", "Ho", , "an.ho@bsc.es", role = c("aut", "cre")), @@ -8,6 +8,7 @@ Authors@R: c( person("Javier", "Vegas", , "javier.vegas@bsc.es", role = c("ctb")), person("Pierre-Antoine", "Bretonniere", , "pierre-antoine.bretonniere@bsc.es", role = c("ctb")), person("Roberto", "Serrano", , "rsnotivoli@gmal.com", role = c("ctb")), + person("Eva", "Rifa", , "eva.rifarovira@bsc.es", role = "ctb"), person("BSC-CNS", role = c("aut", "cph"))) Description: Tool to automatically fetch, transform and arrange subsets of multi- dimensional data sets (collections of files) stored in local and/or @@ -39,4 +40,5 @@ License: Apache License 2.0 URL: https://earth.bsc.es/gitlab/es/startR/ BugReports: https://earth.bsc.es/gitlab/es/startR/-/issues SystemRequirements: cdo ecFlow +Encoding: UTF-8 RoxygenNote: 7.2.0 diff --git a/NEWS.md b/NEWS.md index a3ac518..2346130 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,14 @@ -# startR v2.2.0-2 (Release date: 2022-08-25) +# startR v2.2.1 (Release date: 2022-11-07) +- Reduce warning messages from CDO. +- Reduce repetitive warning messages from CDORemapper() when single core is used. When multiple cores +are used, there are still repetitive messages. + +# startR v2.2.0-2 (Release date: 2022-08-25; internally) - Use the destination grid to decide which indices to take after interpolation. - Bugfix when Start() parameter "return_vars" is not used. - Allow netCDF files to not have calendar attributes (force it to be standard calendar) -# startR v2.2.0-1 (Release date: 2022-04-19) +# startR v2.2.0-1 (Release date: 2022-04-19; internally) - Bugfix for the case that the variable has units like time, e.g., "days". - Development of metadata reshaping. The metadata should correspond to data if data are reshaped by parameter "merge_across_dims" and "split_multiselected_dims", as well as if data selectors are not continuous indices. - Development of multiple dependency by array selector. An inner dimension indices can vary with multiple file dimensions. -- GitLab From 461ef56a29715718c76629dad6a81c0632697c65 Mon Sep 17 00:00:00 2001 From: aho Date: Fri, 11 Nov 2022 16:03:38 +0100 Subject: [PATCH 2/3] Fix link and add use case in index --- inst/doc/faq.md | 2 +- inst/doc/usecase.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/inst/doc/faq.md b/inst/doc/faq.md index 6c6a119..f92b798 100644 --- a/inst/doc/faq.md +++ b/inst/doc/faq.md @@ -29,7 +29,7 @@ This document intends to be the first reference for any doubts that you may have 23. [The best practice of using vector and list for selectors](#23-the-best-practice-of-using-vector-and-list-for-selectors) 24. [Do both interpolation and chunking on spatial dimensions](#24-do-both-interpolation-and-chunking-on-spatial-dimensions) 25. [What to do if your function has too many target dimensions](#25-what-to-do-if-your-function-has-too-many-target-dimensions) - 26. [Use merge_across_dims_narm to remove NAs](#26-use-merge-across-dims-narm-to-remove-nas) + 26. [Use merge_across_dims_narm to remove NAs](#26-use-merge_across_dims_narm-to-remove-nas) 2. **Something goes wrong...** diff --git a/inst/doc/usecase.md b/inst/doc/usecase.md index 0ffacc7..c7748f6 100644 --- a/inst/doc/usecase.md +++ b/inst/doc/usecase.md @@ -68,6 +68,12 @@ this use case is for two file dimensions (i.e., the usage of *_depends). 15. [Load irregular grid data](inst/doc/usecase/ex1_15_irregular_grid_CDORemap.R) This script shows how to use Start() to load irregular grid data , then regrid it by s2dv::CDORemap. + 16. [Merge files with different time dimension length](inst/doc/usecase/ex1_16_files_different_time_dim_length.R) + This script shows how to use Start() to load files with different time dimension length +and reshape the array without undesired NAs. + + + 2. **Execute computation (use `Compute()`)** 1. [Function working on time dimension](inst/doc/usecase/ex2_1_timedim.R) 2. [Function using attributes of the data](inst/doc/usecase/ex2_2_attr.R) -- GitLab From 65998fc8458231378e0b0b34b08f3ddd9829eb13 Mon Sep 17 00:00:00 2001 From: aho Date: Mon, 14 Nov 2022 14:42:03 +0100 Subject: [PATCH 3/3] Update NEWS --- NEWS.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 2346130..c1dc90b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,9 @@ -# startR v2.2.1 (Release date: 2022-11-07) +# startR v2.2.1 (Release date: 2022-11-17) - Reduce warning messages from CDO. - Reduce repetitive warning messages from CDORemapper() when single core is used. When multiple cores are used, there are still repetitive messages. +- Bugfix in Start() about ClimProjDiags::Subset inputs. +- Bugfix when longitude selector range is very close but not global. The transform indices are correctly selected now. # startR v2.2.0-2 (Release date: 2022-08-25; internally) - Use the destination grid to decide which indices to take after interpolation. -- GitLab