From 6fe3da804236126ab21c257af7d198dad29c66c2 Mon Sep 17 00:00:00 2001 From: Robert Osinski Date: Mon, 20 May 2024 12:09:59 +0000 Subject: [PATCH 1/7] branch with fix for mars for 235095, 235096 --- .../grib2/localConcepts/cerise/name.def | 14 +++++++++++ .../grib2/localConcepts/cerise/paramId.def | 14 +++++++++++ .../grib2/localConcepts/cerise/shortName.def | 24 +++++++++++++++---- .../grib2/localConcepts/cerise/units.def | 14 +++++++++++ definitions/grib2/name.def | 14 ----------- definitions/grib2/paramId.def | 14 ----------- definitions/grib2/shortName.def | 14 ----------- definitions/grib2/units.def | 14 ----------- 8 files changed, 61 insertions(+), 61 deletions(-) diff --git a/definitions/grib2/localConcepts/cerise/name.def b/definitions/grib2/localConcepts/cerise/name.def index cac36cdea..3d758e137 100644 --- a/definitions/grib2/localConcepts/cerise/name.def +++ b/definitions/grib2/localConcepts/cerise/name.def @@ -153,6 +153,20 @@ typeOfStatisticalProcessing = 1 ; } #Time-mean snow depth +'Time-mean snow depth' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 11 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow cover +'Time-mean snow cover' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 42 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow depth 'Time-mean snow depth' = { localTablesVersion = 1 ; discipline = 0 ; diff --git a/definitions/grib2/localConcepts/cerise/paramId.def b/definitions/grib2/localConcepts/cerise/paramId.def index c4af1e971..a3f2a3407 100644 --- a/definitions/grib2/localConcepts/cerise/paramId.def +++ b/definitions/grib2/localConcepts/cerise/paramId.def @@ -153,6 +153,20 @@ typeOfStatisticalProcessing = 1 ; } #Time-mean snow depth +'235095' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 11 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow cover +'235096' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 42 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow depth '235141' = { localTablesVersion = 1 ; discipline = 0 ; diff --git a/definitions/grib2/localConcepts/cerise/shortName.def b/definitions/grib2/localConcepts/cerise/shortName.def index 0ccc6c90f..9d88fb46e 100644 --- a/definitions/grib2/localConcepts/cerise/shortName.def +++ b/definitions/grib2/localConcepts/cerise/shortName.def @@ -153,7 +153,21 @@ typeOfStatisticalProcessing = 1 ; } #Time-mean snow depth -'msd_m' = { +'avg_sde' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 11 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow cover +'avg_snowc' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 42 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow depth +'avg_sd_m' = { localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 1 ; @@ -161,7 +175,7 @@ typeOfStatisticalProcessing = 0 ; } #Time-mean low cloud cover -'mlcc_frac' = { +'avg_lcc_frac' = { localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 6 ; @@ -169,7 +183,7 @@ typeOfStatisticalProcessing = 0 ; } #Time-mean medium cloud cover -'mmcc_frac' = { +'avg_mcc_frac' = { localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 6 ; @@ -177,7 +191,7 @@ typeOfStatisticalProcessing = 0 ; } #Time-mean high cloud cover -'mhcc_frac' = { +'avg_hcc_frac' = { localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 6 ; @@ -185,7 +199,7 @@ typeOfStatisticalProcessing = 0 ; } #Time-mean forecast albedo -'mfal_frac' = { +'avg_fal_frac' = { localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 19 ; diff --git a/definitions/grib2/localConcepts/cerise/units.def b/definitions/grib2/localConcepts/cerise/units.def index afc663307..d5215c398 100644 --- a/definitions/grib2/localConcepts/cerise/units.def +++ b/definitions/grib2/localConcepts/cerise/units.def @@ -153,6 +153,20 @@ typeOfStatisticalProcessing = 1 ; } #Time-mean snow depth +'m' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 11 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow cover +'%' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 42 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow depth 'm of water equivalent' = { localTablesVersion = 1 ; discipline = 0 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 09f826ace..a7a37c891 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -4916,20 +4916,6 @@ parameterNumber = 18 ; typeOfStatisticalProcessing = 0 ; } -#Time-mean snow depth -'Time-mean snow depth' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 11 ; - typeOfStatisticalProcessing = 0 ; - } -#Time-mean snow cover -'Time-mean snow cover' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 42 ; - typeOfStatisticalProcessing = 0 ; - } #Time-mean geopotential 'Time-mean geopotential' = { discipline = 0 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index a068d2b0d..28efe0568 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -4916,20 +4916,6 @@ parameterNumber = 18 ; typeOfStatisticalProcessing = 0 ; } -#Time-mean snow depth -'235095' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 11 ; - typeOfStatisticalProcessing = 0 ; - } -#Time-mean snow cover -'235096' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 42 ; - typeOfStatisticalProcessing = 0 ; - } #Time-mean geopotential '235129' = { discipline = 0 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 0a52b45b1..6b968b21d 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -4916,20 +4916,6 @@ parameterNumber = 18 ; typeOfStatisticalProcessing = 0 ; } -#Time-mean snow depth -'msde' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 11 ; - typeOfStatisticalProcessing = 0 ; - } -#Time-mean snow cover -'msnowc' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 42 ; - typeOfStatisticalProcessing = 0 ; - } #Time-mean geopotential 'mz' = { discipline = 0 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index c43f0e83f..a20c036c4 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -4916,20 +4916,6 @@ parameterNumber = 18 ; typeOfStatisticalProcessing = 0 ; } -#Time-mean snow depth -'m' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 11 ; - typeOfStatisticalProcessing = 0 ; - } -#Time-mean snow cover -'%' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 42 ; - typeOfStatisticalProcessing = 0 ; - } #Time-mean geopotential 'm**2 s**-2' = { discipline = 0 ; From 9adb4fcc051a3d4edeb84dd0a4fca515598dd755 Mon Sep 17 00:00:00 2001 From: Robert Osinski Date: Mon, 20 May 2024 12:20:10 +0000 Subject: [PATCH 2/7] reverted cersise shortNames to the ones from hotfix/2.35.2 --- definitions/grib2/localConcepts/cerise/shortName.def | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/definitions/grib2/localConcepts/cerise/shortName.def b/definitions/grib2/localConcepts/cerise/shortName.def index 9d88fb46e..cf0b5b0ae 100644 --- a/definitions/grib2/localConcepts/cerise/shortName.def +++ b/definitions/grib2/localConcepts/cerise/shortName.def @@ -175,7 +175,7 @@ typeOfStatisticalProcessing = 0 ; } #Time-mean low cloud cover -'avg_lcc_frac' = { +'mlcc_frac' = { localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 6 ; @@ -183,7 +183,7 @@ typeOfStatisticalProcessing = 0 ; } #Time-mean medium cloud cover -'avg_mcc_frac' = { +'mmcc_frac' = { localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 6 ; @@ -191,7 +191,7 @@ typeOfStatisticalProcessing = 0 ; } #Time-mean high cloud cover -'avg_hcc_frac' = { +'mhcc_frac' = { localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 6 ; @@ -199,7 +199,7 @@ typeOfStatisticalProcessing = 0 ; } #Time-mean forecast albedo -'avg_fal_frac' = { +'mfal_frac' = { localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 19 ; From ce012eb7587221b234e17559a6924e399b9b37aa Mon Sep 17 00:00:00 2001 From: Robert Osinski Date: Mon, 20 May 2024 12:29:00 +0000 Subject: [PATCH 3/7] reverted cersise shortNames to the ones from hotfix/2.35.2 --- definitions/grib2/localConcepts/cerise/shortName.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/grib2/localConcepts/cerise/shortName.def b/definitions/grib2/localConcepts/cerise/shortName.def index cf0b5b0ae..03a263bec 100644 --- a/definitions/grib2/localConcepts/cerise/shortName.def +++ b/definitions/grib2/localConcepts/cerise/shortName.def @@ -167,7 +167,7 @@ typeOfStatisticalProcessing = 0 ; } #Time-mean snow depth -'avg_sd_m' = { +'msd_m' = { localTablesVersion = 1 ; discipline = 0 ; parameterCategory = 1 ; From 0693df9e1d177fd34e56b8617aa3ced5ab51667f Mon Sep 17 00:00:00 2001 From: Robert Osinski Date: Mon, 20 May 2024 12:52:28 +0000 Subject: [PATCH 4/7] reverted cersise shortNames to the ones from hotfix/2.35.2 --- definitions/grib2/localConcepts/cerise/shortName.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/definitions/grib2/localConcepts/cerise/shortName.def b/definitions/grib2/localConcepts/cerise/shortName.def index 03a263bec..4fc979f27 100644 --- a/definitions/grib2/localConcepts/cerise/shortName.def +++ b/definitions/grib2/localConcepts/cerise/shortName.def @@ -153,14 +153,14 @@ typeOfStatisticalProcessing = 1 ; } #Time-mean snow depth -'avg_sde' = { +'msde' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 11 ; typeOfStatisticalProcessing = 0 ; } #Time-mean snow cover -'avg_snowc' = { +'msnowc' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 42 ; From 8c58199e408da8779ed217f818e406c39b821075 Mon Sep 17 00:00:00 2001 From: Iain Russell Date: Mon, 20 May 2024 14:56:28 +0100 Subject: [PATCH 5/7] Bump up version to 2.35.3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c0ac27fe0..c819688d6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.35.2 +2.35.3 From 3a762e726f598198327e3ff737dd80f00fe9af02 Mon Sep 17 00:00:00 2001 From: Robert Osinski Date: Mon, 20 May 2024 14:29:07 +0000 Subject: [PATCH 6/7] cfVarName for Cerise extended for 235095 / 235096 --- .../grib2/localConcepts/cerise/cfVarName.def | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/definitions/grib2/localConcepts/cerise/cfVarName.def b/definitions/grib2/localConcepts/cerise/cfVarName.def index 0ccc6c90f..837b71e9b 100644 --- a/definitions/grib2/localConcepts/cerise/cfVarName.def +++ b/definitions/grib2/localConcepts/cerise/cfVarName.def @@ -153,6 +153,20 @@ typeOfStatisticalProcessing = 1 ; } #Time-mean snow depth +'msde' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 11 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow cover +'msnowc' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 42 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow depth 'msd_m' = { localTablesVersion = 1 ; discipline = 0 ; From 75031df877a07f3fa1ebf718f430d9d87d809fe1 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 20 May 2024 14:42:12 +0000 Subject: [PATCH 7/7] Fix tests --- definitions/grib2/cfVarName.def | 14 -------------- .../grib2/localConcepts/cerise/cfVarName.def | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index c9011a6f2..f6131186b 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -4916,20 +4916,6 @@ parameterNumber = 18 ; typeOfStatisticalProcessing = 0 ; } -#Time-mean snow depth -'msde' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 11 ; - typeOfStatisticalProcessing = 0 ; - } -#Time-mean snow cover -'msnowc' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 42 ; - typeOfStatisticalProcessing = 0 ; - } #Time-mean geopotential 'mz' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/cerise/cfVarName.def b/definitions/grib2/localConcepts/cerise/cfVarName.def index 0ccc6c90f..4fc979f27 100644 --- a/definitions/grib2/localConcepts/cerise/cfVarName.def +++ b/definitions/grib2/localConcepts/cerise/cfVarName.def @@ -153,6 +153,20 @@ typeOfStatisticalProcessing = 1 ; } #Time-mean snow depth +'msde' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 11 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow cover +'msnowc' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 42 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean snow depth 'msd_m' = { localTablesVersion = 1 ; discipline = 0 ;