Merge branch 'develop' into feature/ocean-mmsf-fc

ecmwf · Feb 20, 2024 · 9137274 · 9137274
2 parents b0f9491 + 24bf6f1
commit 9137274
Show file tree

Hide file tree

Showing 79 changed files with 1,163 additions and 459 deletions.
diff --git a/definitions/boot.def b/definitions/boot.def
@@ -18,12 +18,12 @@ constant defaultTypeOfLevel="unknown" : hidden;
 
 gribDataQualityChecks = getenv("ECCODES_GRIB_DATA_QUALITY_CHECKS","0") : hidden;
 if (gribDataQualityChecks) {
-    template LIMITS "param_limits.def";
+  template LIMITS "param_limits.def";
 }
 
 # GRIBEX special boustrophedonic mode. See GRIB-472
 # If the environment variable is not defined, the key will be 0
-GRIBEX_boustrophedonic = getenv("ECCODES_GRIBEX_BOUSTROPHEDONIC","0")  :hidden;
+GRIBEX_boustrophedonic = getenv("ECCODES_GRIBEX_BOUSTROPHEDONIC","0") :hidden;
 
 constant zero=0 : hidden;
 constant one=1 : hidden;
@@ -61,65 +61,65 @@ transient produceLargeConstantFields = 0 : hidden;
 
 meta libraryVersion library_version() : hidden;
 
-lookup[4] kindOfProduct       (0,identifier) : hidden;
+lookup[4] kindOfProduct (0,identifier) : hidden;
 # grib templates
 # `ABCD` is a number, each letter being a byte
 
 if(kindOfProduct == `GRIB`){
- lookup[1] GRIBEditionNumber  (7,editionNumber)  : edition_specific  ;
- template      GRIB "grib[GRIBEditionNumber:l]/boot.def" ;
+ lookup[1] GRIBEditionNumber (7,editionNumber) : edition_specific;
+ template  GRIB "grib[GRIBEditionNumber:l]/boot.def" ;
 }
 
 if(kindOfProduct == `BUDG` ){
- template      BUDG "budg/boot.def" ;
+ template BUDG "budg/boot.def" ;
 }
 
 if(kindOfProduct == `DIAG`){
- template      DIAG "diag/boot.def" ;
+ template DIAG "diag/boot.def" ;
 }
 
 if(kindOfProduct == `TIDE`){
- template      TIDE "tide/boot.def" ;
+ template TIDE "tide/boot.def" ;
 }
 
 if(kindOfProduct == `BUFR`){
- template      BUFR "bufr/boot.def" ;
- #constant  BUFRstr="BUFR"; #ECC-742
+ template BUFR "bufr/boot.def" ;
+ #constant BUFRstr="BUFR"; #ECC-742
  #alias identifier=BUFRstr;
 }
 
 if(kindOfProduct == `CDFX`){
- template      CDF "cdf/boot.def" ;
- constant  CDFstr="netCDF";
+ template CDF "cdf/boot.def" ;
+ constant CDFstr="netCDF";
  alias ls.identifier=CDFstr;
 }
 
 if(kindOfProduct == 17632522 ){
- template      GTS "gts/boot.def" ;
+ template GTS "gts/boot.def" ;
  constant GTSstr="GTS";
  alias ls.identifier=GTSstr;
 }
 
 if(kindOfProduct == `META` ){
- template      METAR "metar/boot.def" ;
+ template METAR "metar/boot.def" ;
  constant METARstr="METAR";
  alias identifier=METARstr;
 }
 
 if(kindOfProduct == `TAF ` ){
- template      TAF "taf/boot.def" ;
+ template TAF "taf/boot.def" ;
  constant TAFstr="TAF";
  alias ls.identifier=TAFstr;
 }
 
 if(kindOfProduct == 2303214662){
- template      HDF5 "hdf5/boot.def" ;
- constant  HDF5str="HDF5";
+ template HDF5 "hdf5/boot.def" ;
+ constant HDF5str="HDF5";
  alias ls.identifier=HDF5str;
 }
 
 if(kindOfProduct == `WRAP`){
- template      WRAP "wrap/boot.def" ;
- constant  WRAPstr="WRAP";
+ template WRAP "wrap/boot.def" ;
+ constant WRAPstr="WRAP";
  alias ls.identifier=WRAPstr;
 }
diff --git a/definitions/grib1/mars_labeling.4.def b/definitions/grib1/mars_labeling.4.def
@@ -89,7 +89,7 @@ if (horizontalCoordinateDefinition == 0) {
     {
         meta coordinateIndexNumber evaluate(coordinate4Flag+coordinate3Flag);
 
-# levelist  latitude longitude
+        # levelist latitude longitude
         if (coordinateIndexNumber== 3) {
             meta marsLatitude  divdouble( coordinate1Start,1000000);
             meta marsLongitude divdouble( coordinate2Start,1000000);
@@ -145,15 +145,15 @@ if (horizontalCoordinateDefinition == 0) {
                   alias mars.range = marsRange;
                }
            }
-# product
-           alias mars.product = coordAveragingTims;
-# date
-           if (marsType == TYPE_OR  && averaging1Flag == P_INST) {
-               #remove mars.date;
-               alias mars.date = verificationDate;
-               #remove mars.step;
-               constant stepZero = 0;
-               alias mars.step =stepZero;
-           }
+        # product
+        alias mars.product = coordAveragingTims;
+        # date
+        if (marsType == TYPE_OR && averaging1Flag == P_INST) {
+            #remove mars.date;
+            alias mars.date = verificationDate;
+            #remove mars.step;
+            constant stepZero = 0;
+            alias mars.step =stepZero;
+        }
     }
 }
diff --git a/definitions/grib2/boot.def b/definitions/grib2/boot.def
@@ -16,18 +16,18 @@ constant tablesVersionLatest = 32 : edition_specific;
 constant false = 0 : hidden;
 constant true = 1 : hidden;
 constant million = 1000000 : hidden;
-constant grib2divider   = 1000000;
-alias extraDimensionPresent=zero;
-transient angleSubdivisions=grib2divider;  # micro degrees
+constant grib2divider = 1000000;
+alias extraDimensionPresent = zero;
+transient angleSubdivisions = grib2divider; # micro degrees
 transient forceStepUnits = 255 : hidden;
 
 meta gts_header gts_header() : no_copy,hidden,read_only;
 meta gts_TTAAii gts_header(20,6) : no_copy,hidden,read_only;
 meta gts_CCCC gts_header(27,4) : no_copy,hidden,read_only;
 meta gts_ddhh00 gts_header(32,6) : no_copy,hidden,read_only;
 
-transient  missingValue   = 9999;
-constant ieeeFloats   = 1 : edition_specific;
+transient missingValue = 9999;
+constant ieeeFloats = 1 : edition_specific;
 constant isHindcast = 0;
 
 include "grib2/section.0.def"

diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
@@ -7841,7 +7841,9 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 27 ;
 	 typeOfFirstFixedSurface = 168 ;
-	 typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
 	}
 #Sea water potential temperature tendency due to newtonian relaxation
 'thetaodmp' = {
@@ -9028,7 +9030,9 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 27 ;
 	 typeOfFirstFixedSurface = 168 ;
-	 typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
 #Time-mean sea water potential temperature tendency due to newtonian relaxation

diff --git a/definitions/grib2/cfVarName.legacy.def b/definitions/grib2/cfVarName.legacy.def
@@ -157,3 +157,20 @@
  typeOfStatisticalProcessing = 1 ;
  lengthOfTimeRange = 24 ;
 }
+#Upward sea water velocity
+'wo' = {
+ discipline = 10 ;
+ parameterCategory = 4 ;
+ parameterNumber = 27 ;
+ typeOfFirstFixedSurface = 168 ;
+ typeOfSecondFixedSurface = 168 ;
+}
+#Time-mean upward sea water velocity
+'avg_wo' = {
+ discipline = 10 ;
+ parameterCategory = 4 ;
+ parameterNumber = 27 ;
+ typeOfFirstFixedSurface = 168 ;
+ typeOfSecondFixedSurface = 168 ;
+ typeOfStatisticalProcessing = 0 ;
+}
diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
@@ -7841,7 +7841,9 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 27 ;
 	 typeOfFirstFixedSurface = 168 ;
-	 typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
 	}
 #Sea water potential temperature tendency due to newtonian relaxation
 'Sea water potential temperature tendency due to newtonian relaxation' = {
@@ -9028,7 +9030,9 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 27 ;
 	 typeOfFirstFixedSurface = 168 ;
-	 typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
 #Time-mean sea water potential temperature tendency due to newtonian relaxation

diff --git a/definitions/grib2/name.legacy.def b/definitions/grib2/name.legacy.def
@@ -157,3 +157,20 @@
  typeOfStatisticalProcessing = 1 ;
  lengthOfTimeRange = 24 ;
 }
+#Upward sea water velocity
+'Upward sea water velocity' = {
+ discipline = 10 ;
+ parameterCategory = 4 ;
+ parameterNumber = 27 ;
+ typeOfFirstFixedSurface = 168 ;
+ typeOfSecondFixedSurface = 168 ;
+}
+#Time-mean upward sea water velocity
+'Time-mean upward sea water velocity' = {
+ discipline = 10 ;
+ parameterCategory = 4 ;
+ parameterNumber = 27 ;
+ typeOfFirstFixedSurface = 168 ;
+ typeOfSecondFixedSurface = 168 ;
+ typeOfStatisticalProcessing = 0 ;
+}
diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
@@ -7841,7 +7841,9 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 27 ;
 	 typeOfFirstFixedSurface = 168 ;
-	 typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
 	}
 #Sea water potential temperature tendency due to newtonian relaxation
 '262508' = {
@@ -9028,7 +9030,9 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 27 ;
 	 typeOfFirstFixedSurface = 168 ;
-	 typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
 #Time-mean sea water potential temperature tendency due to newtonian relaxation

diff --git a/definitions/grib2/paramId.legacy.def b/definitions/grib2/paramId.legacy.def
@@ -157,3 +157,20 @@
  typeOfStatisticalProcessing = 1 ;
  lengthOfTimeRange = 24 ;
 }
+#Upward sea water velocity
+'262507' = {
+ discipline = 10 ;
+ parameterCategory = 4 ;
+ parameterNumber = 27 ;
+ typeOfFirstFixedSurface = 168 ;
+ typeOfSecondFixedSurface = 168 ;
+}
+#Time-mean upward sea water velocity
+'263507' = {
+ discipline = 10 ;
+ parameterCategory = 4 ;
+ parameterNumber = 27 ;
+ typeOfFirstFixedSurface = 168 ;
+ typeOfSecondFixedSurface = 168 ;
+ typeOfStatisticalProcessing = 0 ;
+}
diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
@@ -7841,7 +7841,9 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 27 ;
 	 typeOfFirstFixedSurface = 168 ;
-	 typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
 	}
 #Sea water potential temperature tendency due to newtonian relaxation
 'thetaodmp' = {
@@ -9028,7 +9030,9 @@
 	 parameterCategory = 4 ;
 	 parameterNumber = 27 ;
 	 typeOfFirstFixedSurface = 168 ;
-	 typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfSecondFixedSurface = missing() ;
+	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
 #Time-mean sea water potential temperature tendency due to newtonian relaxation

diff --git a/definitions/grib2/shortName.legacy.def b/definitions/grib2/shortName.legacy.def
@@ -157,3 +157,20 @@
  typeOfStatisticalProcessing = 1 ;
  lengthOfTimeRange = 24 ;
 }
+#Upward sea water velocity
+'wo' = {
+ discipline = 10 ;
+ parameterCategory = 4 ;
+ parameterNumber = 27 ;
+ typeOfFirstFixedSurface = 168 ;
+ typeOfSecondFixedSurface = 168 ;
+}
+#Time-mean upward sea water velocity
+'avg_wo' = {
+ discipline = 10 ;
+ parameterCategory = 4 ;
+ parameterNumber = 27 ;
+ typeOfFirstFixedSurface = 168 ;
+ typeOfSecondFixedSurface = 168 ;
+ typeOfStatisticalProcessing = 0 ;
+}
diff --git a/definitions/grib2/template.3.30.def b/definitions/grib2/template.3.30.def
@@ -62,12 +62,12 @@ include "grib2/template.3.scanning_mode.def"
 
 # Latin 1 - first latitude from the pole at which the secant cone cuts the sphere
 signed[4] Latin1   : edition_specific;
-alias FirstLatitude=Latin1;
+alias firstLatitude=Latin1;
 meta geography.Latin1InDegrees scale(Latin1,one,grib2divider,truncateDegrees) : dump;
 
 # Latin 2 - second latitude from the pole at which the secant cone cuts the sphere
 signed[4] Latin2  : dump;
-alias SecondLatitude=Latin2;
+alias secondLatitude=Latin2;
 meta geography.Latin2InDegrees scale(Latin2,one,grib2divider,truncateDegrees) : dump;
 
 # Latitude of the southern pole of projection

diff --git a/definitions/grib2/template.3.63.def b/definitions/grib2/template.3.63.def
@@ -38,12 +38,12 @@ flags[1] projectionCentreFlag 'grib2/tables/[tablesVersion]/3.5.table' : dump;
 
 #  Latin 1 - first latitude from the pole at which the secant cone cuts the sphere
 signed[4] Latin1 : edition_specific;
-alias FirstLatitude=Latin1;
+alias firstLatitude=Latin1;
 meta  geography.Latin1InDegrees scale(Latin1,one,grib2divider,truncateDegrees) : dump;
 
 #  Latin 2 - second latitude from the pole at which the secant cone cuts the sphere
 signed[4] Latin2 : dump;
-alias SecondLatitude=Latin2;
+alias secondLatitude=Latin2;
 meta  geography.Latin2InDegrees scale(Latin2,one,grib2divider,truncateDegrees) : dump;
 
 #  Latitude of the southern pole of projection

diff --git a/definitions/grib2/template.3.shape_of_the_earth.def b/definitions/grib2/template.3.shape_of_the_earth.def
@@ -73,12 +73,12 @@ _if (shapeOfTheEarth == 3){
   # ECC-979
   # The 'scale' accessor works with integers so rounds its first argument
   # which is not what we want because the inputs are doubles with decimal
-  # expansions. So use the trick of dividing by 0.001 to multiply by 1000
+  # expansions.
   #
   # meta earthMajorAxisInMetres scale(earthMajorAxis, thousand, one, zero);
   # meta earthMinorAxisInMetres scale(earthMinorAxis, thousand, one, zero);
-  meta earthMajorAxisInMetres divdouble(earthMajorAxis, 0.001);
-  meta earthMinorAxisInMetres divdouble(earthMinorAxis, 0.001);
+  meta earthMajorAxisInMetres multdouble(earthMajorAxis, 1000);
+  meta earthMinorAxisInMetres multdouble(earthMinorAxis, 1000);
 }
 _if (shapeOfTheEarth == 7){
   # Major and minor axes specified (in m) by data producer

diff --git a/definitions/grib2/template.4.1100.def b/definitions/grib2/template.4.1100.def
@@ -1,6 +1,7 @@
 # (C) Copyright 2005- ECMWF.
 
 # TEMPLATE 4.1100, Hovmoller-type grid with no averaging or other statistical processing
+# This template is experimental, was not validated at the time of publication and should be used only for bilateral previously agreed tests
 
 include "grib2/template.4.parameter.def"
 include "grib2/template.4.generating_process.def"