From 0c2136d271f8e579d9512f21d15ba9738ac52d14 Mon Sep 17 00:00:00 2001 From: THEERTHA KARIYATHAN Date: Mon, 7 Oct 2024 15:46:12 +0200 Subject: [PATCH 1/4] updated PeriodPET issue51 --- R/PeriodPET.R | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/R/PeriodPET.R b/R/PeriodPET.R index 27d6eca..9975073 100644 --- a/R/PeriodPET.R +++ b/R/PeriodPET.R @@ -92,6 +92,9 @@ CST_PeriodPET <- function(data, pet_method = 'hargreaves', coords <- data[[1]]$coords Dates <- data[[1]]$attrs$Dates metadata <- data[[1]]$attrs$Variable$metadata + data[[1]]$attrs$Variable$metadata[["PET"]]$longname <- "Potential evapotranspiration" + data[[1]]$attrs$Variable$metadata[["PET"]]$units <- "mm/month" + metadata_names <- intersect(names(dim(res)), names(metadata)) suppressWarnings( res <- s2dv_cube(data = res, coords = coords, @@ -383,4 +386,4 @@ PeriodPET <- function(data, dates, lat, pet_method = 'hargreaves', pet <- array(pet[which(mask_dates == 1)], dim = dims) } return(pet) -} \ No newline at end of file +} -- GitLab From 47f1226e467204c97ae5b5225e8a83b91b644b97 Mon Sep 17 00:00:00 2001 From: THEERTHA KARIYATHAN Date: Mon, 7 Oct 2024 16:49:28 +0200 Subject: [PATCH 2/4] update periodpet.R --- R/PeriodPET.R | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/R/PeriodPET.R b/R/PeriodPET.R index 9975073..b8fc910 100644 --- a/R/PeriodPET.R +++ b/R/PeriodPET.R @@ -91,11 +91,12 @@ CST_PeriodPET <- function(data, pet_method = 'hargreaves', source_files <- lapply(data, function(x) {x$attrs$source_files}) coords <- data[[1]]$coords Dates <- data[[1]]$attrs$Dates - metadata <- data[[1]]$attrs$Variable$metadata + data[[1]]$attrs$Variable$metadata[["PET"]]$longname <- "Potential evapotranspiration" data[[1]]$attrs$Variable$metadata[["PET"]]$units <- "mm/month" + metadata <- data[[1]]$attrs$Variable$metadata - metadata_names <- intersect(names(dim(res)), names(metadata)) + metadata_names <- c(intersect(names(dim(res)), names(metadata)),"PET") suppressWarnings( res <- s2dv_cube(data = res, coords = coords, varName = paste0('PET'), -- GitLab From 20ac3173097fba9c2f6753848633b4c14fbfcd89 Mon Sep 17 00:00:00 2001 From: THEERTHA KARIYATHAN Date: Thu, 10 Oct 2024 12:12:24 +0200 Subject: [PATCH 3/4] updated units of PET --- R/PeriodPET.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/PeriodPET.R b/R/PeriodPET.R index b8fc910..d0d826d 100644 --- a/R/PeriodPET.R +++ b/R/PeriodPET.R @@ -93,7 +93,7 @@ CST_PeriodPET <- function(data, pet_method = 'hargreaves', Dates <- data[[1]]$attrs$Dates data[[1]]$attrs$Variable$metadata[["PET"]]$longname <- "Potential evapotranspiration" - data[[1]]$attrs$Variable$metadata[["PET"]]$units <- "mm/month" + data[[1]]$attrs$Variable$metadata[["PET"]]$units <- "mm" metadata <- data[[1]]$attrs$Variable$metadata metadata_names <- c(intersect(names(dim(res)), names(metadata)),"PET") -- GitLab From 338722c1bd5f8c2d0a830fa4c7b852576d8d5713 Mon Sep 17 00:00:00 2001 From: vagudets Date: Wed, 16 Oct 2024 10:04:11 +0200 Subject: [PATCH 4/4] Modify attributes directly in metadata object --- R/PeriodPET.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/R/PeriodPET.R b/R/PeriodPET.R index d0d826d..02ddb5f 100644 --- a/R/PeriodPET.R +++ b/R/PeriodPET.R @@ -92,11 +92,11 @@ CST_PeriodPET <- function(data, pet_method = 'hargreaves', coords <- data[[1]]$coords Dates <- data[[1]]$attrs$Dates - data[[1]]$attrs$Variable$metadata[["PET"]]$longname <- "Potential evapotranspiration" - data[[1]]$attrs$Variable$metadata[["PET"]]$units <- "mm" metadata <- data[[1]]$attrs$Variable$metadata + metadata[["PET"]]$longname <- "Potential evapotranspiration" + metadata[["PET"]]$units <- "mm" - metadata_names <- c(intersect(names(dim(res)), names(metadata)),"PET") + metadata_names <- c(intersect(names(dim(res)), names(metadata)), "PET") suppressWarnings( res <- s2dv_cube(data = res, coords = coords, varName = paste0('PET'), -- GitLab