From e1f450685f1739842af785507b7c558d88511aab Mon Sep 17 00:00:00 2001 From: vagudets Date: Tue, 26 Mar 2024 09:38:45 +0100 Subject: [PATCH 1/3] Fix bug in merging of Dates attribute --- R/CST_MergeDims.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/CST_MergeDims.R b/R/CST_MergeDims.R index dabdc57f..6756ce79 100644 --- a/R/CST_MergeDims.R +++ b/R/CST_MergeDims.R @@ -53,7 +53,8 @@ CST_MergeDims <- function(data, merge_dims = c('ftime', 'monthly'), # attrs if (all(merge_dims %in% names(dim(data$attrs$Dates)))) { - dim(data$attrs$Dates) <- dim(data$data)[rename_dim] + data$attrs$Dates <- MergeDims(data$attrs$Dates, merge_dims = merge_dims, + rename_dim = rename_dim, na.rm = na.rm) } else if (any(merge_dims %in% names(dim(data$attrs$Dates)))) { warning("The dimensions of 'Dates' array will be different from ", "the temporal dimensions in 'data'. Parameter 'merge_dims' ", -- GitLab From 8068b4d9f6996dfb803ca79967fbcffb48cf7702 Mon Sep 17 00:00:00 2001 From: vagudets Date: Tue, 26 Mar 2024 09:38:56 +0100 Subject: [PATCH 2/3] Revert "Fix bug in merging of Dates attribute" This reverts commit e1f450685f1739842af785507b7c558d88511aab. --- R/CST_MergeDims.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/R/CST_MergeDims.R b/R/CST_MergeDims.R index 6756ce79..dabdc57f 100644 --- a/R/CST_MergeDims.R +++ b/R/CST_MergeDims.R @@ -53,8 +53,7 @@ CST_MergeDims <- function(data, merge_dims = c('ftime', 'monthly'), # attrs if (all(merge_dims %in% names(dim(data$attrs$Dates)))) { - data$attrs$Dates <- MergeDims(data$attrs$Dates, merge_dims = merge_dims, - rename_dim = rename_dim, na.rm = na.rm) + dim(data$attrs$Dates) <- dim(data$data)[rename_dim] } else if (any(merge_dims %in% names(dim(data$attrs$Dates)))) { warning("The dimensions of 'Dates' array will be different from ", "the temporal dimensions in 'data'. Parameter 'merge_dims' ", -- GitLab From f340e1cd07f9365f7667ff7d5a932b1e20c6ec96 Mon Sep 17 00:00:00 2001 From: vagudets Date: Mon, 27 May 2024 17:01:03 +0200 Subject: [PATCH 3/3] Change is.null() check to length == 0 check --- R/as.s2dv_cube.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/as.s2dv_cube.R b/R/as.s2dv_cube.R index c504fbcc..1b4c4275 100644 --- a/R/as.s2dv_cube.R +++ b/R/as.s2dv_cube.R @@ -327,13 +327,13 @@ as.s2dv_cube <- function(object, remove_attrs_coords = FALSE, if (!remove_attrs_coords) attr(result$coords[[dat_dim]], 'indices') <- FALSE } for (i in 2:length(names(FileSelector))) { - if (!is.null(lon_name_dat)) { + if (!(length(lon_name_dat) == 0L)) { if (any(result$coords[[lon_name_dat]] != as.vector(attributes(object)$Variables[[names(FileSelector)[i]]][[lon_name_dat]]))) { warning("'lon' values are different for different datasets. ", "Only values from the first will be used.") } } - if (!is.null(lat_name_dat)) { + if (!(length(lat_name_dat) == 0L)) { if (any(result$coords[[lat_name_dat]] != as.vector(attributes(object)$Variables[[names(FileSelector)[i]]][[lat_name_dat]]))) { warning("'lat' values are different for different datasets. ", "Only values from the first will be used.") -- GitLab