From 03129ba18d6c8201e37cf714ba86186e05c4d8f1 Mon Sep 17 00:00:00 2001 From: Victoria Agudetse Roures Date: Mon, 27 Feb 2023 12:53:18 +0100 Subject: [PATCH 1/4] Add CERRA and CERRA-Land --- conf/archive.yml | 19 +++++++++++++++++++ conf/variable-dictionary.yml | 15 +++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/conf/archive.yml b/conf/archive.yml index 1f226a07..ba7b70a7 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/", "ps":"_f3h/", "sfcWind":"_f3h/", + "tas":"_f3h/", "winddir":"_f3h/"} + monthly_mean: {"hur":"_f3h/", "ps":"_f3h/", "sfcWind":"_f3h/", + "tas":"_f3h/", "winddir":"_f3h/"} + calendar: "proleptic_gregorian" + reference_grid: "/esarchive/recon/ecmwf/cerra/monthly_mean/tas_f3h/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"} + monthly_mean: {"prlr":"_f6h"} + calendar: "proleptic_gregorian" + reference_grid: "/esarchive/recon/ecmwf/cerraland/monthly_mean/prlr_f6h/prlr_200412.nc" + diff --git a/conf/variable-dictionary.yml b/conf/variable-dictionary.yml index 18e694ba..917abc64 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" -- GitLab From c1e467de16d4eb3d4616a0ea2475b1e461695167 Mon Sep 17 00:00:00 2001 From: Victoria Agudetse Roures Date: Mon, 27 Feb 2023 16:05:20 +0100 Subject: [PATCH 2/4] Modify Loading module for lambert coords (WIP) --- modules/Loading/Loading.R | 4 ++-- modules/Loading/testing_recipes/recipe_seasonal-tests.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/Loading/Loading.R b/modules/Loading/Loading.R index 598ddd0e..e5dafd0d 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 cda98c91..b4e05fc4 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 -- GitLab From e492fa1e6deeb71665ad35ad01450e2a5408a7c3 Mon Sep 17 00:00:00 2001 From: Victoria Agudetse Roures Date: Tue, 28 Feb 2023 09:13:45 +0100 Subject: [PATCH 3/4] Fix typo --- conf/archive.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/archive.yml b/conf/archive.yml index ba7b70a7..11e4bca9 100644 --- a/conf/archive.yml +++ b/conf/archive.yml @@ -193,8 +193,8 @@ archive: name: "ECMWF CERRA-Land" institution: "European Centre for Medium-Range Weather Forecasts" src: "recon/ecmwf/cerraland/" - daily_mean: {"prlr":"_f6h"} - monthly_mean: {"prlr":"_f6h"} + daily_mean: {"prlr":"_f6h/"} + monthly_mean: {"prlr":"_f6h/"} calendar: "proleptic_gregorian" reference_grid: "/esarchive/recon/ecmwf/cerraland/monthly_mean/prlr_f6h/prlr_200412.nc" -- GitLab From 9f7622c89a6cfa1b093e4266b45810f26f4bcd47 Mon Sep 17 00:00:00 2001 From: eduzenli Date: Wed, 8 Mar 2023 11:14:27 +0100 Subject: [PATCH 4/4] CERRA/CERRALand variable paths are edited --- conf/archive.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/archive.yml b/conf/archive.yml index 11e4bca9..eb8e86a5 100644 --- a/conf/archive.yml +++ b/conf/archive.yml @@ -183,20 +183,20 @@ archive: name: "ECMWF CERRA" institution: "European Centre for Medium-Range Weather Forecasts" src: "recon/ecmwf/cerra/" - daily_mean: {"hur":"_f3h/", "ps":"_f3h/", "sfcWind":"_f3h/", - "tas":"_f3h/", "winddir":"_f3h/"} - monthly_mean: {"hur":"_f3h/", "ps":"_f3h/", "sfcWind":"_f3h/", - "tas":"_f3h/", "winddir":"_f3h/"} + 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/tas_200506.nc" + 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/"} - monthly_mean: {"prlr":"_f6h/"} + daily_mean: {"prlr":"_f6h-r2631x1113/"} + monthly_mean: {"prlr":"_f6h-r2631x1113/"} calendar: "proleptic_gregorian" - reference_grid: "/esarchive/recon/ecmwf/cerraland/monthly_mean/prlr_f6h/prlr_200412.nc" + reference_grid: "/esarchive/recon/ecmwf/cerraland/monthly_mean/prlr_f6h-r2631x1113/prlr_200412.nc" -- GitLab