From 17e513bfb9b05690d916b492fa253a0b1a384507 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 1 Nov 2023 15:45:50 +0000 Subject: [PATCH 1/6] ECC-1710: GRIB2: Replace 'highres' with 'high' in DestinE resolution table --- definitions/grib2/destine_resolution.table | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/definitions/grib2/destine_resolution.table b/definitions/grib2/destine_resolution.table index 48d816018..1df78ebbc 100644 --- a/definitions/grib2/destine_resolution.table +++ b/definitions/grib2/destine_resolution.table @@ -1,4 +1,4 @@ 0 unknown unknown 1 standard Standard resolution model output with longer availability -2 highres High resolution model output with limited availability -65535 65535 Missing \ No newline at end of file +2 high High resolution model output with limited availability +65535 65535 Missing From 73af0f9955cef1c92007aebaf5fa971e517d3681 Mon Sep 17 00:00:00 2001 From: Matthew Griffith Date: Fri, 3 Nov 2023 10:08:00 +0000 Subject: [PATCH 2/6] ECC-1712: Added new entries to tables; destine_activity and destine_experiment --- definitions/grib2/destine_activity.table | 1 + definitions/grib2/destine_experiment.table | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/definitions/grib2/destine_activity.table b/definitions/grib2/destine_activity.table index 852b275df..8217458fd 100644 --- a/definitions/grib2/destine_activity.table +++ b/definitions/grib2/destine_activity.table @@ -1,4 +1,5 @@ 0 unknown unknown 1 CMIP6 Coupled Model Intercomparison Project Phase 6 2 ScenarioMIP Scenario Model Intercomparison Project +3 HighResMIP High Resolution Model Intercomparison Project 65535 65535 Missing diff --git a/definitions/grib2/destine_experiment.table b/definitions/grib2/destine_experiment.table index 1429f71ac..d98a8dd70 100644 --- a/definitions/grib2/destine_experiment.table +++ b/definitions/grib2/destine_experiment.table @@ -1,9 +1,10 @@ 0 unknown unknown 1 hist Historical -2 amip Atmospheric Model Intercomparison Project -3 SSP1-1.9 Shared Socio-economic Pathways 1-1.9 -4 SSP1-2.6 Shared Socio-economic Pathways 1-2.6 -5 SSP2-4.5 Shared Socio-economic Pathways 2-4.5 -6 SSP3-7.0 Shared Socio-economic Pathways 3-7.0 -7 SSP5-8.5 Shared Socio-economic Pathways 5-8.5 +2 cont Control +3 amip Atmospheric Model Intercomparison Project +4 SSP1-1.9 Shared Socio-economic Pathways 1-1.9 +5 SSP1-2.6 Shared Socio-economic Pathways 1-2.6 +6 SSP2-4.5 Shared Socio-economic Pathways 2-4.5 +7 SSP3-7.0 Shared Socio-economic Pathways 3-7.0 +8 SSP5-8.5 Shared Socio-economic Pathways 5-8.5 65535 65535 Missing From 9ebc74156c1e14769e9792cf5aad4adc54bdc94b Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Sat, 4 Nov 2023 14:58:01 +0000 Subject: [PATCH 3/6] ECC-1713: GRIB2: Add correct definition to discipline 192 parameter 228004; mean2t for DestinE ClimateDT --- definitions/grib1/localConcepts/ecmf/cfVarName.def | 2 +- definitions/grib1/localConcepts/ecmf/name.def | 4 ++-- definitions/grib1/localConcepts/ecmf/paramId.def | 2 +- definitions/grib1/localConcepts/ecmf/shortName.def | 2 +- definitions/grib1/localConcepts/ecmf/units.def | 2 +- definitions/grib2/cfVarName.def | 10 ++++++++++ definitions/grib2/localConcepts/ecmf/cfVarName.def | 6 ------ .../grib2/localConcepts/ecmf/cfVarName.legacy.def | 6 ++++++ definitions/grib2/localConcepts/ecmf/name.def | 6 ------ definitions/grib2/localConcepts/ecmf/name.legacy.def | 6 ++++++ definitions/grib2/localConcepts/ecmf/paramId.def | 6 ------ .../grib2/localConcepts/ecmf/paramId.legacy.def | 6 ++++++ definitions/grib2/localConcepts/ecmf/shortName.def | 6 ------ .../grib2/localConcepts/ecmf/shortName.legacy.def | 6 ++++++ definitions/grib2/localConcepts/ecmf/units.def | 6 ------ definitions/grib2/localConcepts/ecmf/units.legacy.def | 6 ++++++ definitions/grib2/name.def | 10 ++++++++++ definitions/grib2/paramId.def | 10 ++++++++++ definitions/grib2/shortName.def | 10 ++++++++++ definitions/grib2/units.def | 10 ++++++++++ 20 files changed, 86 insertions(+), 36 deletions(-) diff --git a/definitions/grib1/localConcepts/ecmf/cfVarName.def b/definitions/grib1/localConcepts/ecmf/cfVarName.def index 03a5530af..d013f4f5c 100644 --- a/definitions/grib1/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib1/localConcepts/ecmf/cfVarName.def @@ -17509,7 +17509,7 @@ table2Version = 228 ; indicatorOfParameter = 3 ; } -#Mean temperature at 2 metres +#Mean 2 metre temperature 'mean2t' = { table2Version = 228 ; indicatorOfParameter = 4 ; diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def index 5421b5ca8..1a88028a3 100644 --- a/definitions/grib1/localConcepts/ecmf/name.def +++ b/definitions/grib1/localConcepts/ecmf/name.def @@ -17509,8 +17509,8 @@ table2Version = 228 ; indicatorOfParameter = 3 ; } -#Mean temperature at 2 metres -'Mean temperature at 2 metres' = { +#Mean 2 metre temperature +'Mean 2 metre temperature' = { table2Version = 228 ; indicatorOfParameter = 4 ; } diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def index 3bd904fb6..319c4bf54 100644 --- a/definitions/grib1/localConcepts/ecmf/paramId.def +++ b/definitions/grib1/localConcepts/ecmf/paramId.def @@ -17509,7 +17509,7 @@ table2Version = 228 ; indicatorOfParameter = 3 ; } -#Mean temperature at 2 metres +#Mean 2 metre temperature '228004' = { table2Version = 228 ; indicatorOfParameter = 4 ; diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index 02fc2cceb..bc8167ebe 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -17509,7 +17509,7 @@ table2Version = 228 ; indicatorOfParameter = 3 ; } -#Mean temperature at 2 metres +#Mean 2 metre temperature 'mean2t' = { table2Version = 228 ; indicatorOfParameter = 4 ; diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def index 8eadf0ea3..eb4658f2a 100644 --- a/definitions/grib1/localConcepts/ecmf/units.def +++ b/definitions/grib1/localConcepts/ecmf/units.def @@ -17509,7 +17509,7 @@ table2Version = 228 ; indicatorOfParameter = 3 ; } -#Mean temperature at 2 metres +#Mean 2 metre temperature 'K' = { table2Version = 228 ; indicatorOfParameter = 4 ; diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index af7620f30..ca75aeadd 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -8023,6 +8023,16 @@ parameterCategory = 0 ; parameterNumber = 17 ; } +#Mean 2 metre temperature +'mean2t' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 0 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 0 ; + } #Lake total depth 'dl' = { discipline = 1 ; diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def index 4f85bb57e..e0466a100 100644 --- a/definitions/grib2/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def @@ -21697,12 +21697,6 @@ parameterCategory = 220 ; parameterNumber = 228 ; } -#Mean temperature at 2 metres -'mean2t' = { - discipline = 192 ; - parameterCategory = 228 ; - parameterNumber = 4 ; - } #Mean of 10 metre wind speed 'mean10ws' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def b/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def index d7faa1e1d..c5a21c0c6 100644 --- a/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def @@ -1309,3 +1309,9 @@ parameterCategory = 140 ; parameterNumber = 249 ; } +#Mean temperature at 2 metres +'mean2t' = { + discipline = 192 ; + parameterCategory = 228 ; + parameterNumber = 4 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def index 1d626bf3d..be29ee555 100644 --- a/definitions/grib2/localConcepts/ecmf/name.def +++ b/definitions/grib2/localConcepts/ecmf/name.def @@ -21697,12 +21697,6 @@ parameterCategory = 220 ; parameterNumber = 228 ; } -#Mean temperature at 2 metres -'Mean temperature at 2 metres' = { - discipline = 192 ; - parameterCategory = 228 ; - parameterNumber = 4 ; - } #Mean of 10 metre wind speed 'Mean of 10 metre wind speed' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/name.legacy.def b/definitions/grib2/localConcepts/ecmf/name.legacy.def index c7a877462..b0a63cda1 100644 --- a/definitions/grib2/localConcepts/ecmf/name.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/name.legacy.def @@ -1309,3 +1309,9 @@ parameterCategory = 140 ; parameterNumber = 249 ; } +#Mean temperature at 2 metres +'Mean temperature at 2 metres' = { + discipline = 192 ; + parameterCategory = 228 ; + parameterNumber = 4 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def index 9886c1f16..347911625 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.def @@ -21697,12 +21697,6 @@ parameterCategory = 220 ; parameterNumber = 228 ; } -#Mean temperature at 2 metres -'228004' = { - discipline = 192 ; - parameterCategory = 228 ; - parameterNumber = 4 ; - } #Mean of 10 metre wind speed '228005' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def index cb5186931..147ebf63e 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def @@ -1309,3 +1309,9 @@ parameterCategory = 140 ; parameterNumber = 249 ; } +#Mean temperature at 2 metres +'228004' = { + discipline = 192 ; + parameterCategory = 228 ; + parameterNumber = 4 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def index 3d30e0aec..40f2c8453 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.def @@ -21697,12 +21697,6 @@ parameterCategory = 220 ; parameterNumber = 228 ; } -#Mean temperature at 2 metres -'mean2t' = { - discipline = 192 ; - parameterCategory = 228 ; - parameterNumber = 4 ; - } #Mean of 10 metre wind speed 'mean10ws' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def index 7e0d60eed..22dcd00d3 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def @@ -1309,3 +1309,9 @@ parameterCategory = 140 ; parameterNumber = 249 ; } +#Mean temperature at 2 metres +'mean2t' = { + discipline = 192 ; + parameterCategory = 228 ; + parameterNumber = 4 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def index 26a9c0a22..d367bab66 100644 --- a/definitions/grib2/localConcepts/ecmf/units.def +++ b/definitions/grib2/localConcepts/ecmf/units.def @@ -21697,12 +21697,6 @@ parameterCategory = 220 ; parameterNumber = 228 ; } -#Mean temperature at 2 metres -'K' = { - discipline = 192 ; - parameterCategory = 228 ; - parameterNumber = 4 ; - } #Mean of 10 metre wind speed 'm s**-1' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/units.legacy.def b/definitions/grib2/localConcepts/ecmf/units.legacy.def index 4b5d36486..73f7514db 100644 --- a/definitions/grib2/localConcepts/ecmf/units.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/units.legacy.def @@ -1309,3 +1309,9 @@ parameterCategory = 140 ; parameterNumber = 249 ; } +#Mean temperature at 2 metres +'K' = { + discipline = 192 ; + parameterCategory = 228 ; + parameterNumber = 4 ; +} diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 24276b47d..7234701e9 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -8023,6 +8023,16 @@ parameterCategory = 0 ; parameterNumber = 17 ; } +#Mean 2 metre temperature +'Mean 2 metre temperature' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 0 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 0 ; + } #Lake total depth 'Lake total depth' = { discipline = 1 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 90f063ad7..af6391dfa 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -8023,6 +8023,16 @@ parameterCategory = 0 ; parameterNumber = 17 ; } +#Mean 2 metre temperature +'228004' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 0 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 0 ; + } #Lake total depth '228007' = { discipline = 1 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 8fa7d9e93..e2e27f3b4 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -8023,6 +8023,16 @@ parameterCategory = 0 ; parameterNumber = 17 ; } +#Mean 2 metre temperature +'mean2t' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 0 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 0 ; + } #Lake total depth 'dl' = { discipline = 1 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index ac62a83eb..bb9f939ee 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -8023,6 +8023,16 @@ parameterCategory = 0 ; parameterNumber = 17 ; } +#Mean 2 metre temperature +'K' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 0 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 0 ; + } #Lake total depth 'm' = { discipline = 1 ; From 8bd3a3429e5a88e649dc6736c60eb05221ddbbd6 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Sat, 4 Nov 2023 14:58:37 +0000 Subject: [PATCH 4/6] Bump up version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7780cec29..544fe5d43 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.32.1 +2.32.2 From 5f0ef9f2c77aaeb075971cd7a40c392dbae8bc71 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 8 Nov 2023 12:09:08 +0000 Subject: [PATCH 5/6] ECC-1713: GRIB2: Add correct definition to discipline 192 parameter 228004 (S2S part) --- definitions/grib2/localConcepts/s2s/cfVarName.def | 11 +++++++++++ definitions/grib2/localConcepts/s2s/name.def | 11 +++++++++++ definitions/grib2/localConcepts/s2s/paramId.def | 11 +++++++++++ definitions/grib2/localConcepts/s2s/shortName.def | 11 +++++++++++ definitions/grib2/localConcepts/s2s/units.def | 11 +++++++++++ 5 files changed, 55 insertions(+) diff --git a/definitions/grib2/localConcepts/s2s/cfVarName.def b/definitions/grib2/localConcepts/s2s/cfVarName.def index b9900970b..18ae6bde2 100644 --- a/definitions/grib2/localConcepts/s2s/cfVarName.def +++ b/definitions/grib2/localConcepts/s2s/cfVarName.def @@ -38,6 +38,17 @@ typeOfFirstFixedSurface = 103 ; scaledValueOfFirstFixedSurface = 15 ; scaleFactorOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 0 ; + } +#2 metre temperature +'t2m' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 0 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 0 ; } #2 metre dewpoint temperature 'd2m' = { diff --git a/definitions/grib2/localConcepts/s2s/name.def b/definitions/grib2/localConcepts/s2s/name.def index 478e0a7fa..207a8bf75 100644 --- a/definitions/grib2/localConcepts/s2s/name.def +++ b/definitions/grib2/localConcepts/s2s/name.def @@ -38,6 +38,17 @@ typeOfFirstFixedSurface = 103 ; scaledValueOfFirstFixedSurface = 15 ; scaleFactorOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 0 ; + } +#2 metre temperature +'2 metre temperature' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 0 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 0 ; } #2 metre dewpoint temperature '2 metre dewpoint temperature' = { diff --git a/definitions/grib2/localConcepts/s2s/paramId.def b/definitions/grib2/localConcepts/s2s/paramId.def index f9800fd85..9c9436700 100644 --- a/definitions/grib2/localConcepts/s2s/paramId.def +++ b/definitions/grib2/localConcepts/s2s/paramId.def @@ -38,6 +38,17 @@ typeOfFirstFixedSurface = 103 ; scaledValueOfFirstFixedSurface = 15 ; scaleFactorOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 0 ; + } +#2 metre temperature +'167' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 0 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 0 ; } #2 metre dewpoint temperature '168' = { diff --git a/definitions/grib2/localConcepts/s2s/shortName.def b/definitions/grib2/localConcepts/s2s/shortName.def index e200e018b..e850dd014 100644 --- a/definitions/grib2/localConcepts/s2s/shortName.def +++ b/definitions/grib2/localConcepts/s2s/shortName.def @@ -38,6 +38,17 @@ typeOfFirstFixedSurface = 103 ; scaledValueOfFirstFixedSurface = 15 ; scaleFactorOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 0 ; + } +#2 metre temperature +'2t' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 0 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 0 ; } #2 metre dewpoint temperature '2d' = { diff --git a/definitions/grib2/localConcepts/s2s/units.def b/definitions/grib2/localConcepts/s2s/units.def index c40b4c966..f96b2c9e1 100644 --- a/definitions/grib2/localConcepts/s2s/units.def +++ b/definitions/grib2/localConcepts/s2s/units.def @@ -38,6 +38,17 @@ typeOfFirstFixedSurface = 103 ; scaledValueOfFirstFixedSurface = 15 ; scaleFactorOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 0 ; + } +#2 metre temperature +'K' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 0 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 0 ; } #2 metre dewpoint temperature 'K' = { From 85145ff478fb19c7895e438ee33fb29a06f09323 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Fri, 10 Nov 2023 12:31:54 +0000 Subject: [PATCH 6/6] ECC-1716: GRIB2: Use dataDate and dataTime for indexing within MARS stream clte --- definitions/mars/grib.clte.fc.def | 7 +++---- tests/grib_ecc-1691.sh | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/definitions/mars/grib.clte.fc.def b/definitions/mars/grib.clte.fc.def index f75dd3faf..8d899381f 100644 --- a/definitions/mars/grib.clte.fc.def +++ b/definitions/mars/grib.clte.fc.def @@ -1,5 +1,4 @@ -alias mars.date = validityDate; -meta padded_vtime sprintf("%.4d", validityTime): no_copy; -alias mars.time = padded_vtime; +alias mars.date = dataDate; +alias mars.time = dataTime; unalias mars.step; -unalias mars.domain; \ No newline at end of file +unalias mars.domain; diff --git a/tests/grib_ecc-1691.sh b/tests/grib_ecc-1691.sh index 38a9a1603..97c38108d 100755 --- a/tests/grib_ecc-1691.sh +++ b/tests/grib_ecc-1691.sh @@ -65,13 +65,13 @@ ${tools_dir}/grib_set -s numberOfDataPoints=12582912,gridDefinitionTemplateNumbe grib_check_key_equals $temp_grib_a "gridSpecification" "H1024" # Now check streams. -# Setting stream clte and type fc should set mars.date and mars.time to validityDate and validityTime, +# Setting stream clte and type fc should set mars.date and mars.time to dataDate and dataTime, # and mars.step should be unaliased ${tools_dir}/grib_set -s stream=clte,type=fc $destine_sample $temp_grib_a result1=$( ${tools_dir}/grib_get -p mars.date,mars.time $temp_grib_a ) -result2=$( ${tools_dir}/grib_get -p validityDate,validityTime $temp_grib_a ) +result2=$( ${tools_dir}/grib_get -p dataDate,dataTime $temp_grib_a ) [ "$result1" = "$result2" ] ${tools_dir}/grib_ls -jm $temp_grib_a