From 25c26835a4aefc32e2e57ac0565aeee29d567e69 Mon Sep 17 00:00:00 2001
From: Nicolau Manubens <nicolau.manubens@ic3.cat>
Date: Mon, 22 May 2017 21:16:14 +0200
Subject: [PATCH 1/5] Solves #195.

---
 R/PlotLayout.R | 1 +
 1 file changed, 1 insertion(+)

diff --git a/R/PlotLayout.R b/R/PlotLayout.R
index 7d5eee1e..0eb1254e 100644
--- a/R/PlotLayout.R
+++ b/R/PlotLayout.R
@@ -251,6 +251,7 @@ PlotLayout <- function(fun, plot_dims, var, ..., special_args = NULL,
       #n_plots <- n_plots + prod(head(c(rep(1, length(dim_ids)), dim(plot_array)), length(dim(plot_array))))
       if (length(dim(var[[plot_array_i]])) == length(dim_ids)) {
         dim(var[[plot_array_i]]) <- c(1, dim(var[[plot_array_i]]))
+        dim_ids <- dim_ids + 1
       }
       plot_dims[[plot_array_i]] <- dim_ids
     }
-- 
GitLab


From 88cf5912312c2917fb0fccbd1d105c27b94c49d5 Mon Sep 17 00:00:00 2001
From: Nicolau Manubens <nicolau.manubens@ic3.cat>
Date: Mon, 22 May 2017 21:56:04 +0200
Subject: [PATCH 2/5] Added usage of remapycon if available.

---
 R/Load.R  |  4 ++--
 R/Utils.R | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/R/Load.R b/R/Load.R
index efcc74c1..05649661 100644
--- a/R/Load.R
+++ b/R/Load.R
@@ -262,8 +262,8 @@ Load <- function(var, exp = NULL, obs = NULL, sdates, nmember = NULL,
   if (is.null(method) || !(method %in% c('bilinear', 'bicubic', 'conservative', 'distance-weighted'))) {
     stop("Error: parameter 'method' is wrong, can take value 'bilinear', 'bicubic', 'conservative' or 'distance-weighted'.")
   }
-  remap <- switch(method, 'bilinear' = 'remapbil', 'bicubic' = 'remapbic', 
-                  'conservative' = 'remapcon', 'distance-weighted' = 'remapdis')
+  remap <- switch(method, 'bilinear' = 'bil', 'bicubic' = 'bic', 
+                  'conservative' = 'con', 'distance-weighted' = 'dis')
 
   # grid
   if (!is.null(grid)) {
diff --git a/R/Utils.R b/R/Utils.R
index c748a508..6ec7f176 100644
--- a/R/Utils.R
+++ b/R/Utils.R
@@ -202,8 +202,11 @@
     } else {
       is_2d_var <- work_piece[['is_2d_var']]
     }
-    if ((is_2d_var || work_piece[['is_file_per_dataset']]) && (Sys.which("cdo")[[1]] == "")) {
-      stop("Error: CDO libraries not available")
+    if ((is_2d_var || work_piece[['is_file_per_dataset']])) {
+      if (Sys.which("cdo")[[1]] == "") {
+        stop("Error: CDO libraries not available")
+      }
+      cdo_version <- as.numeric_version(strsplit(suppressWarnings(system2("cdo", args = '-V', stderr = TRUE))[[1]], ' ')[[1]][5])
     }
     # If the variable to load is 2-d, we need to determine whether:
     #  - interpolation is needed
@@ -331,6 +334,10 @@
         common_grid_name <- grid_name
         remove_shift <- TRUE
       }
+      if (remap_needed && (work_piece[['remap']] == 'con') && 
+          (cdo_version >= as.numeric('1.7.0'))) {
+        work_piece[['remap']] <- 'ycon'
+      }
       if (remove_shift && !explore_dims) {
         if (!is.null(work_piece[['progress_amount']])) {
           cat("\n")
@@ -404,7 +411,7 @@
         filecopy <- tempfile(pattern = "load", fileext = ".nc")
         file.copy(filein, filecopy)
         filein <- tempfile(pattern = "loadRegridded", fileext = ".nc")
-        system(paste0("cdo -s ", work_piece[['remap']], ",", 
+        system(paste0("cdo -s remap", work_piece[['remap']], ",", 
                       common_grid_name, 
                       " -selname,", namevar, " ", filecopy, " ", filein, 
                       " 2>/dev/null", sep = ""))
@@ -741,7 +748,7 @@
                                                    } else {
                                                      paste0(lonmin, ",", lonmax, ",")
                                                    }, latmin, ",", latmax,
-                   " -", work_piece[['remap']], ",", common_grid_name, 
+                   " -remap", work_piece[['remap']], ",", common_grid_name, 
                    " ", filein2, " ", filein, " 2>/dev/null", sep = ""))
             file.remove(filein2)
             fnc <- nc_open(filein)
@@ -778,7 +785,7 @@
               fnc_mask <- nc_create(mask_file, list(ncdf_var))
               ncvar_put(fnc_mask, ncdf_var, array(rep(0, 4), dim = c(2, 2)))
               nc_close(fnc_mask)
-              system(paste0("cdo -s ", work_piece[['remap']], ",", common_grid_name, 
+              system(paste0("cdo -s remap", work_piece[['remap']], ",", common_grid_name, 
                      " ", mask_file, " ", mask_file_remap, " 2>/dev/null", sep = ""))
               fnc_mask <- nc_open(mask_file_remap)
               mask_lons <- ncvar_get(fnc_mask, 'lon')
@@ -808,7 +815,7 @@
             ###                                         } else {
             ###                                           paste0(lonmin, ",", lonmax, ",")
             ###                                         }, latmin, ",", latmax,
-            ###         " -", work_piece[['remap']], ",", common_grid_name, 
+            ###         " -remap", work_piece[['remap']], ",", common_grid_name, 
             ###This is wrong: same files  
             ###         " ", mask_file, " ", mask_file, " 2>/dev/null", sep = ""))
             ###  fnc_mask <- nc_open(mask_file) 
-- 
GitLab


From b2faaa2395d96e6c3a515a0fdb41d8a325b9e57b Mon Sep 17 00:00:00 2001
From: Nicolau Manubens <nicolau.manubens@ic3.cat>
Date: Mon, 22 May 2017 22:09:36 +0200
Subject: [PATCH 3/5] Small fix.

---
 R/Utils.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/Utils.R b/R/Utils.R
index 6ec7f176..603d4716 100644
--- a/R/Utils.R
+++ b/R/Utils.R
@@ -335,7 +335,7 @@
         remove_shift <- TRUE
       }
       if (remap_needed && (work_piece[['remap']] == 'con') && 
-          (cdo_version >= as.numeric('1.7.0'))) {
+          (cdo_version >= as.numeric_version('1.7.0'))) {
         work_piece[['remap']] <- 'ycon'
       }
       if (remove_shift && !explore_dims) {
-- 
GitLab


From d373ffbc63b2fb3c28e82699d8c8ea5639e45569 Mon Sep 17 00:00:00 2001
From: Nicolau Manubens <nicolau.manubens@ic3.cat>
Date: Mon, 22 May 2017 22:18:15 +0200
Subject: [PATCH 4/5] Support for remapycon in CDORemap().

---
 R/CDORemap.R | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/R/CDORemap.R b/R/CDORemap.R
index 49bd9dbe..55f12904 100644
--- a/R/CDORemap.R
+++ b/R/CDORemap.R
@@ -395,6 +395,12 @@ CDORemap <- function(data_array = NULL, lons, lats, grid, method,
     if (nchar(Sys.which('cdo')[1]) < 1) {
       stop("CDO must be installed in order to use the .CDORemap.")
     }
+    cdo_version <- as.numeric_version(
+      strsplit(suppressWarnings(system2("cdo", args = '-V', stderr = TRUE))[[1]], ' ')[[1]][5]
+    )
+    if ((cdo_version >= as.numeric_version('1.7.0')) && (method == 'con')) {
+      method <- 'ycon'
+    }
     # CDO takes arrays of 3 dimensions or 4 if one of them is unlimited.
     # The unlimited dimension can only be the left-most (right-most in R).
     # There are no restrictions for the dimension names or variable names.
-- 
GitLab


From a23764bc5c2488eed2ad0914c93b5dad31767109 Mon Sep 17 00:00:00 2001
From: Nicolau Manubens <nicolau.manubens@ic3.cat>
Date: Mon, 22 May 2017 22:23:52 +0200
Subject: [PATCH 5/5] Bumped version to 2.8.3.

---
 DESCRIPTION                |   2 +-
 man/s2dverification.Rd     |   4 ++--
 s2dverification-manual.pdf | Bin 371555 -> 371549 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index d36c898a..bf75372b 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: s2dverification
 Title: Set of Common Tools for Forecast Verification
-Version: 2.8.2
+Version: 2.8.3
 Authors@R: c(
     person("BSC-CNS", role = c("aut", "cph")),
     person("Virginie", "Guemas", , "virginie.guemas@bsc.es", role = "aut"),
diff --git a/man/s2dverification.Rd b/man/s2dverification.Rd
index ee3fca80..23d31299 100644
--- a/man/s2dverification.Rd
+++ b/man/s2dverification.Rd
@@ -10,8 +10,8 @@ Set of tools to verify forecasts through the computation of typical prediction s
   \tabular{ll}{
 Package: \tab s2dverification\cr
 Type: \tab Package\cr
-Version: \tab 2.8.2\cr
-Date: \tab 2017-05-15\cr
+Version: \tab 2.8.3\cr
+Date: \tab 2017-05-22\cr
 License: \tab LGPLv3\cr
   }
 Check an overview of the package functionalities and its modules at \url{https://earth.bsc.es/gitlab/es/s2dverification/wikis/home}.
diff --git a/s2dverification-manual.pdf b/s2dverification-manual.pdf
index 8c8bdc7fc49c2a8c052aefcaa8a4d462386c393c..73866213b995894800577557a2ec44459e2bb07f 100644
GIT binary patch
delta 5512
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

delta 5515
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
B9Nz!{

-- 
GitLab