From f99e0fc68a98d029bd9a8d5e1ba8e340b7697e47 Mon Sep 17 00:00:00 2001 From: vagudets Date: Mon, 16 Dec 2024 14:53:09 +0100 Subject: [PATCH] Add parameter 'print_sys_msg' to Start() and CDORemap() calls --- modules/Loading/R/load_decadal.R | 9 ++++++--- modules/Loading/R/load_seasonal.R | 12 ++++++++---- modules/Loading/R/load_subseasonal.R | 12 ++++++++---- modules/Loading/R/load_tas_tos.R | 18 ++++++++++++------ 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/modules/Loading/R/load_decadal.R b/modules/Loading/R/load_decadal.R index 40c19329..c55688e0 100644 --- a/modules/Loading/R/load_decadal.R +++ b/modules/Loading/R/load_decadal.R @@ -125,7 +125,8 @@ load_decadal <- function(recipe) { transform = regrid_params$fcst.transform, transform_extra_cells = 2, transform_params = list(grid = regrid_params$fcst.gridtype, - method = regrid_params$fcst.gridmethod), + method = regrid_params$fcst.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(longitude = c('lon', 'longitude'), latitude = c('lat', 'latitude')), @@ -269,7 +270,8 @@ load_decadal <- function(recipe) { transform = regrid_params$obs.transform, transform_extra_cells = 2, transform_params = list(grid = regrid_params$obs.gridtype, #nc file - method = regrid_params$obs.gridmethod), + method = regrid_params$obs.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat','latitude'), longitude = c('lon','longitude')), @@ -296,7 +298,8 @@ load_decadal <- function(recipe) { transform = regrid_params$obs.transform, transform_extra_cells = 2, transform_params = list(grid = regrid_params$obs.gridtype, #nc file - method = regrid_params$obs.gridmethod), + method = regrid_params$obs.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat','latitude'), longitude = c('lon','longitude')), diff --git a/modules/Loading/R/load_seasonal.R b/modules/Loading/R/load_seasonal.R index bbee8d4d..70b7d534 100644 --- a/modules/Loading/R/load_seasonal.R +++ b/modules/Loading/R/load_seasonal.R @@ -113,7 +113,8 @@ load_seasonal <- function(recipe) { longitude_reorder = circularsort, transform = regrid_params$fcst.transform, transform_params = list(grid = regrid_params$fcst.gridtype, - method = regrid_params$fcst.gridmethod), + method = regrid_params$fcst.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat', 'latitude'), longitude = c('lon', 'longitude'), @@ -177,7 +178,8 @@ load_seasonal <- function(recipe) { longitude_reorder = circularsort, transform = regrid_params$fcst.transform, transform_params = list(grid = regrid_params$fcst.gridtype, - method = regrid_params$fcst.gridmethod), + method = regrid_params$fcst.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat', 'latitude'), longitude = c('lon', 'longitude'), @@ -249,7 +251,8 @@ load_seasonal <- function(recipe) { longitude_reorder = circularsort, transform = regrid_params$obs.transform, transform_params = list(grid = regrid_params$obs.gridtype, - method = regrid_params$obs.gridmethod), + method = regrid_params$obs.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat','latitude'), longitude = c('lon','longitude')), @@ -287,7 +290,8 @@ load_seasonal <- function(recipe) { longitude_reorder = circularsort, transform = regrid_params$obs.transform, transform_params = list(grid = regrid_params$obs.gridtype, - method = regrid_params$obs.gridmethod), + method = regrid_params$obs.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat','latitude'), longitude = c('lon','longitude')), diff --git a/modules/Loading/R/load_subseasonal.R b/modules/Loading/R/load_subseasonal.R index 9176ad7e..9fa30202 100644 --- a/modules/Loading/R/load_subseasonal.R +++ b/modules/Loading/R/load_subseasonal.R @@ -104,7 +104,8 @@ load_subseasonal <- function(recipe) { longitude_reorder = circularsort, transform = regrid_params$fcst.transform, transform_params = list(grid = regrid_params$fcst.gridtype, - method = regrid_params$fcst.gridmethod), + method = regrid_params$fcst.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat', 'latitude'), longitude = c('lon', 'longitude'), @@ -169,7 +170,8 @@ load_subseasonal <- function(recipe) { longitude_reorder = circularsort, transform = regrid_params$fcst.transform, transform_params = list(grid = regrid_params$fcst.gridtype, - method = regrid_params$fcst.gridmethod), + method = regrid_params$fcst.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat', 'latitude'), longitude = c('lon', 'longitude'), @@ -242,7 +244,8 @@ load_subseasonal <- function(recipe) { longitude_reorder = circularsort, transform = regrid_params$obs.transform, transform_params = list(grid = regrid_params$obs.gridtype, - method = regrid_params$obs.gridmethod), + method = regrid_params$obs.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat','latitude'), longitude = c('lon','longitude')), @@ -280,7 +283,8 @@ load_subseasonal <- function(recipe) { longitude_reorder = circularsort, transform = regrid_params$obs.transform, transform_params = list(grid = regrid_params$obs.gridtype, - method = regrid_params$obs.gridmethod), + method = regrid_params$obs.gridmethod, + print_sys_msg = TRUE), transform_vars = c('latitude', 'longitude'), synonims = list(latitude = c('lat','latitude'), longitude = c('lon','longitude')), diff --git a/modules/Loading/R/load_tas_tos.R b/modules/Loading/R/load_tas_tos.R index 4710920b..8a604769 100644 --- a/modules/Loading/R/load_tas_tos.R +++ b/modules/Loading/R/load_tas_tos.R @@ -385,7 +385,8 @@ load_tas_tos <- function(recipe) { method = recipe$Analysis$Regrid$method, avoid_writes = TRUE, crop = c(lons.min, lons.max,lats.min, lats.max), - force_remap = TRUE) + force_remap = TRUE, + print_sys_msg = TRUE) obs$data <- aux$data_array obs$coords$longitude <- aux$lons @@ -402,7 +403,8 @@ load_tas_tos <- function(recipe) { lons = hcst$coords$longitude, lats = hcst$coords$latitude, grid = regrid_params$fcst.gridtype, method = recipe$Analysis$Regrid$method, avoid_writes = TRUE, crop = TRUE, - force_remap = TRUE) + force_remap = TRUE, + print_sys_msg = TRUE) hcst$data <- aux$data_array hcst$coords$longitude <- aux$lons @@ -418,7 +420,8 @@ load_tas_tos <- function(recipe) { grid = regrid_params$fcst.gridtype, method = recipe$Analysis$Regrid$method, avoid_writes = TRUE, crop = TRUE, - force_remap = TRUE) + force_remap = TRUE, + print_sys_msg = TRUE) fcst$data <- aux$data_array fcst$coords$longitude <- aux$lons @@ -436,7 +439,8 @@ load_tas_tos <- function(recipe) { lons = hcst$coords$longitude, lats = hcst$coords$latitude, grid = regrid_params$fcst.gridtype, method = recipe$Analysis$Regrid$method, avoid_writes = TRUE, crop = TRUE, - force_remap = TRUE) + force_remap = TRUE, + print_sys_msg = TRUE) hcst$data <- aux$data_array hcst$coords$longitude <- aux$lons @@ -452,7 +456,8 @@ load_tas_tos <- function(recipe) { grid = regrid_params$fcst.gridtype, method = recipe$Analysis$Regrid$method, avoid_writes = TRUE, crop = TRUE, - force_remap = TRUE) + force_remap = TRUE, + print_sys_msg = TRUE) fcst$data <- aux$data_array fcst$coords$longitude <- aux$lons @@ -468,7 +473,8 @@ load_tas_tos <- function(recipe) { grid = regrid_params$obs.gridtype, method = recipe$Analysis$Regrid$method, avoid_writes = TRUE, crop = TRUE, - force_remap = TRUE) + force_remap = TRUE, + print_sys_msg = TRUE) obs$data <- aux$data_array obs$coords$longitude <- aux$lons -- GitLab