From e2757c87544756df22ec8c169b11ed0b76e8e289 Mon Sep 17 00:00:00 2001 From: shahramn Date: Fri, 14 Jun 2024 15:25:20 +0100 Subject: [PATCH] chemId/paramId split: Use constant for paramType (instead of transient) --- definitions/grib2/section.4.def | 6 +++--- definitions/grib2/template.4.chemical.def | 6 +++--- definitions/grib2/template.4.generalised_tile.def | 2 +- definitions/grib2/template.4.parameter.def | 4 ++-- definitions/grib2/template.4.wave_spectra_formula.def | 6 +++--- definitions/grib2/template.4.wave_spectra_list.def | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/definitions/grib2/section.4.def b/definitions/grib2/section.4.def index ff74d3954..78aaf565b 100644 --- a/definitions/grib2/section.4.def +++ b/definitions/grib2/section.4.def @@ -119,9 +119,9 @@ else { if (paramId >= 140000 && paramId < 141000 && productDefinitionTemplateNumber != 99 && productDefinitionTemplateNumber != 100 && productDefinitionTemplateNumber != 101 && productDefinitionTemplateNumber != 102) { - transient paramType="wave"; - unalias mars.paramtype ; - alias mars.paramtype = paramType ; + constant paramType="wave"; + unalias mars.paramtype; + alias mars.paramtype = paramType; } meta md5Section4 md5(offsetSection4,section4Length); diff --git a/definitions/grib2/template.4.chemical.def b/definitions/grib2/template.4.chemical.def index a1e3b32e2..f0a5ad50a 100644 --- a/definitions/grib2/template.4.chemical.def +++ b/definitions/grib2/template.4.chemical.def @@ -1,8 +1,8 @@ # (C) Copyright 2005- ECMWF. -transient paramType="chemical"; -unalias mars.paramtype ; -alias mars.paramtype = paramType ; +constant paramType="chemical"; +unalias mars.paramtype; +alias mars.paramtype = paramType; # Atmospheric chemical or physical constituent type codetable[2] constituentType ('4.230.table',masterDir,localDir) : dump; diff --git a/definitions/grib2/template.4.generalised_tile.def b/definitions/grib2/template.4.generalised_tile.def index 8760872d6..45a0058d1 100644 --- a/definitions/grib2/template.4.generalised_tile.def +++ b/definitions/grib2/template.4.generalised_tile.def @@ -41,5 +41,5 @@ alias tile.nTileAtt=nTileAtt; alias mars.tile=typeOfTile; alias mars.tileAttribute=tileAttribute; -transient paramType = "tile"; +constant paramType = "tile"; alias mars.paramtype=paramType; diff --git a/definitions/grib2/template.4.parameter.def b/definitions/grib2/template.4.parameter.def index 2b6da0061..f773f4183 100644 --- a/definitions/grib2/template.4.parameter.def +++ b/definitions/grib2/template.4.parameter.def @@ -1,7 +1,7 @@ # (C) Copyright 2005- ECMWF. -transient paramType = "base"; -alias mars.paramtype = paramType ; +constant paramType = "base"; +alias mars.paramtype = paramType; # Parameter category codetable[1] parameterCategory ('4.1.[discipline:l].table',masterDir,localDir) : dump; diff --git a/definitions/grib2/template.4.wave_spectra_formula.def b/definitions/grib2/template.4.wave_spectra_formula.def index 7127024af..bb760b0fb 100644 --- a/definitions/grib2/template.4.wave_spectra_formula.def +++ b/definitions/grib2/template.4.wave_spectra_formula.def @@ -26,6 +26,6 @@ listOfWaveFrequencySequenceParameters list(numberOfWaveFrequencySequenceParamete signed[4] scaledValueOfWaveFrequencySequenceParameter : dump; } -transient paramType="wave_spectra"; -unalias mars.paramtype ; -alias mars.paramtype = paramType ; +constant paramType="wave_spectra"; +unalias mars.paramtype; +alias mars.paramtype = paramType; diff --git a/definitions/grib2/template.4.wave_spectra_list.def b/definitions/grib2/template.4.wave_spectra_list.def index 64a781b95..2d0c597d0 100644 --- a/definitions/grib2/template.4.wave_spectra_list.def +++ b/definitions/grib2/template.4.wave_spectra_list.def @@ -18,6 +18,6 @@ alias frequencyScalingFactor = integerScalingFactorAppliedToFrequencies; unsigned[4] scaledValuesOfWaveFrequencies[numberOfWaveFrequencies] : dump; alias scaledFrequencies = scaledValuesOfWaveFrequencies; -transient paramType="wave_spectra"; -unalias mars.paramtype ; -alias mars.paramtype = paramType ; +constant paramType="wave_spectra"; +unalias mars.paramtype; +alias mars.paramtype = paramType;