Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the name of the remapcon2 operator in R recipes #3611

Merged
merged 4 commits into from
May 23, 2024
Merged

Update the name of the remapcon2 operator in R recipes #3611

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
348c6e8
#3610: Rename remapcon2 to remapscon2
ehogan May 22, 2024
618b6f8
#3610: Update CDO pin
ehogan May 23, 2024
b929755
#3610: Revert CDO pin in setup.py
ehogan May 23, 2024
bfe68d9
#3610: Update CDO pin in environment_osx.yml
ehogan May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion esmvaltool/diag_scripts/hyint/hyint_etccdi_preproc.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ hyint_etccdi_preproc <-
sfile_tmp0 <- cdo("delvar", args = "time_bnds", input = sfile)
gridf <- tempfile()
cdo("griddes", input = hyint_file, stdout = gridf)
sfile_tmp1 <- cdo("remapcon2",
sfile_tmp1 <- cdo("remapscon2",
args = gridf,
input = sfile_tmp0
)
Expand Down
8 changes: 4 additions & 4 deletions esmvaltool/diag_scripts/hyint/hyint_functions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ create_landseamask <-

## Regridding the topographic map to chosen grid
cdo(
"remapcon2",
"remapscon2",
args = paste0("'", regrid, "'"),
input = ftopo,
output = regridded_topo
Expand Down Expand Up @@ -827,7 +827,7 @@ ncdf_opener_universal <- # nolint
rotate = "full",
interp2grid = F,
grid = "r144x73",
remap_method = "remapcon2",
remap_method = "remapscon2",
exportlonlat = TRUE,
verbose = F) {
# load package
Expand Down Expand Up @@ -1090,7 +1090,7 @@ ncdf_opener <- function(namefile,
rotate = "full",
interp2grid = F,
grid = "r144x73",
remap_method = "remapcon2",
remap_method = "remapscon2",
exportlonlat = T) {
field <-
ncdf_opener_universal(
Expand Down Expand Up @@ -1123,7 +1123,7 @@ ncdf_opener_time <- # nolint
rotate = "full",
interp2grid = F,
grid = "r144x73",
remap_method = "remapcon2") {
remap_method = "remapscon2") {
# function to open netcdf files. It uses ncdf4 library
# time selection of month and years needed automatically rotate matrix
# to place greenwich at the center (flag "rotate")
Expand Down
2 changes: 1 addition & 1 deletion esmvaltool/diag_scripts/hyint/hyint_preproc.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ hyint_preproc <- function(work_dir,
} else {
gridf <- rgrid
}
tempf <- cdo("remapcon2", args = gridf, input = climofile)
tempf <- cdo("remapscon2", args = gridf, input = climofile)
unlink(gridf)
} else {
tempf <- cdo("addc", args = "0", input = climofile)
Expand Down
4 changes: 2 additions & 2 deletions esmvaltool/diag_scripts/miles/basis_functions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ ncdf_opener_universal <- # nolint
interp2grid = FALSE,
fillmiss = FALSE,
grid = "r144x73",
remap_method = "remapcon2",
remap_method = "remapscon2",
exportlonlat = TRUE,
verbose = TRUE) {
# load package
Expand Down Expand Up @@ -645,7 +645,7 @@ ncdf_opener <- function(namefile,
interp2grid = FALSE,
fillmiss = FALSE,
grid = "r144x73",
remap_method = "remapcon2",
remap_method = "remapscon2",
exportlonlat = TRUE,
verbose = FALSE) {
field <- ncdf_opener_universal(
Expand Down
4 changes: 2 additions & 2 deletions esmvaltool/diag_scripts/quantilebias/quantilebias_functions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ ncdf_opener_universal <- # nolint
rotate = "full",
interp2grid = F,
grid = "r144x73",
remap_method = "remapcon2",
remap_method = "remapscon2",
exportlonlat = TRUE,
verbose = F) {
# load package
Expand Down Expand Up @@ -326,7 +326,7 @@ ncdf_opener <- function(namefile,
rotate = "full",
interp2grid = F,
grid = "r144x73",
remap_method = "remapcon2",
remap_method = "remapscon2",
exportlonlat = T) {
field <-
ncdf_opener_universal(
Expand Down