From 4237c226294dab50c49590396f511480664f5a68 Mon Sep 17 00:00:00 2001 From: shahramn Date: Thu, 22 Aug 2024 16:05:50 +0100 Subject: [PATCH 1/3] Bump up version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 38bcf609c..42eda4e29 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.36.2 +2.36.3 From e44c395356ca04a4a95495eba6ed0c82c71a4fed Mon Sep 17 00:00:00 2001 From: shahramn Date: Thu, 22 Aug 2024 17:32:48 +0100 Subject: [PATCH 2/3] ECC-1908: GRIB1: Add new MARS levtype 'abstract levels' --- definitions/grib1/local/ecmf/3.table | 2 ++ definitions/grib1/section.1.def | 3 ++- definitions/grib1/typeOfLevel.def | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/definitions/grib1/local/ecmf/3.table b/definitions/grib1/local/ecmf/3.table index 767213f12..fb5b07081 100644 --- a/definitions/grib1/local/ecmf/3.table +++ b/definitions/grib1/local/ecmf/3.table @@ -45,6 +45,8 @@ # 161-199Reserved 200 sfc Entire atmosphere considered as a single layer 0 (2 octets) 201 201 Entire ocean considered as a single layer 0 (2 octets) +202 al Abstract Single Level +203 al Abstract Multiple Level # 202-209 Reserved 210 pl Isobaric surface (Pa) (ECMWF extension) # 211-254 Reserved for local use diff --git a/definitions/grib1/section.1.def b/definitions/grib1/section.1.def index d62300f27..51b3d5b4f 100644 --- a/definitions/grib1/section.1.def +++ b/definitions/grib1/section.1.def @@ -105,7 +105,8 @@ if( indicatorOfTypeOfLevel == 109 || indicatorOfTypeOfLevel == 100 || indicatorOfTypeOfLevel == 110 || indicatorOfTypeOfLevel == 113 || - indicatorOfTypeOfLevel == 117) + indicatorOfTypeOfLevel == 117 || + indicatorOfTypeOfLevel == 203) { alias mars.levelist = level; } diff --git a/definitions/grib1/typeOfLevel.def b/definitions/grib1/typeOfLevel.def index ccf74d5be..1e7219d8e 100644 --- a/definitions/grib1/typeOfLevel.def +++ b/definitions/grib1/typeOfLevel.def @@ -34,3 +34,5 @@ 'depthBelowSea' = {indicatorOfTypeOfLevel=160;} 'entireAtmosphere' = {indicatorOfTypeOfLevel=200;} 'entireOcean' = {indicatorOfTypeOfLevel=201;} +'abstractSingleLevel' = {indicatorOfTypeOfLevel=202;} +'abstractMultipleLevels' = {indicatorOfTypeOfLevel=203;} From 4a1539c5ceaafa297381b85b8e2d2c924a064a75 Mon Sep 17 00:00:00 2001 From: shahramn Date: Tue, 27 Aug 2024 10:54:43 +0100 Subject: [PATCH 3/3] ECC-1908: GRIB1: Add new MARS levtype 'abstract levels' --- definitions/grib1/typeOfLevel.def | 2 +- definitions/grib2/template.4.reforecast.def | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/definitions/grib1/typeOfLevel.def b/definitions/grib1/typeOfLevel.def index 1e7219d8e..f5154a706 100644 --- a/definitions/grib1/typeOfLevel.def +++ b/definitions/grib1/typeOfLevel.def @@ -34,5 +34,5 @@ 'depthBelowSea' = {indicatorOfTypeOfLevel=160;} 'entireAtmosphere' = {indicatorOfTypeOfLevel=200;} 'entireOcean' = {indicatorOfTypeOfLevel=201;} -'abstractSingleLevel' = {indicatorOfTypeOfLevel=202;} +'abstractSingleLevel' = {indicatorOfTypeOfLevel=202; level=missing();} 'abstractMultipleLevels' = {indicatorOfTypeOfLevel=203;} diff --git a/definitions/grib2/template.4.reforecast.def b/definitions/grib2/template.4.reforecast.def index a8a431936..15e7c6ec4 100644 --- a/definitions/grib2/template.4.reforecast.def +++ b/definitions/grib2/template.4.reforecast.def @@ -12,5 +12,7 @@ unsigned[1] SecondOfModelVersion = 0: edition_specific; meta modelVersionDate g2date(YearOfModelVersion,MonthOfModelVersion,DayOfModelVersion) : dump; meta modelVersionTime time(HourOfModelVersion, MinuteOfModelVersion, SecondOfModelVersion) : dump; +alias referenceDate = modelVersionDate ; + remove isHindcast; constant isHindcast = 1;