From 2a2f6a6d8516176a912119b4a47e2c1aeb6790f4 Mon Sep 17 00:00:00 2001 From: Sebastien Villaume Date: Mon, 15 Feb 2021 16:12:57 +0000 Subject: [PATCH] harmonizing template components before refactoring --- definitions/grib2/template.4.parameter.def | 10 ++--- .../grib2/template.4.parameter_aerosol.def | 19 +++++----- .../grib2/template.4.parameter_aerosol_44.def | 5 ++- .../template.4.parameter_aerosol_optical.def | 10 ++--- ...ate.4.parameter_aerosol_optical_source.def | 10 ++--- .../template.4.parameter_aerosol_source.def | 19 +++++----- .../grib2/template.4.parameter_chemical.def | 24 ++++++------ ...late.4.parameter_chemical_distribution.def | 25 ++++++------ .../template.4.parameter_chemical_source.def | 24 ++++++------ .../grib2/template.4.parameter_partition.def | 24 ++++++------ .../grib2/template.4.parameter_postproc.def | 38 +++++++++---------- .../grib2/template.4.parameter_tile.def | 25 ++++++------ 12 files changed, 117 insertions(+), 116 deletions(-) diff --git a/definitions/grib2/template.4.parameter.def b/definitions/grib2/template.4.parameter.def index ed8cdbb50..07f23e868 100644 --- a/definitions/grib2/template.4.parameter.def +++ b/definitions/grib2/template.4.parameter.def @@ -16,10 +16,10 @@ unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; # Analysis or forecast generating processes identifier (defined by originating centre) -unsigned[1] generatingProcessIdentifier : dump; +unsigned[1] generatingProcessIdentifier : dump; # Hours of observational data cut-off after reference time -unsigned[2] hoursAfterDataCutoff =missing() : edition_specific,can_be_missing; +unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; # Minutes of observational data cut-off after reference time @@ -27,10 +27,10 @@ unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missin alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff; # Indicator of unit of time range -codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; +codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by octet 18 (GRIB-29: supports negative forecast time) -signed[4] forecastTime : dump; +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) +signed[4] forecastTime : dump; diff --git a/definitions/grib2/template.4.parameter_aerosol.def b/definitions/grib2/template.4.parameter_aerosol.def index d5a59c67a..4b37fb597 100644 --- a/definitions/grib2/template.4.parameter_aerosol.def +++ b/definitions/grib2/template.4.parameter_aerosol.def @@ -1,9 +1,9 @@ # (C) Copyright 2005- ECMWF. -# Parameter category +# Parameter category codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; -# Parameter number +# Parameter number codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; @@ -14,34 +14,35 @@ codetable[2] aerosolType ('4.233.table',masterDir,localDir) : dump; codetable[1] typeOfSizeInterval ('4.91.table',masterDir,localDir) : dump; alias typeOfIntervalForFirstAndSecondSize=typeOfSizeInterval; +# Size in metres signed[1] scaleFactorOfFirstSize : dump; signed[4] scaledValueOfFirstSize :dump; signed[1] scaleFactorOfSecondSize = missing() : can_be_missing,dump; signed[4] scaledValueOfSecondSize = missing() : can_be_missing,dump; -# Type of generating process +# Type of generating process codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; -# Background generating process identifier +# Background generating process identifier (defined by originating centre) unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; -# Analysis or forecast generating processes identifier +# Analysis or forecast generating processes identifier (defined by originating centre) unsigned[1] generatingProcessIdentifier : dump; -# Hours of observational data cut-off after reference time +# Hours of observational data cut-off after reference time unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; -# Minutes of observational data cut-off after reference time +# Minutes of observational data cut-off after reference time unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missing; alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff; -# Indicator of unit of time range +# Indicator of unit of time range codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by octet 18 (GRIB-29: supports negative forecast time) +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) signed[4] forecastTime : dump; diff --git a/definitions/grib2/template.4.parameter_aerosol_44.def b/definitions/grib2/template.4.parameter_aerosol_44.def index 5c0a1e5e3..1ec350bc1 100644 --- a/definitions/grib2/template.4.parameter_aerosol_44.def +++ b/definitions/grib2/template.4.parameter_aerosol_44.def @@ -2,8 +2,10 @@ # GRIB-530: This template is to be used by template.4.44.def ONLY +# Parameter category codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; +# Parameter number codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; @@ -14,6 +16,7 @@ codetable[2] aerosolType ('4.233.table',masterDir,localDir) : dump; codetable[1] typeOfSizeInterval ('4.91.table',masterDir,localDir) : dump; alias typeOfIntervalForFirstAndSecondSize=typeOfSizeInterval; +# Size in metres signed[1] scaleFactorOfFirstSize : dump; signed[4] scaledValueOfFirstSize :dump; signed[1] scaleFactorOfSecondSize = missing() : can_be_missing,dump; @@ -43,7 +46,7 @@ alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by octet 18 +# Forecast time in units defined by previous octet # See GRIB-530: We have to make a special case for the error in WMO spec if ( new() || (section4Length - 4*NV == 45) ) { # Use the WMO standard 2 octets for the following cases: diff --git a/definitions/grib2/template.4.parameter_aerosol_optical.def b/definitions/grib2/template.4.parameter_aerosol_optical.def index ebe73ec6e..8772ae016 100644 --- a/definitions/grib2/template.4.parameter_aerosol_optical.def +++ b/definitions/grib2/template.4.parameter_aerosol_optical.def @@ -8,7 +8,7 @@ codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',m meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; -# Aerosol type +# Atmospheric chemical or physical constitutent type codetable[2] aerosolType ('4.233.table',masterDir,localDir) : dump; codetable[1] typeOfSizeInterval ('4.91.table',masterDir,localDir) : dump; @@ -32,15 +32,15 @@ signed[4] scaledValueOfSecondWavelength = missing(): can_be_missing,dump; # Type of generating process codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; -# Background generating process identifier +# Background generating process identifier (defined by originating centre) unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; -# Analysis or forecast generating processes identifier +# Analysis or forecast generating processes identifier (defined by originating centre) unsigned[1] generatingProcessIdentifier : dump; # Hours of observational data cut-off after reference time -unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; +unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; # Minutes of observational data cut-off after reference time @@ -53,5 +53,5 @@ alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by octet 18 (GRIB-29: supports negative forecast time) +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) signed[4] forecastTime : dump; diff --git a/definitions/grib2/template.4.parameter_aerosol_optical_source.def b/definitions/grib2/template.4.parameter_aerosol_optical_source.def index d18f12ed0..4ad33d9cd 100644 --- a/definitions/grib2/template.4.parameter_aerosol_optical_source.def +++ b/definitions/grib2/template.4.parameter_aerosol_optical_source.def @@ -8,7 +8,7 @@ codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',m meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; -# Aerosol type +# Atmospheric chemical or physical constitutent type codetable[2] aerosolType ('4.233.table',masterDir,localDir) : dump; # Source, sink or chemical/physical process (Code table 4.238) @@ -35,15 +35,15 @@ signed[4] scaledValueOfSecondWavelength = missing(): can_be_missing,dump; # Type of generating process codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; -# Background generating process identifier +# Background generating process identifier (defined by originating centre) unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; -# Analysis or forecast generating processes identifier +# Analysis or forecast generating processes identifier (defined by originating centre) unsigned[1] generatingProcessIdentifier : dump; # Hours of observational data cut-off after reference time -unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; +unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; # Minutes of observational data cut-off after reference time @@ -56,5 +56,5 @@ alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by octet 18 (GRIB-29: supports negative forecast time) +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) signed[4] forecastTime : dump; diff --git a/definitions/grib2/template.4.parameter_aerosol_source.def b/definitions/grib2/template.4.parameter_aerosol_source.def index 107d08291..a3169dd79 100644 --- a/definitions/grib2/template.4.parameter_aerosol_source.def +++ b/definitions/grib2/template.4.parameter_aerosol_source.def @@ -1,9 +1,9 @@ # (C) Copyright 2005- ECMWF. -# Parameter category +# Parameter category codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; -# Parameter number +# Parameter number codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; @@ -17,34 +17,35 @@ codetable[1] sourceSinkChemicalPhysicalProcess ('4.238.table',masterDir,localDir codetable[1] typeOfSizeInterval ('4.91.table',masterDir,localDir) : dump; alias typeOfIntervalForFirstAndSecondSize=typeOfSizeInterval; +# Size in metres signed[1] scaleFactorOfFirstSize : dump; signed[4] scaledValueOfFirstSize :dump; signed[1] scaleFactorOfSecondSize = missing() : can_be_missing,dump; signed[4] scaledValueOfSecondSize = missing() : can_be_missing,dump; -# Type of generating process +# Type of generating process codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; -# Background generating process identifier +# Background generating process identifier (defined by originating centre) unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; -# Analysis or forecast generating processes identifier +# Analysis or forecast generating processes identifier (defined by originating centre) unsigned[1] generatingProcessIdentifier : dump; -# Hours of observational data cut-off after reference time +# Hours of observational data cut-off after reference time unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; -# Minutes of observational data cut-off after reference time +# Minutes of observational data cut-off after reference time unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missing; alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff; -# Indicator of unit of time range +# Indicator of unit of time range codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by octet 18 (GRIB-29: supports negative forecast time) +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) signed[4] forecastTime : dump; diff --git a/definitions/grib2/template.4.parameter_chemical.def b/definitions/grib2/template.4.parameter_chemical.def index 6b29f1591..dc9d74364 100644 --- a/definitions/grib2/template.4.parameter_chemical.def +++ b/definitions/grib2/template.4.parameter_chemical.def @@ -1,9 +1,9 @@ # (C) Copyright 2005- ECMWF. -# Parameter category -codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump; +# Parameter category +codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; -# Parameter number +# Parameter number codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; @@ -12,29 +12,29 @@ meta parameterName codetable_title(parameterNumber) : dump; codetable[2] constituentType ('4.230.table',masterDir,localDir) : dump; meta constituentTypeName codetable_title(constituentType); -# Type of generating process +# Type of generating process codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; -# Background generating process identifier (defined by originating centre) +# Background generating process identifier (defined by originating centre) unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; -# Analysis or forecast generating processes identifier -unsigned[1] generatingProcessIdentifier : dump; +# Analysis or forecast generating processes identifier (defined by originating centre) +unsigned[1] generatingProcessIdentifier : dump; -# Hours of observational data cut-off after reference time +# Hours of observational data cut-off after reference time unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; -# Minutes of observational data cut-off after reference time +# Minutes of observational data cut-off after reference time unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missing; alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff; -# Indicator of unit of time range -codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; +# Indicator of unit of time range +codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by indicatorOfUnitOfTimeRange +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) signed[4] forecastTime : dump; diff --git a/definitions/grib2/template.4.parameter_chemical_distribution.def b/definitions/grib2/template.4.parameter_chemical_distribution.def index 203b468d0..7d2b785fd 100644 --- a/definitions/grib2/template.4.parameter_chemical_distribution.def +++ b/definitions/grib2/template.4.parameter_chemical_distribution.def @@ -1,9 +1,9 @@ # (C) Copyright 2005- ECMWF. -# Parameter category -codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump; +# Parameter category +codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; -# Parameter number +# Parameter number codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; @@ -30,30 +30,29 @@ listOfDistributionFunctionParameter list(numberOfDistributionFunctionParameters) unsigned[4] scaledValueOfDistributionFunctionParameter = missing() : can_be_missing,dump; } -# Type of generating process +# Type of generating process codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; -# Background generating process identifier (defined by originating centre) +# Background generating process identifier (defined by originating centre) unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; -# Analysis or forecast generating processes identifier -# (defined by originating centre) -unsigned[1] generatingProcessIdentifier : dump; +# Analysis or forecast generating processes identifier (defined by originating centre) +unsigned[1] generatingProcessIdentifier : dump; -# Hours of observational data cut-off after reference time +# Hours of observational data cut-off after reference time unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; -# Minutes of observational data cut-off after reference time +# Minutes of observational data cut-off after reference time unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missing; alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff; -# Indicator of unit of time range -codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; +# Indicator of unit of time range +codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) signed[4] forecastTime : dump; diff --git a/definitions/grib2/template.4.parameter_chemical_source.def b/definitions/grib2/template.4.parameter_chemical_source.def index 3b78cf330..475389c14 100644 --- a/definitions/grib2/template.4.parameter_chemical_source.def +++ b/definitions/grib2/template.4.parameter_chemical_source.def @@ -1,9 +1,9 @@ # (C) Copyright 2005- ECMWF. -# Parameter category -codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump; +# Parameter category +codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; -# Parameter number +# Parameter number codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; @@ -15,29 +15,29 @@ meta constituentTypeName codetable_title(constituentType); # Source, sink or chemical/physical process (Code table 4.238) codetable[1] sourceSinkChemicalPhysicalProcess ('4.238.table',masterDir,localDir) = 255 : dump; -# Type of generating process +# Type of generating process codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; -# Background generating process identifier (defined by originating centre) +# Background generating process identifier (defined by originating centre) unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; -# Analysis or forecast generating processes identifier -unsigned[1] generatingProcessIdentifier : dump; +# Analysis or forecast generating processes identifier (defined by originating centre) +unsigned[1] generatingProcessIdentifier : dump; -# Hours of observational data cut-off after reference time +# Hours of observational data cut-off after reference time unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; -# Minutes of observational data cut-off after reference time +# Minutes of observational data cut-off after reference time unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missing; alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff; -# Indicator of unit of time range -codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; +# Indicator of unit of time range +codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by indicatorOfUnitOfTimeRange +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) signed[4] forecastTime : dump; diff --git a/definitions/grib2/template.4.parameter_partition.def b/definitions/grib2/template.4.parameter_partition.def index 8c4252a23..59c43a89a 100644 --- a/definitions/grib2/template.4.parameter_partition.def +++ b/definitions/grib2/template.4.parameter_partition.def @@ -1,12 +1,13 @@ # (C) Copyright 2005- ECMWF. -# Parameter category +# Parameter category codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; -# Parameter number -codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; +# Parameter number +codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; + unsigned[1] partitionTable : dump; unsigned[1] numberOfPartitions=1 :dump; partitions list(numberOfPartitions) { @@ -15,30 +16,29 @@ partitions list(numberOfPartitions) { codetable[2] partitionNumber ('4.[partitionTable].table',masterDir,localDir) : dump; -# Type of generating process +# Type of generating process codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; -# Background generating process identifier (defined by originating centre) +# Background generating process identifier (defined by originating centre) unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; -# Analysis or forecast generating processes identifier -# (defined by originating centre) +# Analysis or forecast generating processes identifier (defined by originating centre) unsigned[1] generatingProcessIdentifier : dump; -# Hours of observational data cut-off after reference time -unsigned[2] hoursAfterDataCutoff =missing() : edition_specific,can_be_missing; +# Hours of observational data cut-off after reference time +unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; -# Minutes of observational data cut-off after reference time +# Minutes of observational data cut-off after reference time unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missing; alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff; -# Indicator of unit of time range +# Indicator of unit of time range codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by octet 18 (GRIB-29: supports negative forecast time) +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) signed[4] forecastTime : dump; diff --git a/definitions/grib2/template.4.parameter_postproc.def b/definitions/grib2/template.4.parameter_postproc.def index d20c88000..8f5bcacfe 100644 --- a/definitions/grib2/template.4.parameter_postproc.def +++ b/definitions/grib2/template.4.parameter_postproc.def @@ -1,46 +1,46 @@ # (C) Copyright 2005- ECMWF. -# Parameter category -codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir): dump; +# Parameter category +codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; -# Parameter number -codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; +# Parameter number +codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; -# The input process identifier shall have the value of the 'analysis or forecast process identifier' of the -# original GRIB message used as input of the post-processing +# The input process identifier shall have the value of the 'analysis or forecast process identifier' of the +# original GRIB message used as input of the post-processing unsigned[2] inputProcessIdentifier : dump,edition_specific; -# The input originating centre shall have the value of the 'originating centre' of the original GRIB message -# used as input of the post-processing +# The input originating centre shall have the value of the 'originating centre' of the original GRIB message +# used as input of the post-processing codetable[2] inputOriginatingCentre 'common/c-11.table' : dump,edition_specific,string_type; -# This identifies which post-processing technique was used. This is defined by the originating centre + +# This identifies which post-processing technique was used. This is defined by the originating centre unsigned[1] typeOfPostProcessing : dump,edition_specific; -# Type of generating process -codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; +# Type of generating process +codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; -# Background generating process identifier (defined by originating centre) +# Background generating process identifier (defined by originating centre) unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; -# Analysis or forecast generating processes identifier -# (defined by originating centre) +# Analysis or forecast generating processes identifier (defined by originating centre) unsigned[1] generatingProcessIdentifier : dump; -# Hours of observational data cut-off after reference time -unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; +# Hours of observational data cut-off after reference time +unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; -# Minutes of observational data cut-off after reference time +# Minutes of observational data cut-off after reference time unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missing; alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff; -# Indicator of unit of time range +# Indicator of unit of time range codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by indicatorOfUnitOfTimeRange +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) signed[4] forecastTime : dump; diff --git a/definitions/grib2/template.4.parameter_tile.def b/definitions/grib2/template.4.parameter_tile.def index 2002f212e..0f8646923 100644 --- a/definitions/grib2/template.4.parameter_tile.def +++ b/definitions/grib2/template.4.parameter_tile.def @@ -1,10 +1,10 @@ # (C) Copyright 2005- ECMWF. -# Parameter category +# Parameter category codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; -# Parameter number -codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; +# Parameter number +codetable[1] parameterNumber ('4.2.[discipline:l].[parameterCategory:l].table',masterDir,localDir) : dump; meta parameterUnits codetable_units(parameterNumber) : dump; meta parameterName codetable_title(parameterNumber) : dump; @@ -20,32 +20,29 @@ alias NUT=numberOfUsedSpatialTiles; alias ITN=tileIndex; alias NAT=numberOfUsedTileAttributes; -# Type of generating process +# Type of generating process codetable[1] typeOfGeneratingProcess ('4.3.table',masterDir,localDir) : dump; -# Background generating process identifier -# (defined by originating centre) +# Background generating process identifier (defined by originating centre) unsigned[1] backgroundProcess = 255 : edition_specific; alias backgroundGeneratingProcessIdentifier=backgroundProcess; - -# Analysis or forecast generating processes identifier -# (defined by originating centre) +# Analysis or forecast generating processes identifier (defined by originating centre) unsigned[1] generatingProcessIdentifier : dump; -# Hours of observational data cut-off after reference time -unsigned[2] hoursAfterDataCutoff =missing() : edition_specific,can_be_missing; +# Hours of observational data cut-off after reference time +unsigned[2] hoursAfterDataCutoff = missing() : edition_specific,can_be_missing; alias hoursAfterReferenceTimeOfDataCutoff=hoursAfterDataCutoff; -# Minutes of observational data cut-off after reference time +# Minutes of observational data cut-off after reference time unsigned[1] minutesAfterDataCutoff = missing() : edition_specific,can_be_missing; alias minutesAfterReferenceTimeOfDataCutoff=minutesAfterDataCutoff; -# Indicator of unit of time range +# Indicator of unit of time range codetable[1] indicatorOfUnitOfTimeRange ('4.4.table',masterDir,localDir) : dump; alias defaultStepUnits = one; # 1 means Hour. See code table 4.4 template_nofail default_step_units "grib2/localConcepts/[centre:s]/default_step_units.def"; codetable[1] stepUnits 'stepUnits.table' = defaultStepUnits : transient,dump,no_copy; -# Forecast time in units defined by octet 24 +# Forecast time in units defined by previous octet (GRIB-29: supports negative forecast time) signed[4] forecastTime : dump;