modifying paramtype

ecmwf · Jun 19, 2024 · 55551d4 · 55551d4
1 parent f8bd88e
commit 55551d4
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 16 deletions.
diff --git 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) {
-  constant paramType="wave";
+  constant paramTypeWave="wave";
   unalias mars.paramtype;
-  alias mars.paramtype = paramType;
+  alias mars.paramtype = paramTypeWave;
 }
 
 meta md5Section4 md5(offsetSection4,section4Length);
diff --git a/definitions/grib2/template.4.aerosol.def b/definitions/grib2/template.4.aerosol.def
@@ -1,7 +1,8 @@
 # (C) Copyright 2005- ECMWF.
 
-constant paramType = "chemical" ;
-alias mars.paramtype = paramType ;
+constant paramTypeChemical = "chemical" ;
+unalias mars.paramtype;
+alias mars.paramtype = paramTypeChemical ;
 
 # Aerosol type - now replaced by constituent type
 # Note: Code tables 4.230 and 4.233 are identical

diff --git a/definitions/grib2/template.4.chemical.def b/definitions/grib2/template.4.chemical.def
@@ -1,8 +1,8 @@
 # (C) Copyright 2005- ECMWF.
 
-constant paramType="chemical";
+constant paramTypeChemical="chemical";
 unalias mars.paramtype;
-alias mars.paramtype = paramType;
+alias mars.paramtype = paramTypeChemical;
 
 # 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
@@ -41,5 +41,6 @@ alias tile.nTileAtt=nTileAtt;
 
 alias mars.tile=typeOfTile;
 alias mars.tileAttribute=tileAttribute;
-constant paramType = "tile";
-alias mars.paramtype=paramType;
+constant paramTypeTile = "tile";
+unalias mars.paramtype;
+alias mars.paramtype=paramTypeTile;
diff --git a/definitions/grib2/template.4.optical.def b/definitions/grib2/template.4.optical.def
@@ -1,7 +1,8 @@
 # (C) Copyright 2005- ECMWF.
 
-constant paramType = "optical" ;
-alias mars.paramtype = paramType ;
+constant paramTypeOptical = "optical" ;
+unalias mars.paramtype;
+alias mars.paramtype = paramTypeOptical ;
 
 codetable[1] typeOfWavelengthInterval ('4.91.table',masterDir,localDir) : dump;
 alias typeOfIntervalForFirstAndSecondWavelength=typeOfWavelengthInterval;

diff --git a/definitions/grib2/template.4.parameter.def b/definitions/grib2/template.4.parameter.def
@@ -1,7 +1,8 @@
 # (C) Copyright 2005- ECMWF.
 
-constant paramType = "base";
-alias mars.paramtype = paramType;
+constant paramTypeBase = "base";
+unalias mars.paramtype;
+alias mars.paramtype = paramTypeBase;
 
 # 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
@@ -26,6 +26,6 @@ listOfWaveFrequencySequenceParameters list(numberOfWaveFrequencySequenceParamete
   signed[4] scaledValueOfWaveFrequencySequenceParameter : dump;
 }
 
-constant paramType="wave_spectra";
+constant paramTypeWaveSpectra="wave_spectra";
 unalias mars.paramtype;
-alias mars.paramtype = paramType;
+alias mars.paramtype = paramTypeWaveSpectra;
diff --git 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;
 
-constant paramType="wave_spectra";
+constant paramTypeWaveSpectraList="wave_spectra";
 unalias mars.paramtype;
-alias mars.paramtype = paramType;
+alias mars.paramtype = paramTypeWaveSpectraList;