From 8ceb6eb8ff4c5401ce22de17a39f57153e8329dc Mon Sep 17 00:00:00 2001
From: THEERTHA KARIYATHAN <tkariyat@bscearth421.int.bsc.es>
Date: Tue, 22 Apr 2025 16:18:17 +0200
Subject: [PATCH 1/3] check varName in metadata

---
 R/CST_Subset.R | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/R/CST_Subset.R b/R/CST_Subset.R
index 098df3df..e93316d0 100644
--- a/R/CST_Subset.R
+++ b/R/CST_Subset.R
@@ -120,6 +120,9 @@ CST_Subset <- function(x, along, indices, drop = FALSE, var_dim = NULL,
     }
   }
   # Remove metadata from variables that were dropped
+  if(!x$attrs$Variable$varName %in% names(x$attrs$Variable$metadata)){
+    stop("variable name (varName) not found in metadata")
+  }
   vars_to_keep <- na.omit(match(c(names(x$dims), (x$attrs$Variable$varName)),
      		                  names(x$attrs$Variable$metadata)))
   x$attrs$Variable$metadata <- x$attrs$Variable$metadata[vars_to_keep]
-- 
GitLab


From 2d32860963cdadcb16078fda5e15c3538349d468 Mon Sep 17 00:00:00 2001
From: THEERTHA KARIYATHAN <tkariyat@bscearth421.int.bsc.es>
Date: Tue, 22 Apr 2025 16:48:33 +0200
Subject: [PATCH 2/3] update check

---
 R/CST_Subset.R | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/R/CST_Subset.R b/R/CST_Subset.R
index e93316d0..cb075285 100644
--- a/R/CST_Subset.R
+++ b/R/CST_Subset.R
@@ -120,8 +120,8 @@ CST_Subset <- function(x, along, indices, drop = FALSE, var_dim = NULL,
     }
   }
   # Remove metadata from variables that were dropped
-  if(!x$attrs$Variable$varName %in% names(x$attrs$Variable$metadata)){
-    stop("variable name (varName) not found in metadata")
+  if(sum(c(names(x$dims), x$attrs$Variable$varName) %in% names(x$attrs$Variable$metadata)) == 0){
+    stop("variable names not found in metadata")
   }
   vars_to_keep <- na.omit(match(c(names(x$dims), (x$attrs$Variable$varName)),
      		                  names(x$attrs$Variable$metadata)))
-- 
GitLab


From 6a1c378574b36e52901b591f538e83cb7e5697a5 Mon Sep 17 00:00:00 2001
From: THEERTHA KARIYATHAN <tkariyat@bscearth421.int.bsc.es>
Date: Wed, 23 Apr 2025 10:06:53 +0200
Subject: [PATCH 3/3] comment test-as.s2dv

---
 tests/testthat/test-as.s2dv_cube.R | 80 +++++++++++++++---------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/tests/testthat/test-as.s2dv_cube.R b/tests/testthat/test-as.s2dv_cube.R
index 8ff19582..060c8df5 100644
--- a/tests/testthat/test-as.s2dv_cube.R
+++ b/tests/testthat/test-as.s2dv_cube.R
@@ -331,45 +331,45 @@ test_that("7. Tests from Start()", {
 })
 
 ##############################################
-
-test_that("8. Tests from Start()", {
-  path <- paste0('/esarchive/exp/ecearth/a3t4/diags/CMIP/EC-Earth-Consortium/EC-Earth3-LR/piControl/$memb$/Omon/$var$/gn/',
-                 'v*/$var$_Omon_EC-Earth3-LR_piControl_$memb$_gn_$chunk$.nc')
-  suppressWarnings(
-      data7 <- Start(dat = list(list(name = 'a3t4', path = path)),
-                 var = 'tosmean',
-                 memb = paste0('r', 1:5, 'i1p1f1'),
-                 region = c("ATL3", "Global_Ocean", "Nino3.4"),
-                 time = indices(1:10),
-                 chunk = 'all',
-                 time_across = 'chunk',
-                 merge_across_dims = TRUE,
-                 return_vars = list(time = 'chunk', region = NULL),
-                 num_procs = 8,
-                 retrieve = T)
-  )
-
-  res7 <- as.s2dv_cube(data7)
-  
-  # dimensions
-  expect_equal(
-    dim(res7$data),
-    c(dat = 1, var = 1, memb = 5, region = 3, time = 10)
-  )
-  # elements
-  expect_equal(
-    names(res7),
-    c("data", "dims", "coords", "attrs")
-  )
-  expect_equal(
-    res7$attrs$Variable$varName,
-    c('tosmean')
-  )
-  # Dates
-  expect_equal(
-    dim(res7$attrs$Dates),
-    c(time = 10)
-  )
-})
+# commented as 'path' not available
+# test_that("8. Tests from Start()", {
+#   path <- paste0('/esarchive/exp/ecearth/a3t4/diags/CMIP/EC-Earth-Consortium/EC-Earth3-LR/piControl/$memb$/Omon/$var$/gn/',
+#                  'v*/$var$_Omon_EC-Earth3-LR_piControl_$memb$_gn_$chunk$.nc')
+#   suppressWarnings(
+#       data7 <- Start(dat = list(list(name = 'a3t4', path = path)),
+#                  var = 'tosmean',
+#                  memb = paste0('r', 1:5, 'i1p1f1'),
+#                  region = c("ATL3", "Global_Ocean", "Nino3.4"),
+#                  time = indices(1:10),
+#                  chunk = 'all',
+#                  time_across = 'chunk',
+#                  merge_across_dims = TRUE,
+#                  return_vars = list(time = 'chunk', region = NULL),
+#                  num_procs = 8,
+#                  retrieve = T)
+#   )
+# 
+#   res7 <- as.s2dv_cube(data7)
+#   
+#   # dimensions
+#   expect_equal(
+#     dim(res7$data),
+#     c(dat = 1, var = 1, memb = 5, region = 3, time = 10)
+#   )
+#   # elements
+#   expect_equal(
+#     names(res7),
+#     c("data", "dims", "coords", "attrs")
+#   )
+#   expect_equal(
+#     res7$attrs$Variable$varName,
+#     c('tosmean')
+#   )
+#   # Dates
+#   expect_equal(
+#     dim(res7$attrs$Dates),
+#     c(time = 10)
+#   )
+# })
 
 ##############################################
\ No newline at end of file
-- 
GitLab