Merge branch 'hotfix/2.38.3'

ecmwf · Oct 17, 2024 · d056844 · d056844
2 parents 194ab2b + e075697
commit d056844
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.38.2
+2.38.3
diff --git a/definitions/grib1/localConcepts/ecmf/stepTypeForConversion.def b/definitions/grib1/localConcepts/ecmf/stepTypeForConversion.def
@@ -218,3 +218,6 @@
 "avg"={gribTablesVersionNo=172;indicatorOfParameter=178;centre=98;}
 # mtntrf
 "avg"={gribTablesVersionNo=172;indicatorOfParameter=179;centre=98;}
+
+# 10fg6
+"max"={gribTablesVersionNo=128;indicatorOfParameter=123;centre=98;}
diff --git a/definitions/grib2/templates/template.4.horizontal.def b/definitions/grib2/templates/template.4.horizontal.def
@@ -64,25 +64,22 @@ if (extraDim) {
     alias mars.levelist = dimension;
     alias mars.levtype = dimensionType;
 } else {
+    # ECC-1333: levtype should be read-only in GRIB2
+    concept mars.levtype(unknown,"marsLevtypeConcept.def",conceptsDir2,conceptsDir1):no_copy, read_only;
+    # GRIB-372: levelist alias does not pertain to surface parameters
+    transient tempLevtype = levtype; # Faster to copy the concept so we evaluate it once
     # See GRIB-74 why we store the pressureUnits in a transient
     transient tempPressureUnits=pressureUnits;
     # Same as typeOfLevel != "surface" but much quicker to evaluate
     # than via the concept
-    if ( ! (typeOfFirstFixedSurface == 1 && typeOfSecondFixedSurface == 255) ) {
+    if ( ! ((typeOfFirstFixedSurface == 1 && typeOfSecondFixedSurface == 255) || tempLevtype is "sfc" || tempLevtype is "o2d")) {
         if (tempPressureUnits is "Pa") {
             meta marsLevel scale(level,one,hundred) : read_only;
             alias mars.levelist=marsLevel;
         } else {
             alias mars.levelist = level;
         }
     }
-    # ECC-1333: levtype should be read-only in GRIB2
-    concept mars.levtype(unknown,"marsLevtypeConcept.def",conceptsDir2,conceptsDir1):no_copy, read_only;
-    # GRIB-372: levelist alias does not pertain to surface parameters
-    transient tempLevtype = levtype; # Faster to copy the concept so we evaluate it once
-    if (tempLevtype is "sfc" || tempLevtype is "o2d") {
-        unalias mars.levelist;
-    }
 }
 
 # See ECC-854, ECC-1435, ECC-1451, ECC-1462