Skip to content

Commit

Permalink
Update the name of the remapcon2 operator in R recipes (#3611)
Browse files Browse the repository at this point in the history
ehogan authored May 23, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 4ab6490 commit ead073d
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ channels:
dependencies:
- aiohttp
- cartopy
- cdo >=1.9.7
- cdo >=2.3.0
- cdsapi
- cf-units
- cftime
4 changes: 2 additions & 2 deletions environment_osx.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ channels:
dependencies:
- aiohttp
- cartopy
- cdo >=1.9.7
- cdo >=2.3.0
- cdsapi
- cf-units
- cftime
@@ -48,7 +48,7 @@ dependencies:
- psy-maps
- psy-reg
- psy-simple
- pyproj>=2.1
- pyproj >=2.1
- pys2index # only from conda-forge
- python >=3.9
- python-cdo
2 changes: 1 addition & 1 deletion esmvaltool/diag_scripts/hyint/hyint_etccdi_preproc.R
Original file line number Diff line number Diff line change
@@ -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
)
8 changes: 4 additions & 4 deletions esmvaltool/diag_scripts/hyint/hyint_functions.R
Original file line number Diff line number Diff line change
@@ -626,7 +626,7 @@ create_landseamask <-

## Regridding the topographic map to chosen grid
cdo(
"remapcon2",
"remapscon2",
args = paste0("'", regrid, "'"),
input = ftopo,
output = regridded_topo
@@ -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
@@ -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(
@@ -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")
2 changes: 1 addition & 1 deletion esmvaltool/diag_scripts/hyint/hyint_preproc.R
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions esmvaltool/diag_scripts/miles/basis_functions.R
Original file line number Diff line number Diff line change
@@ -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
@@ -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(
4 changes: 2 additions & 2 deletions esmvaltool/diag_scripts/quantilebias/quantilebias_functions.R
Original file line number Diff line number Diff line change
@@ -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
@@ -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(

0 comments on commit ead073d

Please sign in to comment.