diff --git a/conf/archive.yml b/conf/archive.yml index 1f226a0745bf9f4f49edd560f5d68a7c70489dce..eb8e86a574e680085c53ac4c115b426b75e3a559 100644 --- a/conf/archive.yml +++ b/conf/archive.yml @@ -179,5 +179,24 @@ archive: monthly_mean: {"tas":"_f6h/"} calendar: "proleptic_gregorian" reference_grid: "/esarchive/recon/ecmwf/uerra_mescan/daily_mean/tas_f6h/tas_201805.nc" + CERRA: + name: "ECMWF CERRA" + institution: "European Centre for Medium-Range Weather Forecasts" + src: "recon/ecmwf/cerra/" + daily_mean: {"hur":"_f3h-r2631x1113/", "ps":"_f3h-r2631x1113/", "sfcWind":"_f3h-r2631x1113/", + "tas":"_f3h-r2631x1113/", "winddir":"_f3h-r2631x1113/"} + monthly_mean: {"hur":"_f3h-r2631x1113/", "ps":"_f3h-r2631x1113/", "sfcWind":"_f3h-r2631x1113/", + "tas":"_f3h-r2631x1113/", "winddir":"_f3h-r2631x1113/","tasmin":"_f24h-r2631x1113/","tasmax":"_f24h-r2631x1113/"} + calendar: "proleptic_gregorian" + reference_grid: "/esarchive/recon/ecmwf/cerra/monthly_mean/tas_f3h-r2631x1113/tas_200506.nc" + CERRA-Land: + name: "ECMWF CERRA-Land" + institution: "European Centre for Medium-Range Weather Forecasts" + src: "recon/ecmwf/cerraland/" + daily_mean: {"prlr":"_f6h-r2631x1113/"} + monthly_mean: {"prlr":"_f6h-r2631x1113/"} + calendar: "proleptic_gregorian" + reference_grid: "/esarchive/recon/ecmwf/cerraland/monthly_mean/prlr_f6h-r2631x1113/prlr_200412.nc" + diff --git a/conf/variable-dictionary.yml b/conf/variable-dictionary.yml index 18e694bac67ac23832535ce5f4379a5ef6c6a61e..917abc64405d7a3297b557ac71547679b371cf6c 100644 --- a/conf/variable-dictionary.yml +++ b/conf/variable-dictionary.yml @@ -60,6 +60,11 @@ vars: long_name: "Daily Maximum Near-Surface Wind Speed" standard_name: "wind_speed" accum: no + winddir: + units: "degrees" + long_name: "10 metre wind direction" + standard_name: + accum: no # outname: "wind" rsds: units: "W m-2" @@ -89,6 +94,11 @@ vars: long_name: "Geopotential" standard_name: "geopotential" accum: no + ps: + units: "Pa" + long_name: "Surface pressure" + standard_name: "surface_air_pressure" + accum: no pr: units: "kg m-2 s-1" long_name: "Precipitation" @@ -109,6 +119,11 @@ vars: long_name: "Total Cloud Cover Percentage" standard_name: "cloud_area_fraction" accum: no + hur: + units: "%" + long_name: "2 metre relative humidity" + standard_name: "relative_humidity" + accum: no hurs: units: "%" long_name: "Near-Surface Relative Humidity" diff --git a/modules/Loading/Loading.R b/modules/Loading/Loading.R index 598ddd0e4050105138e6579c290d1ef416924ee2..e5dafd0d90c2e4525c1d5e1acac0d61fb8fb01cd 100644 --- a/modules/Loading/Loading.R +++ b/modules/Loading/Loading.R @@ -234,8 +234,8 @@ load_datasets <- function(recipe) { transform_params = list(grid = regrid_params$obs.gridtype, method = regrid_params$obs.gridmethod), transform_vars = c('latitude', 'longitude'), - synonims = list(latitude = c('lat','latitude'), - longitude = c('lon','longitude')), + synonims = list(latitude = c('lat', 'y', 'latitude'), + longitude = c('lon', 'x', 'longitude')), return_vars = list(latitude = 'dat', longitude = 'dat', time = 'file_date'), diff --git a/modules/Loading/testing_recipes/recipe_seasonal-tests.yml b/modules/Loading/testing_recipes/recipe_seasonal-tests.yml index cda98c913123a5ec1f9f194c21e26f2d3dcddea4..b4e05fc4a167f8bc68100810211c291b5a7cec8f 100644 --- a/modules/Loading/testing_recipes/recipe_seasonal-tests.yml +++ b/modules/Loading/testing_recipes/recipe_seasonal-tests.yml @@ -11,12 +11,12 @@ Analysis: name: ECMWF-SEAS5.1 Multimodel: False Reference: - name: ERA5 + name: CERRA Time: sdate: '0101' fcst_year: hcst_start: '2000' - hcst_end: '2015' + hcst_end: '2005' ftime_min: 1 ftime_max: 2 Region: @@ -25,8 +25,8 @@ Analysis: lonmin: -10 lonmax: 30 Regrid: - method: bilinear - type: to_system + method: + type: none Workflow: Calibration: method: raw