Merge remote-tracking branch 'origin/develop' into feature/ECC-1909-model-name-version-extension

.appveyor.yml

@@ -52,7 +52,7 @@ install:
                                 m2w64-ntldd-git
 
     # get deps. Drop libnetcdf
-  - cmd: conda install -c conda-forge cmake
+  - cmd: conda install -c conda-forge cmake libaec
 
 #---------------------------------#
 #       build configuration       #
@@ -64,6 +64,9 @@ platform:
 before_build:
   - cmd: call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
 
+# Building with libaec fails. When any executable runs, we get:
+#   error while loading shared libraries: ?: cannot open shared object file: No such file or directory
+# So we have to disable AEC
 build_script:
   - cmd: cd %ECCODES_SRC%
   - cmd: mkdir build && cd build

.github/workflows/nightly.yml

@@ -69,6 +69,8 @@ jobs:
     secrets:
       url_debian_11: ${{ secrets.NEXUS_TEST_REPO_NIGHTLY_URL_DEBIAN_11 }}
       token_debian_11: ${{ secrets.NEXUS_TEST_REPO_UPLOAD_TOKEN }}
+      url_debian_12: ${{ secrets.NEXUS_TEST_REPO_URL_DEBIAN_12 }}
+      token_debian_12: ${{ secrets.NEXUS_TEST_REPO_UPLOAD_TOKEN }}
       url_centos_7: ${{ secrets.NEXUS_TEST_REPO_NIGHTLY_URL_CENTOS_7 }}
       token_centos_7: ${{ secrets.NEXUS_TEST_REPO_UPLOAD_TOKEN }}
       url_rocky_8: ${{ secrets.NEXUS_TEST_REPO_NIGHTLY_URL_ROCKY_8 }}

AUTHORS

@@ -4,6 +4,8 @@ Enrico Fucile
 Pedro Maciel
 Sandor Kertesz
 Sebastien Villaume
+Robert Osinski
+Matthew Griffith
 Florian Rathgeber
 Baudouin Raoult
 Cristian Codorean

CMakeLists.txt

@@ -18,7 +18,16 @@
 
 cmake_minimum_required( VERSION 3.12 FATAL_ERROR )
 
-find_package( ecbuild 3.7 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild)
+find_package( ecbuild 3.7 HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild)
+if(NOT ecbuild_FOUND)
+    message(STATUS "Fetching ecbuild...")
+    include(FetchContent)
+    FetchContent_Populate(ecbuild
+        GIT_REPOSITORY https://github.com/ecmwf/ecbuild.git
+        GIT_TAG        3.8.5
+    )
+    find_package( ecbuild 3.7 REQUIRED HINTS ${ecbuild_SOURCE_DIR})
+endif()
 
 # Initialise project
 project( eccodes LANGUAGES CXX )
@@ -425,7 +434,10 @@ endforeach()
 
 ### include directories
 
-include_directories( ${ECCODES_INCLUDE_DIRS}  ${ECCODES_EXTRA_INCLUDE_DIRS} )
+include_directories(
+    ${ECCODES_INCLUDE_DIRS}
+    ${ECCODES_EXTRA_INCLUDE_DIRS}
+    )
 
 add_subdirectory( definitions ) # must be before memfs
 add_subdirectory( memfs )
@@ -508,11 +520,8 @@ ecbuild_info("   |  ecCodes version ${eccodes_VERSION}  |")
 ecbuild_info("   +--------------------------+")
 ecbuild_info("")
 
-ecbuild_info("   +--------------------------------------+")
+ecbuild_info("Please note:")
-ecbuild_info("   | Please note:                         |")
+ecbuild_info(" For Python3 support, you must install the Python bindings.")
-ecbuild_info("   | For Python3 support, first install   |")
+ecbuild_info(" See:")
-ecbuild_info("   | ecCodes and then install the Python  |")
+ecbuild_info("  https://confluence.ecmwf.int/display/ECC/ecCodes+installation")
-ecbuild_info("   | bindings from PyPI with:             |")
-ecbuild_info("   |   $ pip3 install eccodes             |")
-ecbuild_info("   +--------------------------------------+")
 ecbuild_info("")

VERSION

@@ -1 +1 @@
-2.37.0
+2.39.0

data/bitmap.diff

@@ -16,7 +16,6 @@ GRIB {
   subCentre = 0;
   paramId = 130;
   #-READ ONLY- cfName = air_temperature;
-  #-READ ONLY- cfVarName = t;
   #-READ ONLY- units = K;
   #-READ ONLY- name = Temperature;
   decimalScaleFactor = 0;
@@ -40,6 +39,7 @@ GRIB {
   perturbationNumber = 0;
   numberOfForecastsInEnsemble = 0;
   shortName = t;
+  #-READ ONLY- cfVarName = t;
   GDSPresent = 1;
   bitmapPresent = 1;
   numberOfVerticalCoordinateValues = 184;

data/no_bitmap.diff

@@ -16,7 +16,6 @@ GRIB {
   subCentre = 0;
   paramId = 130;
   #-READ ONLY- cfName = air_temperature;
-  #-READ ONLY- cfVarName = t;
   #-READ ONLY- units = K;
   #-READ ONLY- name = Temperature;
   decimalScaleFactor = 0;
@@ -40,6 +39,7 @@ GRIB {
   perturbationNumber = 0;
   numberOfForecastsInEnsemble = 0;
   shortName = t;
+  #-READ ONLY- cfVarName = t;
   GDSPresent = 1;
   bitmapPresent = 0;
   numberOfVerticalCoordinateValues = 184;

definitions/boot.def

@@ -12,7 +12,8 @@ constant internalVersion=30 : hidden;
 meta checkInternalVersion check_internal_version(internalVersion) : hidden;
 
 # ECC-806: Local concepts precedence order
-transient preferLocalConcepts = 0 : hidden;
+preferLocalConceptsEnvVar = getenv("ECCODES_GRIB_PREFER_LOCAL_CONCEPTS","0") : hidden;
+transient preferLocalConcepts = preferLocalConceptsEnvVar : hidden;
 
 constant defaultTypeOfLevel="unknown" : hidden;
 

definitions/bufr/rdb_key.def

@@ -1,4 +1,5 @@
 # RDB stands for REPORT DATA BASE
+# See https://confluence.ecmwf.int/pages/viewpage.action?pageId=24316441
 unsigned[1]   rdbType : dump; 
 unsigned[1]   oldSubtype: dump;
 

definitions/bufr/section.3.def

@@ -50,7 +50,7 @@ unsigned[1]     reservedSection3 = 0;
 unsigned[2]     numberOfSubsets : dump;
 alias ls.numberOfSubsets=numberOfSubsets;
 
-if (section2Present && bufrHeaderCentre==98 && section2Length==52) {
+if (section2Present && bufrHeaderCentre == 98 && section2Length == 52) {
     if ( rdbType == 2 || rdbType == 3 || rdbType == 8 || rdbType == 12 || rdbType == 30 ) {
         transient isSatelliteType=1;
     } else {
@@ -69,10 +69,11 @@ if (section2Present && bufrHeaderCentre==98 && section2Length==52) {
         meta localLatitude2 bits(keyMore,32,25,-9000000,100000) : dump,no_copy;
 
         # This rule is taken from BUFRDC. See bufrdc_wmo/buukey.F
-        # Also see ECC-686
+        # See ECC-686
-        if (oldSubtype == 255 || numberOfSubsets>255 ||
+        # and https://confluence.ecmwf.int/pages/viewpage.action?pageId=24316441
-            ( oldSubtype>=121 && oldSubtype <=130 )  ||
+        if (oldSubtype == 255 || numberOfSubsets > 255 ||
-            oldSubtype==31) {
+            ( oldSubtype >= 121 && oldSubtype <= 130 ) ||
+            oldSubtype == 31) {
             meta ls.localNumberOfObservations bits(keySat,0,16) : dump,long_type,no_copy;
             meta ls.satelliteID bits(keySat,16,16) : dump,long_type,no_copy;
         } else {
@@ -114,16 +115,16 @@ meta bufrdcExpandedDescriptors bufrdc_expanded_descriptors(expandedCodes) : no_c
 #smart_table NAME (VALUES,FILE_NAME,MASTER_DIRECTORY,LOCAL_DIRECTORY,WIDTH_OF_CODE_IN_BITS,EXTRA_DIRECTORY,EXTRA_FILE_NAME);
 #Note: The WIDTH_OF_CODE_IN_BITS has to be big enough so 2^width > the highest BUFR descriptor code
 smart_table expandedOriginalCodes (expandedCodes,"element.table",tablesMasterDir,tablesLocalDir,18,rootTablesDir,"operators.table") :no_copy;
-meta expandedAbbreviations         smart_table_column(expandedOriginalCodes,0,1) : string_type,no_copy;
+meta expandedAbbreviations        smart_table_column(expandedOriginalCodes,0,1) : string_type,no_copy;
-meta expandedTypes                 smart_table_column(expandedOriginalCodes,1,0) : string_type,no_copy;
+meta expandedTypes                smart_table_column(expandedOriginalCodes,1,0) : string_type,no_copy;
-meta expandedNames                 smart_table_column(expandedOriginalCodes,2,0) : string_type,no_copy;
+meta expandedNames                smart_table_column(expandedOriginalCodes,2,0) : string_type,no_copy;
-meta expandedUnits                 smart_table_column(expandedOriginalCodes,3,0) : string_type,no_copy;
+meta expandedUnits                smart_table_column(expandedOriginalCodes,3,0) : string_type,no_copy;
-meta expandedOriginalScales        smart_table_column(expandedOriginalCodes,4,0) : long_type,no_copy;
+meta expandedOriginalScales       smart_table_column(expandedOriginalCodes,4,0) : long_type,no_copy;
-meta expandedOriginalReferences    smart_table_column(expandedOriginalCodes,5,0) : long_type,no_copy;
+meta expandedOriginalReferences   smart_table_column(expandedOriginalCodes,5,0) : long_type,no_copy;
-meta expandedOriginalWidths        smart_table_column(expandedOriginalCodes,6,0) : long_type,no_copy;
+meta expandedOriginalWidths       smart_table_column(expandedOriginalCodes,6,0) : long_type,no_copy;
-meta expandedCrex_units            smart_table_column(expandedOriginalCodes,7,0) : long_type,no_copy;
+meta expandedCrex_units           smart_table_column(expandedOriginalCodes,7,0) : long_type,no_copy;
-meta expandedCrex_scales           smart_table_column(expandedOriginalCodes,8,0) : long_type,no_copy;
+meta expandedCrex_scales          smart_table_column(expandedOriginalCodes,8,0) : long_type,no_copy;
-meta expandedCrex_widths           smart_table_column(expandedOriginalCodes,9,0) : long_type,no_copy;
+meta expandedCrex_widths          smart_table_column(expandedOriginalCodes,9,0) : long_type,no_copy;
 
 position endDescriptors;
 section_padding section3Padding;

definitions/bufr/tables/0/local/1/98/0/element.table

@@ -129,6 +129,7 @@
 013234|snowDepthWaterEquivalentSdGrib|double|SNOW DEPTH (WATER EQUIVALENT SD GRIB)|m|4|0|14|NA|0|0
 013240|airDensity|double|AIR DENSITY|kg m-3|3|0|10|NA|0|0
 013241|cape|double|CONVECTIVE AVAILABLE POTENTIAL ENERGY|J/kg|1|0|17|NA|0|0
+013242|mucape|long|MOST UNSTABLE CAPE|J/kg|0|0|14|NA|0|0
 014200|surfaceSolarRadiationDownwardsSsrdGrib|long|SURFACE SOLAR RADIATION DOWNWARDS (SSRD GRIB)|W m-2 s|-2|0|24|NA|0|0
 015202|integratedElectronDensity|double|INTEGRATED ELECTRON DENSITY|m-2|3|13000|12|NA|0|0
 015231|atmosphericPathDelayInSatelliteSignal|double|ATMOSPHERIC PATH DELAY IN SATELLITE SIGNAL|m|4|0|15|NA|0|0

definitions/bufr/tables/0/local/101/98/0/element.table

@@ -110,6 +110,7 @@
 013231|largeScalePrecipitation|double|LARGE SCALE PRECIPITATION|kg m-2|1|-1|14|NA|0|0
 013240|airDensity|double|AIR DENSITY|kg m-3|3|0|10|NA|0|0
 013241|cape|double|CONVECTIVE AVAILABLE POTENTIAL ENERGY|J/kg|1|0|17|NA|0|0
+013242|mucape|long|MOST UNSTABLE CAPE|J/kg|0|0|14|NA|0|0
 015008|significandOfVolumetricMixingRatio|long|(VAL) SCALED VOLUMETRIC MIXING RATIO|Numeric|0|0|24|NA|0|0
 015021|integratedMassDensity|long|(VAL) SCALED INTEGRATED MASS DENSITY|kg m-2|0|0|24|NA|0|0
 015042|reflectance|long|(VAL) REFLECTANCE|Numeric|6|0|20|NA|0|0

definitions/bufr/tables/3/local/1/98/0/element.table

@@ -123,6 +123,7 @@
 013234|snowDepthWaterEquivalentSdGrib|double|SNOW DEPTH (WATER EQUIVALENT SD GRIB)|m|4|0|14|NA|0|0
 013240|airDensity|double|AIR DENSITY|kg m-3|3|0|10|NA|0|0
 013241|cape|double|CONVECTIVE AVAILABLE POTENTIAL ENERGY|J/kg|1|0|17|NA|0|0
+013242|mucape|long|MOST UNSTABLE CAPE|J/kg|0|0|14|NA|0|0
 014200|surfaceSolarRadiationDownwardsSsrdGrib|long|SURFACE SOLAR RADIATION DOWNWARDS (SSRD GRIB)|W m-2 s|-2|0|24|NA|0|0
 015202|integratedElectronDensity|double|INTEGRATED ELECTRON DENSITY|m-2|3|13000|12|NA|0|0
 015231|atmosphericPathDelayInSatelliteSignal|double|ATMOSPHERIC PATH DELAY IN SATELLITE SIGNAL|m|4|0|15|NA|0|0

definitions/create_def.pl

@@ -38,7 +38,8 @@ sub create_cfName {
     attribute.id=grib.attribute_id and
     centre.id=grib_encoding.centre_id and
     units.id=param.units_id and
-    param.id=cf.grib1_ecmwf order by
+    param.id=cf.grib1_ecmwf and
+    grib_encoding.is_legacy=0 order by
     edition,centre_id,param.o,param.id,grib_encoding.param_version,attribute.o;
 EOF
 
@@ -98,6 +99,83 @@ EOF
     close(TAR);
 }
 
+sub create_cfName_legacy {
+    my $p; my %seen; 
+    my ($key) = "cfName";
+    my $field = "cf.name";
+
+    my $query= <<"EOF";
+    select $field,force128,edition,
+    centre.abbreviation,param_id,attribute.name,attribute_value,param.name,param.shortName from
+    param,grib_encoding,grib,attribute,centre,units,cf where
+    param.hide_def=0 and
+#    param.retired=0 and
+    grib_encoding.id=grib.encoding_id and
+    param.id=grib_encoding.param_id and
+    attribute.id=grib.attribute_id and
+    centre.id=grib_encoding.centre_id and
+    units.id=param.units_id and
+    param.id=cf.grib1_ecmwf and
+    grib_encoding.is_legacy=1 order by
+    edition,centre_id,param.o,param.id,grib_encoding.param_version,attribute.o;
+EOF
+
+    my $qh=$dbh->prepare($query);
+    $qh->execute();
+
+    # file containing the list of grib api parameters files we want to tar and 
+    # distribute to users for them to download and update their list of parameter
+    # to the latest
+    #open(TAR,$tarfilesflag ? ">>" : ">","tarfiles.txt") or die "Count not open file tarfiles.txt: $!";
+    #$tarfilesflag=1;
+
+    while (my ($keyval,$force128,$edition,$centre,$paramId,$attribute,$value,$name,$shortName)=$qh->fetchrow_array )
+    {
+        if ($centre eq "wmo" ) { $conceptDir=""; }
+        else { $conceptDir="/localConcepts/$centre"; }
+
+        if ($filebase ne "$basedir/grib$edition$conceptDir") {
+            if ($filebase) {
+                print $out "}\n";
+                close $out;
+            }
+            $filebase="$basedir/grib$edition$conceptDir";
+            mkpath($filebase);
+
+            print TAR "grib$edition$conceptDir/$key.legacy.def\n";
+            #system("cp -f $filebase/$key.def $filebase/$key.def.orig");
+            open($out,"> $filebase/$key.legacy.def")
+                or die "unable to open $filebase/$key.legacy.def";
+            print $out "# Automatically generated by $0, do not edit\n";
+            $p=();
+        }
+        if ($p ne $paramId || exists($seen{$attribute}) ) {
+           if ($p) { print $out "\t}\n"; }
+           print $out "#$name\n" ;
+           print $out "\'".$keyval."\' = {\n" ;
+           $p=$paramId;
+           %seen=();
+        }
+        $seen{$attribute}=1;
+        print "($key=$keyval) $edition,$centre,$shortName,$paramId,$name,$attribute,$value\n";
+        # we need to allow strings in the attribute_value field 
+        # for the moment we apply a patch here
+        if ($attribute =~ /stepType/ ) {
+            $value="\"accum\"";
+        }
+        if ($value eq '') {
+            $value="missing()";
+        }
+        print $out "\t $attribute = $value ;\n" ;
+    }
+    if ($filebase) {
+       print $out "}\n";
+       close $out;
+    }
+
+    close(TAR);
+}
+
 sub create_def {
     my $p; my %seen; 
     my ($key) =@_;
@@ -117,7 +195,8 @@ sub create_def {
         param.id=grib_encoding.param_id and
         attribute.id=grib.attribute_id and
         centre.id=grib_encoding.centre_id and
-        units.id=param.units_id
+        units.id=param.units_id and
+        grib_encoding.is_legacy=0
         order by edition,centre_id,param.o,param.id,grib_encoding.param_version,attribute.o;
 EOF
 
@@ -183,29 +262,27 @@ EOF
     close(TAR);
 }
 
-# See ECC-1886
+sub create_def_legacy {
-sub create_cfVarName {
     my $p; my %seen; 
     my ($key) =@_;
     my $field=$key;
 
-    #if ($key =~ /paramId/) { $field="param.id"; } 
+    if ($key =~ /paramId/) { $field="param.id"; } 
-    #if ($key =~ /name/) { $field="param.name"; } 
+    if ($key =~ /name/) { $field="param.name"; } 
-    #if ($key =~ /units/) { $field="units.name"; } 
+    if ($key =~ /units/) { $field="units.name"; } 
-    if ($key =~ /cfVarName/) { $field="cfVarName"; }
 
     my $query= <<"EOF";
         select $field,force128,edition,
         centre.abbreviation,param_id,attribute.name,attribute_value,param.name,param.shortName
         from param,grib_encoding,grib,attribute,centre,units where
         param.hide_def=0 and
-        param.retired=0 and
+#        param.retired=0 and
         grib_encoding.id=grib.encoding_id and
         param.id=grib_encoding.param_id and
         attribute.id=grib.attribute_id and
         centre.id=grib_encoding.centre_id and
-        units.id=param.units_id
+        units.id=param.units_id and
-        and cfVarName IS NOT NULL
+        grib_encoding.is_legacy=1
         order by edition,centre_id,param.o,param.id,grib_encoding.param_version,attribute.o;
 EOF
 
@@ -237,10 +314,10 @@ EOF
             #copy("$filebase/$key.def","$filebase/$key.def.bkp") 
             #  or die ("unable to copy $filebase/$key.def");
 
-            print TAR "grib$edition$conceptDir/$key.def\n";
+            print TAR "grib$edition$conceptDir/$key.legacy.def\n";
             #system("cp -f $filebase/$key.def $filebase/$key.def.orig");
-            open($out,"> $filebase/$key.def")
+            open($out,"> $filebase/$key.legacy.def")
-                or die "unable to open $filebase/$key.def";
+                or die "unable to open $filebase/$key.legacy.def";
             print $out "# Automatically generated by $0, do not edit\n";
             $p=();
         }
@@ -270,7 +347,7 @@ EOF
 
     close(TAR);
 }
-
+ 
 sub create_paramId_def {
     my $p; my %seen; 
 
@@ -281,7 +358,8 @@ sub create_paramId_def {
     grib_encoding.id=grib.encoding_id and
     param.id=grib_encoding.param_id and
     attribute.id=grib.attribute_id and
-    centre.id=grib_encoding.centre_id
+    centre.id=grib_encoding.centre_id and
+    grib_encoding.is_legacy=0
     order by edition,centre_id,param.o,param.id,attribute.o";
     my $qh=$dbh->prepare($query);
     $qh->execute();
@@ -355,13 +433,15 @@ sub create_def_old {
 }
 
 create_def("paramId");
+create_def_legacy("paramId");
 create_def("shortName");
+create_def_legacy("shortName");
 create_def("name");
+create_def_legacy("name");
 create_def("units");
-# Note: The cfVarName.def files are smaller than the rest. We only store the
+create_def_legacy("units");
-#       minimum set necessary. See ECC-1886
-create_cfVarName("cfVarName");
 create_cfName("cfName");
+create_cfName_legacy("cfName");
 
 # #create_paramId_def();
 

definitions/grib1/boot.def

@@ -16,7 +16,7 @@ constant three=1 : hidden;
 constant eight=8 : hidden;
 constant eleven=11 : hidden;
 constant epsPoint=1 : hidden;
-constant epsContinous=11 : hidden;
+constant epsContinuous=11 : hidden;
 constant epsStatisticsPoint=2 : hidden;
 constant epsStatisticsContinous=12 : hidden;
 
@@ -43,10 +43,10 @@ g1_message_length[3] totalLength(section4Length);
 position startOfHeaders;
 unsigned[1] editionNumber = 1 : edition_specific,dump;
 
-template      section_1 "grib1/section.1.def";
-
 alias ls.edition = editionNumber;
 
+template      section_1 "grib1/section.1.def";
+
 # Note flagbit numbers 7 to 0, while wmo is 1 to 8
 flagbit gridDescriptionSectionPresent(section1Flags,7) = 1;
 meta GDSPresent gds_is_present(gridDescriptionSectionPresent,gridDefinition,bitmapPresent,values): dump;

definitions/grib1/data.grid_simple_matrix.def

@@ -114,7 +114,6 @@ if(matrixOfValues == 0)
 
 # From GRIBEX:
 #  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#  !                                                !
 #  ! This is the WMO definition, but it is entirely !
 #  ! inadequate when secondary bit maps are present !
 #  ! eg 3x3 global grid with a matrix of values     !
@@ -129,7 +128,6 @@ if(matrixOfValues == 0)
 #  !      missing').                                !
 #  !     This definition will accommodate a 1x1     !
 #  !     degree global grid.                        !
-#  !                                                !
 #  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #
 	  constant datumSize             = NC*NR;

definitions/grib1/gds_not_present_bitmap.def

@@ -10,10 +10,11 @@ transient numberOfUnusedBitsAtEndOfSection3 = 0 : read_only;
 transient tableReference = 0;
 
 #position offsetBeforeBitmap;
-meta bitmap gds_not_present_bitmap( missingValue,numberOfValues,
+meta bitmap gds_not_present_bitmap(
-                                    numberOfPoints,
+    missingValue,numberOfValues,
-                                    latitudeOfFirstGridPoint,
+    numberOfPoints,
-                                    Ni,numberOfUnusedBitsAtEndOfSection3) : read_only;
+    latitudeOfFirstGridPoint,
+    Ni,numberOfUnusedBitsAtEndOfSection3) : read_only;
 
 #position offsetAfterBitmap;
 #padtoeven padding_sec3_1(offsetSection3,section3Length);

definitions/grib1/grid_definition_192.78.def

@@ -40,6 +40,6 @@ transient numberOfPoints= nd *(Ni + 1) * (Ni + 1);
 alias numberOfDataPoints=numberOfPoints;
 
 meta numberOfValues
-number_of_values(values,bitsPerValue,numberOfDataPoints,
+number_of_values(
-                 bitmapPresent,bitmap,numberOfCodedValues) : dump;
+    values,bitsPerValue,numberOfDataPoints,
-
+    bitmapPresent,bitmap,numberOfCodedValues) : dump;

definitions/grib1/grid_definition_193.98.def

@@ -79,11 +79,11 @@ if(missing(Ni)){
    nearest latlon_reduced(values,radius,Nj,pl);
 } else {
    transient iteratorDisableUnrotate = 0 : hidden; # ECC-808
-   iterator latlon(numberOfPoints,missingValue,values,longitudeFirstInDegrees,iInc ,
+   iterator latlon(numberOfPoints,missingValue,values,longitudeFirstInDegrees,iInc,
-                   Ni,Nj,iScansNegatively ,
+         Ni,Nj,iScansNegatively,
-                   latitudeFirstInDegrees,DjInDegrees,jScansPositively,jPointsAreConsecutive,
+         latitudeFirstInDegrees,DjInDegrees,jScansPositively,jPointsAreConsecutive,
-                   isRotatedGrid, angleOfRotation,
+         isRotatedGrid, angleOfRotation,
-                   latitudeOfSouthernPoleInDegrees,longitudeOfSouthernPoleInDegrees);
+         latitudeOfSouthernPoleInDegrees,longitudeOfSouthernPoleInDegrees);
    nearest regular(values,radius,Ni,Nj);
 }
 meta latLonValues latlonvalues(values);

definitions/grib1/local.214.1.def

@@ -32,7 +32,7 @@ if (stepType is "instant" ) {
   }
 } else {
   if (numberOfForecastsInEnsemble!=0) {
-    alias productDefinitionTemplateNumber=epsContinous;
+    alias productDefinitionTemplateNumber=epsContinuous;
   }
 }
 

definitions/grib1/local.34.1.def

@@ -40,7 +40,7 @@ if (stepType is "instant" ) {
 			} else {
 				alias typeOfEnsembleForecast=three;
 			}
-			alias productDefinitionTemplateNumber=epsContinous;
+			alias productDefinitionTemplateNumber=epsContinuous;
 		} else {
 			alias productDefinitionTemplateNumber=eight;
 		}

definitions/grib1/local.98.1.def

@@ -41,7 +41,7 @@ if (stepType is "instant" ) {
             } else {
                 alias typeOfEnsembleForecast=three;
             }
-            alias productDefinitionTemplateNumber=epsContinous;
+            alias productDefinitionTemplateNumber=epsContinuous;
         } else {
             alias productDefinitionTemplateNumber=eight;
         }

definitions/grib1/local.98.18.def

@@ -10,7 +10,7 @@ constant grib2LocalSectionNumber=18;
 if (stepType is "instant" ) {
   alias productDefinitionTemplateNumber=epsPoint;
 } else {
-  alias productDefinitionTemplateNumber=epsContinous;
+  alias productDefinitionTemplateNumber=epsContinuous;
 }
 template mars_labeling "grib1/mars_labeling.def";
 

definitions/grib1/local.98.19.def

@@ -12,6 +12,7 @@ alias perturbationNumber=number;
 
 unsigned[1] ensembleSize  : dump;
 alias totalNumber=ensembleSize;
+alias numberOfForecastsInEnsemble=ensembleSize;
 
 meta quantile sprintf("%s:%s",number,ensembleSize);
 

definitions/grib1/local.98.218.def

@@ -10,7 +10,7 @@ constant grib2LocalSectionNumber=18;
 if (stepType is "instant" ) {
   alias productDefinitionTemplateNumber=epsPoint;
 } else {
-   alias productDefinitionTemplateNumber=epsContinous;
+   alias productDefinitionTemplateNumber=epsContinuous;
 }
 template mars_labeling "grib1/mars_labeling.def";
 

definitions/grib1/local.98.26.def

@@ -14,7 +14,7 @@ constant grib2LocalSectionNumber=26;
 if (stepType is "instant" ) {
   alias productDefinitionTemplateNumber=epsPoint;
 } else {
-  alias productDefinitionTemplateNumber=epsContinous;
+  alias productDefinitionTemplateNumber=epsContinuous;
 }
 
 constant wrongPadding=1 : hidden;

definitions/grib1/local.98.30.def

@@ -23,7 +23,7 @@ if (stepType is "instant" ) {
   if (type is "em" || type is "es" ) {
     alias productDefinitionTemplateNumber=epsStatisticsContinous;
   } else {
-    alias productDefinitionTemplateNumber=epsContinous;
+    alias productDefinitionTemplateNumber=epsContinuous;
   }
 }
 

definitions/grib1/local.98.36.def

@@ -47,7 +47,7 @@ if (stepType is "instant" ) {
             } else {
                 alias typeOfEnsembleForecast=three;
             }
-            alias productDefinitionTemplateNumber=epsContinous;
+            alias productDefinitionTemplateNumber=epsContinuous;
         } else {
             alias productDefinitionTemplateNumber=eight;
         }

definitions/grib1/localConcepts/ecmf/cfVarName.def

@@ -504,13 +504,13 @@
 	 table2Version = 200 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Mean 2 metre temperature
+#Time-mean 2 metre temperature
-'mean2t' = {
+'avg_2t' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 4 ;
 	}
-#Mean of 10 metre wind speed
+#Time-mean 10 metre wind speed
-'mean10ws' = {
+'avg_10ws' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 5 ;
 	}

definitions/grib1/localConcepts/ecmf/name.def

@@ -10309,203 +10309,203 @@
 	 table2Version = 230 ;
 	 indicatorOfParameter = 251 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
-'Mean surface runoff rate' = {
+'Time-mean surface runoff rate' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 20 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
-'Mean sub-surface runoff rate' = {
+'Time-mean sub-surface runoff rate' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 21 ;
 	}
-#Mean surface photosynthetically active radiation flux, clear sky
+#Time-mean surface photosynthetically active radiation flux, clear sky
-'Mean surface photosynthetically active radiation flux, clear sky' = {
+'Time-mean surface photosynthetically active radiation flux, clear sky' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 22 ;
 	}
-#Mean snow evaporation rate
+#Time-mean snow evaporation rate water equivalent
-'Mean snow evaporation rate' = {
+'Time-mean snow evaporation rate water equivalent' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 23 ;
 	}
-#Mean snowmelt rate
+#Time-mean snow melt rate
-'Mean snowmelt rate' = {
+'Time-mean snow melt rate' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 24 ;
 	}
-#Mean magnitude of turbulent surface stress
+#Time-mean magnitude of turbulent surface stress
-'Mean magnitude of turbulent surface stress' = {
+'Time-mean magnitude of turbulent surface stress' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 25 ;
 	}
-#Mean large-scale precipitation fraction
+#Time-mean large-scale precipitation fraction
-'Mean large-scale precipitation fraction' = {
+'Time-mean large-scale precipitation fraction' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 26 ;
 	}
-#Mean surface downward UV radiation flux
+#Time-mean surface downward UV radiation flux
-'Mean surface downward UV radiation flux' = {
+'Time-mean surface downward UV radiation flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 27 ;
 	}
-#Mean surface photosynthetically active radiation flux
+#Time-mean surface photosynthetically active radiation flux
-'Mean surface photosynthetically active radiation flux' = {
+'Time-mean surface photosynthetically active radiation flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 28 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
-'Mean large-scale precipitation rate' = {
+'Time-mean large-scale precipitation rate' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 29 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
-'Mean convective precipitation rate' = {
+'Time-mean convective precipitation rate' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 30 ;
 	}
-#Mean snowfall rate
+#Time-mean total snowfall rate water equivalent
-'Mean snowfall rate' = {
+'Time-mean total snowfall rate water equivalent' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 31 ;
 	}
-#Mean boundary layer dissipation
+#Time-mean boundary layer dissipation
-'Mean boundary layer dissipation' = {
+'Time-mean boundary layer dissipation' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 32 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
-'Mean surface sensible heat flux' = {
+'Time-mean surface sensible heat flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 33 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
-'Mean surface latent heat flux' = {
+'Time-mean surface latent heat flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 34 ;
 	}
-#Mean surface downward short-wave radiation flux
+#Time-mean surface downward short-wave radiation flux
-'Mean surface downward short-wave radiation flux' = {
+'Time-mean surface downward short-wave radiation flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 35 ;
 	}
-#Mean surface downward long-wave radiation flux
+#Time-mean surface downward long-wave radiation flux
-'Mean surface downward long-wave radiation flux' = {
+'Time-mean surface downward long-wave radiation flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 36 ;
 	}
-#Mean surface net short-wave radiation flux
+#Time-mean surface net short-wave radiation flux
-'Mean surface net short-wave radiation flux' = {
+'Time-mean surface net short-wave radiation flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 37 ;
 	}
-#Mean surface net long-wave radiation flux
+#Time-mean surface net long-wave radiation flux
-'Mean surface net long-wave radiation flux' = {
+'Time-mean surface net long-wave radiation flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 38 ;
 	}
-#Mean top net short-wave radiation flux
+#Time-mean top net short-wave radiation flux
-'Mean top net short-wave radiation flux' = {
+'Time-mean top net short-wave radiation flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 39 ;
 	}
-#Mean top net long-wave radiation flux
+#Time-mean top net long-wave radiation flux
-'Mean top net long-wave radiation flux' = {
+'Time-mean top net long-wave radiation flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 40 ;
 	}
-#Mean eastward turbulent surface stress
+#Time-mean eastward turbulent surface stress
-'Mean eastward turbulent surface stress' = {
+'Time-mean eastward turbulent surface stress' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 41 ;
 	}
-#Mean northward turbulent surface stress
+#Time-mean northward turbulent surface stress
-'Mean northward turbulent surface stress' = {
+'Time-mean northward turbulent surface stress' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 42 ;
 	}
-#Mean evaporation rate
+#Time-mean moisture flux
-'Mean evaporation rate' = {
+'Time-mean moisture flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 43 ;
 	}
-#Sunshine duration fraction
+#Time-mean sunshine duration fraction
-'Sunshine duration fraction' = {
+'Time-mean sunshine duration fraction' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Mean eastward gravity wave surface stress
+#Time-mean eastward gravity wave surface stress
-'Mean eastward gravity wave surface stress' = {
+'Time-mean eastward gravity wave surface stress' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 45 ;
 	}
-#Mean northward gravity wave surface stress
+#Time-mean northward gravity wave surface stress
-'Mean northward gravity wave surface stress' = {
+'Time-mean northward gravity wave surface stress' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 46 ;
 	}
-#Mean gravity wave dissipation
+#Time-mean gravity wave dissipation
-'Mean gravity wave dissipation' = {
+'Time-mean gravity wave dissipation' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 47 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate water equivalent (surface plus subsurface)
-'Mean runoff rate' = {
+'Time-mean runoff rate water equivalent (surface plus subsurface)' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 48 ;
 	}
-#Mean top net short-wave radiation flux, clear sky
+#Time-mean top net short-wave radiation flux, clear sky
-'Mean top net short-wave radiation flux, clear sky' = {
+'Time-mean top net short-wave radiation flux, clear sky' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 49 ;
 	}
-#Mean top net long-wave radiation flux, clear sky
+#Time-mean top net long-wave radiation flux, clear sky
-'Mean top net long-wave radiation flux, clear sky' = {
+'Time-mean top net long-wave radiation flux, clear sky' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean surface net short-wave radiation flux, clear sky
+#Time-mean surface net short-wave radiation flux, clear sky
-'Mean surface net short-wave radiation flux, clear sky' = {
+'Time-mean surface net short-wave radiation flux, clear sky' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 51 ;
 	}
-#Mean surface net long-wave radiation flux, clear sky
+#Time-mean surface net long-wave radiation flux, clear sky
-'Mean surface net long-wave radiation flux, clear sky' = {
+'Time-mean surface net long-wave radiation flux, clear sky' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 52 ;
 	}
-#Mean top downward short-wave radiation flux
+#Time mean top downward short-wave radiation flux
-'Mean top downward short-wave radiation flux' = {
+'Time mean top downward short-wave radiation flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 53 ;
 	}
-#Mean vertically integrated moisture divergence
+#Time-mean total column vertically-integrated moisture divergence flux
-'Mean vertically integrated moisture divergence' = {
+'Time-mean total column vertically-integrated moisture divergence flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 54 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
-'Mean total precipitation rate' = {
+'Time-mean total precipitation rate' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 55 ;
 	}
-#Mean convective snowfall rate
+#Time-mean convective snowfall rate water equivalent
-'Mean convective snowfall rate' = {
+'Time-mean convective snowfall rate water equivalent' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 56 ;
 	}
-#Mean large-scale snowfall rate
+#Time-mean large scale snowfall rate water equivalent
-'Mean large-scale snowfall rate' = {
+'Time-mean large scale snowfall rate water equivalent' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 57 ;
 	}
-#Mean surface direct short-wave radiation flux
+#Time-mean surface direct short-wave radiation flux
-'Mean surface direct short-wave radiation flux' = {
+'Time-mean surface direct short-wave radiation flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 58 ;
 	}
-#Mean surface direct short-wave radiation flux, clear sky
+#Time-mean surface direct short-wave radiation flux, clear sky
-'Mean surface direct short-wave radiation flux, clear sky' = {
+'Time-mean surface direct short-wave radiation flux, clear sky' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 59 ;
 	}
@@ -10514,38 +10514,38 @@
 	 table2Version = 235 ;
 	 indicatorOfParameter = 60 ;
 	}
-#Mean surface diffuse short-wave radiation flux, clear sky
+#Time-mean surface diffuse short-wave radiation flux, clear sky
-'Mean surface diffuse short-wave radiation flux, clear sky' = {
+'Time-mean surface diffuse short-wave radiation flux, clear sky' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 61 ;
 	}
-#Mean carbon dioxide net ecosystem exchange flux
+#Time-mean carbon dioxide net ecosystem exchange flux
-'Mean carbon dioxide net ecosystem exchange flux' = {
+'Time-mean carbon dioxide net ecosystem exchange flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 62 ;
 	}
-#Mean carbon dioxide gross primary production flux
+#Time-mean carbon dioxide gross primary production flux
-'Mean carbon dioxide gross primary production flux' = {
+'Time-mean carbon dioxide gross primary production flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 63 ;
 	}
-#Mean carbon dioxide ecosystem respiration flux
+#Time-mean carbon dioxide ecosystem respiration flux
-'Mean carbon dioxide ecosystem respiration flux' = {
+'Time-mean carbon dioxide ecosystem respiration flux' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 64 ;
 	}
-#Mean surface downward short-wave radiation flux, clear sky
+#Time-mean surface downward short-wave radiation flux, clear sky
-'Mean surface downward short-wave radiation flux, clear sky' = {
+'Time-mean surface downward short-wave radiation flux, clear sky' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 68 ;
 	}
-#Mean surface downward long-wave radiation flux, clear sky
+#Time-mean surface downward long-wave radiation flux, clear sky
-'Mean surface downward long-wave radiation flux, clear sky' = {
+'Time-mean surface downward long-wave radiation flux, clear sky' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 69 ;
 	}
-#Mean potential evaporation rate
+#Time-mean potential evaporation rate
-'Mean potential evaporation rate' = {
+'Time-mean potential evaporation rate' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 70 ;
 	}
@@ -14899,13 +14899,13 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 255 ;
 	}
-#Snow evaporation
+#Time-mean snow evaporation rate
-'Snow evaporation' = {
+'Time-mean snow evaporation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Snowmelt
+#Time-mean snowmelt rate
-'Snowmelt' = {
+'Time-mean snowmelt rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 45 ;
 	}
@@ -15069,13 +15069,13 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 255 ;
 	}
-#Snow evaporation anomaly
+#Time-mean snow evaporation anomalous rate of accumulation
-'Snow evaporation anomaly' = {
+'Time-mean snow evaporation anomalous rate of accumulation' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Snowmelt anomaly
+#Time-mean snowmelt anomalous rate of accumulation
-'Snowmelt anomaly' = {
+'Time-mean snowmelt anomalous rate of accumulation' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 45 ;
 	}
@@ -15174,8 +15174,8 @@
 	 table2Version = 173 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation anomalous rate of accumulation
+#Time-mean evaporation anomalous rate of accumulation
-'Evaporation anomalous rate of accumulation' = {
+'Time-mean evaporation anomalous rate of accumulation' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 182 ;
 	}
@@ -17419,13 +17419,13 @@
 	 table2Version = 228 ;
 	 indicatorOfParameter = 3 ;
 	}
-#Mean 2 metre temperature
+#Time-mean 2 metre temperature
-'Mean 2 metre temperature' = {
+'Time-mean 2 metre temperature' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 4 ;
 	}
-#Mean of 10 metre wind speed
+#Time-mean 10 metre wind speed
-'Mean of 10 metre wind speed' = {
+'Time-mean 10 metre wind speed' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 5 ;
 	}

definitions/grib1/localConcepts/ecmf/paramId.def

@@ -10309,202 +10309,202 @@
 	 table2Version = 230 ;
 	 indicatorOfParameter = 251 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 '235020' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 20 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 '235021' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 21 ;
 	}
-#Mean surface photosynthetically active radiation flux, clear sky
+#Time-mean surface photosynthetically active radiation flux, clear sky
 '235022' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 22 ;
 	}
-#Mean snow evaporation rate
+#Time-mean snow evaporation rate water equivalent
 '235023' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 23 ;
 	}
-#Mean snowmelt rate
+#Time-mean snow melt rate
 '235024' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 24 ;
 	}
-#Mean magnitude of turbulent surface stress
+#Time-mean magnitude of turbulent surface stress
 '235025' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 25 ;
 	}
-#Mean large-scale precipitation fraction
+#Time-mean large-scale precipitation fraction
 '235026' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 26 ;
 	}
-#Mean surface downward UV radiation flux
+#Time-mean surface downward UV radiation flux
 '235027' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 27 ;
 	}
-#Mean surface photosynthetically active radiation flux
+#Time-mean surface photosynthetically active radiation flux
 '235028' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 28 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 '235029' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 29 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 '235030' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 30 ;
 	}
-#Mean snowfall rate
+#Time-mean total snowfall rate water equivalent
 '235031' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 31 ;
 	}
-#Mean boundary layer dissipation
+#Time-mean boundary layer dissipation
 '235032' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 32 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 '235033' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 33 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 '235034' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 34 ;
 	}
-#Mean surface downward short-wave radiation flux
+#Time-mean surface downward short-wave radiation flux
 '235035' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 35 ;
 	}
-#Mean surface downward long-wave radiation flux
+#Time-mean surface downward long-wave radiation flux
 '235036' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 36 ;
 	}
-#Mean surface net short-wave radiation flux
+#Time-mean surface net short-wave radiation flux
 '235037' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 37 ;
 	}
-#Mean surface net long-wave radiation flux
+#Time-mean surface net long-wave radiation flux
 '235038' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 38 ;
 	}
-#Mean top net short-wave radiation flux
+#Time-mean top net short-wave radiation flux
 '235039' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 39 ;
 	}
-#Mean top net long-wave radiation flux
+#Time-mean top net long-wave radiation flux
 '235040' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 40 ;
 	}
-#Mean eastward turbulent surface stress
+#Time-mean eastward turbulent surface stress
 '235041' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 41 ;
 	}
-#Mean northward turbulent surface stress
+#Time-mean northward turbulent surface stress
 '235042' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 42 ;
 	}
-#Mean evaporation rate
+#Time-mean moisture flux
 '235043' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 43 ;
 	}
-#Sunshine duration fraction
+#Time-mean sunshine duration fraction
 '235044' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Mean eastward gravity wave surface stress
+#Time-mean eastward gravity wave surface stress
 '235045' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 45 ;
 	}
-#Mean northward gravity wave surface stress
+#Time-mean northward gravity wave surface stress
 '235046' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 46 ;
 	}
-#Mean gravity wave dissipation
+#Time-mean gravity wave dissipation
 '235047' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 47 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate water equivalent (surface plus subsurface)
 '235048' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 48 ;
 	}
-#Mean top net short-wave radiation flux, clear sky
+#Time-mean top net short-wave radiation flux, clear sky
 '235049' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 49 ;
 	}
-#Mean top net long-wave radiation flux, clear sky
+#Time-mean top net long-wave radiation flux, clear sky
 '235050' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean surface net short-wave radiation flux, clear sky
+#Time-mean surface net short-wave radiation flux, clear sky
 '235051' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 51 ;
 	}
-#Mean surface net long-wave radiation flux, clear sky
+#Time-mean surface net long-wave radiation flux, clear sky
 '235052' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 52 ;
 	}
-#Mean top downward short-wave radiation flux
+#Time mean top downward short-wave radiation flux
 '235053' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 53 ;
 	}
-#Mean vertically integrated moisture divergence
+#Time-mean total column vertically-integrated moisture divergence flux
 '235054' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 54 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '235055' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 55 ;
 	}
-#Mean convective snowfall rate
+#Time-mean convective snowfall rate water equivalent
 '235056' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 56 ;
 	}
-#Mean large-scale snowfall rate
+#Time-mean large scale snowfall rate water equivalent
 '235057' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 57 ;
 	}
-#Mean surface direct short-wave radiation flux
+#Time-mean surface direct short-wave radiation flux
 '235058' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 58 ;
 	}
-#Mean surface direct short-wave radiation flux, clear sky
+#Time-mean surface direct short-wave radiation flux, clear sky
 '235059' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 59 ;
@@ -10514,37 +10514,37 @@
 	 table2Version = 235 ;
 	 indicatorOfParameter = 60 ;
 	}
-#Mean surface diffuse short-wave radiation flux, clear sky
+#Time-mean surface diffuse short-wave radiation flux, clear sky
 '235061' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 61 ;
 	}
-#Mean carbon dioxide net ecosystem exchange flux
+#Time-mean carbon dioxide net ecosystem exchange flux
 '235062' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 62 ;
 	}
-#Mean carbon dioxide gross primary production flux
+#Time-mean carbon dioxide gross primary production flux
 '235063' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 63 ;
 	}
-#Mean carbon dioxide ecosystem respiration flux
+#Time-mean carbon dioxide ecosystem respiration flux
 '235064' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 64 ;
 	}
-#Mean surface downward short-wave radiation flux, clear sky
+#Time-mean surface downward short-wave radiation flux, clear sky
 '235068' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 68 ;
 	}
-#Mean surface downward long-wave radiation flux, clear sky
+#Time-mean surface downward long-wave radiation flux, clear sky
 '235069' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 69 ;
 	}
-#Mean potential evaporation rate
+#Time-mean potential evaporation rate
 '235070' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 70 ;
@@ -14899,12 +14899,12 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 255 ;
 	}
-#Snow evaporation
+#Time-mean snow evaporation rate
 '172044' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Snowmelt
+#Time-mean snowmelt rate
 '172045' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 45 ;
@@ -15069,12 +15069,12 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 255 ;
 	}
-#Snow evaporation anomaly
+#Time-mean snow evaporation anomalous rate of accumulation
 '173044' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Snowmelt anomaly
+#Time-mean snowmelt anomalous rate of accumulation
 '173045' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 45 ;
@@ -15174,7 +15174,7 @@
 	 table2Version = 173 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation anomalous rate of accumulation
+#Time-mean evaporation anomalous rate of accumulation
 '173182' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 182 ;
@@ -17419,12 +17419,12 @@
 	 table2Version = 228 ;
 	 indicatorOfParameter = 3 ;
 	}
-#Mean 2 metre temperature
+#Time-mean 2 metre temperature
 '228004' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 4 ;
 	}
-#Mean of 10 metre wind speed
+#Time-mean 10 metre wind speed
 '228005' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 5 ;

definitions/grib1/localConcepts/ecmf/shortName.def

@@ -10309,203 +10309,203 @@
 	 table2Version = 230 ;
 	 indicatorOfParameter = 251 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
-'msror' = {
+'avg_surfror' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 20 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
-'mssror' = {
+'avg_ssurfror' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 21 ;
 	}
-#Mean surface photosynthetically active radiation flux, clear sky
+#Time-mean surface photosynthetically active radiation flux, clear sky
-'msparfcs' = {
+'avg_parcsf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 22 ;
 	}
-#Mean snow evaporation rate
+#Time-mean snow evaporation rate water equivalent
-'mser' = {
+'avg_esrwe' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 23 ;
 	}
-#Mean snowmelt rate
+#Time-mean snow melt rate
-'msmr' = {
+'avg_smr' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 24 ;
 	}
-#Mean magnitude of turbulent surface stress
+#Time-mean magnitude of turbulent surface stress
-'mmtss' = {
+'avg_imagss' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 25 ;
 	}
-#Mean large-scale precipitation fraction
+#Time-mean large-scale precipitation fraction
-'mlspf' = {
+'avg_ilspf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 26 ;
 	}
-#Mean surface downward UV radiation flux
+#Time-mean surface downward UV radiation flux
-'msdwuvrf' = {
+'avg_sduvrf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 27 ;
 	}
-#Mean surface photosynthetically active radiation flux
+#Time-mean surface photosynthetically active radiation flux
-'msparf' = {
+'avg_sparf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 28 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
-'mlspr' = {
+'avg_lsprate' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 29 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
-'mcpr' = {
+'avg_cpr' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 30 ;
 	}
-#Mean snowfall rate
+#Time-mean total snowfall rate water equivalent
-'msr' = {
+'avg_tsrwe' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 31 ;
 	}
-#Mean boundary layer dissipation
+#Time-mean boundary layer dissipation
-'mbld' = {
+'avg_ibld' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 32 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
-'msshf' = {
+'avg_ishf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 33 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
-'mslhf' = {
+'avg_slhtf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 34 ;
 	}
-#Mean surface downward short-wave radiation flux
+#Time-mean surface downward short-wave radiation flux
-'msdwswrf' = {
+'avg_sdswrf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 35 ;
 	}
-#Mean surface downward long-wave radiation flux
+#Time-mean surface downward long-wave radiation flux
-'msdwlwrf' = {
+'avg_sdlwrf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 36 ;
 	}
-#Mean surface net short-wave radiation flux
+#Time-mean surface net short-wave radiation flux
-'msnswrf' = {
+'avg_snswrf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 37 ;
 	}
-#Mean surface net long-wave radiation flux
+#Time-mean surface net long-wave radiation flux
-'msnlwrf' = {
+'avg_snlwrf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 38 ;
 	}
-#Mean top net short-wave radiation flux
+#Time-mean top net short-wave radiation flux
-'mtnswrf' = {
+'avg_tnswrf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 39 ;
 	}
-#Mean top net long-wave radiation flux
+#Time-mean top net long-wave radiation flux
-'mtnlwrf' = {
+'avg_tnlwrf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 40 ;
 	}
-#Mean eastward turbulent surface stress
+#Time-mean eastward turbulent surface stress
-'metss' = {
+'avg_iews' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 41 ;
 	}
-#Mean northward turbulent surface stress
+#Time-mean northward turbulent surface stress
-'mntss' = {
+'avg_inss' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 42 ;
 	}
-#Mean evaporation rate
+#Time-mean moisture flux
-'mer' = {
+'avg_ie' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 43 ;
 	}
-#Sunshine duration fraction
+#Time-mean sunshine duration fraction
-'sdf' = {
+'avg_sdf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Mean eastward gravity wave surface stress
+#Time-mean eastward gravity wave surface stress
-'megwss' = {
+'avg_iegwss' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 45 ;
 	}
-#Mean northward gravity wave surface stress
+#Time-mean northward gravity wave surface stress
-'mngwss' = {
+'avg_ingwss' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 46 ;
 	}
-#Mean gravity wave dissipation
+#Time-mean gravity wave dissipation
-'mgwd' = {
+'avg_igwd' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 47 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate water equivalent (surface plus subsurface)
-'mror' = {
+'avg_rorwe' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 48 ;
 	}
-#Mean top net short-wave radiation flux, clear sky
+#Time-mean top net short-wave radiation flux, clear sky
-'mtnswrfcs' = {
+'avg_tnswrfcs' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 49 ;
 	}
-#Mean top net long-wave radiation flux, clear sky
+#Time-mean top net long-wave radiation flux, clear sky
-'mtnlwrfcs' = {
+'avg_tnlwrcs' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean surface net short-wave radiation flux, clear sky
+#Time-mean surface net short-wave radiation flux, clear sky
-'msnswrfcs' = {
+'avg_snswrfcs' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 51 ;
 	}
-#Mean surface net long-wave radiation flux, clear sky
+#Time-mean surface net long-wave radiation flux, clear sky
-'msnlwrfcs' = {
+'avg_snlwrcs' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 52 ;
 	}
-#Mean top downward short-wave radiation flux
+#Time mean top downward short-wave radiation flux
-'mtdwswrf' = {
+'avg_tdswrf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 53 ;
 	}
-#Mean vertically integrated moisture divergence
+#Time-mean total column vertically-integrated moisture divergence flux
-'mvimd' = {
+'avg_vimdf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 54 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
-'mtpr' = {
+'avg_tprate' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 55 ;
 	}
-#Mean convective snowfall rate
+#Time-mean convective snowfall rate water equivalent
-'mcsr' = {
+'avg_csfr' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 56 ;
 	}
-#Mean large-scale snowfall rate
+#Time-mean large scale snowfall rate water equivalent
-'mlssr' = {
+'avg_lssfr' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 57 ;
 	}
-#Mean surface direct short-wave radiation flux
+#Time-mean surface direct short-wave radiation flux
-'msdrswrf' = {
+'avg_sdirswrf' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 58 ;
 	}
-#Mean surface direct short-wave radiation flux, clear sky
+#Time-mean surface direct short-wave radiation flux, clear sky
-'msdrswrfcs' = {
+'avg_sdirswrfcs' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 59 ;
 	}
@@ -10514,38 +10514,38 @@
 	 table2Version = 235 ;
 	 indicatorOfParameter = 60 ;
 	}
-#Mean surface diffuse short-wave radiation flux, clear sky
+#Time-mean surface diffuse short-wave radiation flux, clear sky
-'msdfswrfcs' = {
+'avg_sdifswrfcs' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 61 ;
 	}
-#Mean carbon dioxide net ecosystem exchange flux
+#Time-mean carbon dioxide net ecosystem exchange flux
-'mcdneef' = {
+'avg_fco2nee' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 62 ;
 	}
-#Mean carbon dioxide gross primary production flux
+#Time-mean carbon dioxide gross primary production flux
-'mcdgppf' = {
+'avg_fco2gpp' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 63 ;
 	}
-#Mean carbon dioxide ecosystem respiration flux
+#Time-mean carbon dioxide ecosystem respiration flux
-'mcderf' = {
+'avg_fco2rec' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 64 ;
 	}
-#Mean surface downward short-wave radiation flux, clear sky
+#Time-mean surface downward short-wave radiation flux, clear sky
-'msdwswrfcs' = {
+'avg_sdswrfcs' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 68 ;
 	}
-#Mean surface downward long-wave radiation flux, clear sky
+#Time-mean surface downward long-wave radiation flux, clear sky
-'msdwlwrfcs' = {
+'avg_sdlwrfcs' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 69 ;
 	}
-#Mean potential evaporation rate
+#Time-mean potential evaporation rate
-'mper' = {
+'avg_pevr' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 70 ;
 	}
@@ -14899,12 +14899,12 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 255 ;
 	}
-#Snow evaporation
+#Time-mean snow evaporation rate
 'esrate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Snowmelt
+#Time-mean snowmelt rate
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 45 ;
@@ -15069,12 +15069,12 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 255 ;
 	}
-#Snow evaporation anomaly
+#Time-mean snow evaporation anomalous rate of accumulation
 '~' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Snowmelt anomaly
+#Time-mean snowmelt anomalous rate of accumulation
 '~' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 45 ;
@@ -15174,7 +15174,7 @@
 	 table2Version = 173 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation anomalous rate of accumulation
+#Time-mean evaporation anomalous rate of accumulation
 'evara' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 182 ;
@@ -17419,13 +17419,13 @@
 	 table2Version = 228 ;
 	 indicatorOfParameter = 3 ;
 	}
-#Mean 2 metre temperature
+#Time-mean 2 metre temperature
-'mean2t' = {
+'avg_2t' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 4 ;
 	}
-#Mean of 10 metre wind speed
+#Time-mean 10 metre wind speed
-'mean10ws' = {
+'avg_10ws' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 5 ;
 	}

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;}

definitions/grib1/localConcepts/ecmf/units.def

@@ -10309,202 +10309,202 @@
 	 table2Version = 230 ;
 	 indicatorOfParameter = 251 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 20 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 21 ;
 	}
-#Mean surface photosynthetically active radiation flux, clear sky
+#Time-mean surface photosynthetically active radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 22 ;
 	}
-#Mean snow evaporation rate
+#Time-mean snow evaporation rate water equivalent
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 23 ;
 	}
-#Mean snowmelt rate
+#Time-mean snow melt rate
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 24 ;
 	}
-#Mean magnitude of turbulent surface stress
+#Time-mean magnitude of turbulent surface stress
 'N m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 25 ;
 	}
-#Mean large-scale precipitation fraction
+#Time-mean large-scale precipitation fraction
 'Proportion' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 26 ;
 	}
-#Mean surface downward UV radiation flux
+#Time-mean surface downward UV radiation flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 27 ;
 	}
-#Mean surface photosynthetically active radiation flux
+#Time-mean surface photosynthetically active radiation flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 28 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 29 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 30 ;
 	}
-#Mean snowfall rate
+#Time-mean total snowfall rate water equivalent
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 31 ;
 	}
-#Mean boundary layer dissipation
+#Time-mean boundary layer dissipation
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 32 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 33 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 34 ;
 	}
-#Mean surface downward short-wave radiation flux
+#Time-mean surface downward short-wave radiation flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 35 ;
 	}
-#Mean surface downward long-wave radiation flux
+#Time-mean surface downward long-wave radiation flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 36 ;
 	}
-#Mean surface net short-wave radiation flux
+#Time-mean surface net short-wave radiation flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 37 ;
 	}
-#Mean surface net long-wave radiation flux
+#Time-mean surface net long-wave radiation flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 38 ;
 	}
-#Mean top net short-wave radiation flux
+#Time-mean top net short-wave radiation flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 39 ;
 	}
-#Mean top net long-wave radiation flux
+#Time-mean top net long-wave radiation flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 40 ;
 	}
-#Mean eastward turbulent surface stress
+#Time-mean eastward turbulent surface stress
 'N m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 41 ;
 	}
-#Mean northward turbulent surface stress
+#Time-mean northward turbulent surface stress
 'N m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 42 ;
 	}
-#Mean evaporation rate
+#Time-mean moisture flux
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 43 ;
 	}
-#Sunshine duration fraction
+#Time-mean sunshine duration fraction
 'Proportion' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Mean eastward gravity wave surface stress
+#Time-mean eastward gravity wave surface stress
 'N m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 45 ;
 	}
-#Mean northward gravity wave surface stress
+#Time-mean northward gravity wave surface stress
 'N m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 46 ;
 	}
-#Mean gravity wave dissipation
+#Time-mean gravity wave dissipation
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 47 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate water equivalent (surface plus subsurface)
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 48 ;
 	}
-#Mean top net short-wave radiation flux, clear sky
+#Time-mean top net short-wave radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 49 ;
 	}
-#Mean top net long-wave radiation flux, clear sky
+#Time-mean top net long-wave radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean surface net short-wave radiation flux, clear sky
+#Time-mean surface net short-wave radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 51 ;
 	}
-#Mean surface net long-wave radiation flux, clear sky
+#Time-mean surface net long-wave radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 52 ;
 	}
-#Mean top downward short-wave radiation flux
+#Time mean top downward short-wave radiation flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 53 ;
 	}
-#Mean vertically integrated moisture divergence
+#Time-mean total column vertically-integrated moisture divergence flux
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 54 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 55 ;
 	}
-#Mean convective snowfall rate
+#Time-mean convective snowfall rate water equivalent
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 56 ;
 	}
-#Mean large-scale snowfall rate
+#Time-mean large scale snowfall rate water equivalent
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 57 ;
 	}
-#Mean surface direct short-wave radiation flux
+#Time-mean surface direct short-wave radiation flux
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 58 ;
 	}
-#Mean surface direct short-wave radiation flux, clear sky
+#Time-mean surface direct short-wave radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 59 ;
@@ -10514,37 +10514,37 @@
 	 table2Version = 235 ;
 	 indicatorOfParameter = 60 ;
 	}
-#Mean surface diffuse short-wave radiation flux, clear sky
+#Time-mean surface diffuse short-wave radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 61 ;
 	}
-#Mean carbon dioxide net ecosystem exchange flux
+#Time-mean carbon dioxide net ecosystem exchange flux
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 62 ;
 	}
-#Mean carbon dioxide gross primary production flux
+#Time-mean carbon dioxide gross primary production flux
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 63 ;
 	}
-#Mean carbon dioxide ecosystem respiration flux
+#Time-mean carbon dioxide ecosystem respiration flux
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 64 ;
 	}
-#Mean surface downward short-wave radiation flux, clear sky
+#Time-mean surface downward short-wave radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 68 ;
 	}
-#Mean surface downward long-wave radiation flux, clear sky
+#Time-mean surface downward long-wave radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 69 ;
 	}
-#Mean potential evaporation rate
+#Time-mean potential evaporation rate
 'kg m**-2 s**-1' = {
 	 table2Version = 235 ;
 	 indicatorOfParameter = 70 ;
@@ -14899,12 +14899,12 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 255 ;
 	}
-#Snow evaporation
+#Time-mean snow evaporation rate
 'm of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Snowmelt
+#Time-mean snowmelt rate
 'm of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 45 ;
@@ -15069,12 +15069,12 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 255 ;
 	}
-#Snow evaporation anomaly
+#Time-mean snow evaporation anomalous rate of accumulation
 'm of water equivalent s**-1' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 44 ;
 	}
-#Snowmelt anomaly
+#Time-mean snowmelt anomalous rate of accumulation
 'm of water equivalent s**-1' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 45 ;
@@ -15174,7 +15174,7 @@
 	 table2Version = 173 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation anomalous rate of accumulation
+#Time-mean evaporation anomalous rate of accumulation
 'm of water equivalent s**-1' = {
 	 table2Version = 173 ;
 	 indicatorOfParameter = 182 ;
@@ -17419,12 +17419,12 @@
 	 table2Version = 228 ;
 	 indicatorOfParameter = 3 ;
 	}
-#Mean 2 metre temperature
+#Time-mean 2 metre temperature
 'K' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 4 ;
 	}
-#Mean of 10 metre wind speed
+#Time-mean 10 metre wind speed
 'm s**-1' = {
 	 table2Version = 228 ;
 	 indicatorOfParameter = 5 ;

definitions/grib1/local_no_mars.98.1.def

@@ -48,7 +48,7 @@ if (stepType is "instant" ) {
 			} else {
 				alias typeOfEnsembleForecast=three;
 			}
-			alias productDefinitionTemplateNumber=epsContinous;
+			alias productDefinitionTemplateNumber=epsContinuous;
 		} else {
 			alias productDefinitionTemplateNumber=eight;
 		}

definitions/grib1/mars_labeling.def

@@ -1,11 +1,10 @@
-codetable[1] marsClass   "mars/class.table" = "od"   : dump, string_type, lowercase;
+codetable[1] marsClass  "mars/class.table" = "od"    : dump, string_type, lowercase;
 codetable[1] marsType   "mars/type.table" = "an"     : dump, string_type, lowercase;
-codetable[2] marsStream "mars/stream.table" = "oper" : dump, string_type, lowercase ;
+codetable[2] marsStream "mars/stream.table" = "oper" : dump, string_type, lowercase;
 ksec1expver[4] experimentVersionNumber = "0001" : dump;
 
 #alias typeOfProcessedData=marsType;
 alias ls.dataType = marsType;
-
 alias mars.class  = marsClass;
 alias mars.type   = marsType;
 alias mars.stream = marsStream;

definitions/grib1/predefined_grid.def

@@ -24,9 +24,9 @@ constant dataRepresentationType  = 0;
 # (according to data representation type - octet 6 above)
 
 # grib 1 -> 2
-constant gridDefinitionTemplateNumber     = 0;
+constant gridDefinitionTemplateNumber = 0;
 
-# START 1/grid_definition.latitude_longitude_grid ----------------------------------------------------------------------
+# START 1/grid_definition.latitude_longitude_grid
 # GRID DEFINITION latitude/longitude grid (or equidistant cylindrical)
 
 alias numberOfPointsAlongAParallel=Ni;
@@ -122,6 +122,6 @@ constant tableReference = 0;
 
 #position offsetBeforeBitmap;
 # meta bitmap gds_not_present_bitmap( missingValue,numberOfValues,
-#                                     numberOfPoints,
+# numberOfPoints,
-#                                     latitudeOfFirstGridPoint,
+# latitudeOfFirstGridPoint,
-#                                     Ni,numberOfUnusedBitsAtEndOfSection3) : read_only;
+# Ni,numberOfUnusedBitsAtEndOfSection3) : read_only;

definitions/grib1/section.1.def

@@ -159,12 +159,6 @@ concept paramId (paramIdECMF,"paramId.def",conceptsDir2,conceptsDir1): long_type
 concept cfNameECMF(defaultName,"cfName.def",conceptsMasterDir,conceptsLocalDirECMF) : no_copy,read_only;
 concept cfName(cfNameECMF,"cfName.def",conceptsDir2,conceptsDir1) : dump,no_copy,read_only;
 
-#concept cfVarNameECMF(defaultName,"cfVarName.def",conceptsMasterDir,conceptsLocalDirECMF) : no_copy,read_only;
-#concept cfVarName(cfVarNameECMF,"cfVarName.def",conceptsDir2,conceptsDir1) : dump,no_copy,read_only;
-# See ECC-1886
-meta defaultCfVarName cf_var_name(shortName) : hidden, read_only;
-concept cfVarName(defaultCfVarName,"cfVarName.def",conceptsDir2,conceptsDir1) : dump,no_copy,read_only;
-
 concept unitsECMF(defaultName,"units.def",conceptsMasterDir,conceptsLocalDirECMF) : no_copy,read_only;
 concept units(unitsECMF,"units.def",conceptsDir2,conceptsDir1) : dump,no_copy,read_only;
 
@@ -297,6 +291,14 @@ section_padding section1Padding : read_only;
 
 concept shortNameECMF (defaultShortName,"shortName.def",conceptsMasterDir,conceptsLocalDirECMF) : no_copy;
 concept ls.shortName (shortNameECMF,"shortName.def",conceptsDir2,conceptsDir1) : no_copy,dump;
+
+#concept cfVarNameECMF(defaultName,"cfVarName.def",conceptsMasterDir,conceptsLocalDirECMF) : no_copy,read_only;
+#concept cfVarName(cfVarNameECMF,"cfVarName.def",conceptsDir2,conceptsDir1) : dump,no_copy,read_only;
+# See ECC-1886
+meta defaultCfVarName cf_var_name(shortName) : hidden, read_only;
+concept cfVarNameECMF(defaultCfVarName,"cfVarName.def",conceptsMasterDir,conceptsLocalDirECMF) : no_copy,read_only;
+concept cfVarName(cfVarNameECMF,"cfVarName.def",conceptsDir2,conceptsDir1) : dump,no_copy,read_only;
+
 meta ifsParam ifs_param(paramId,type);
 
 alias parameter.paramId=paramId;
@@ -332,3 +334,11 @@ meta md5Product md5(offsetSection1,section1Length,gridDefinition,section1Flags,d
 
 # ECC-1806
 concept_nofail paramIdForConversion(zero, "paramIdForConversion.def", conceptsDir2, conceptsDir1) : long_type,read_only;
+
+# ECC-1954
+if (productDefinitionTemplateNumber == 0 && defined(perturbationNumber) && defined(numberOfForecastsInEnsemble) && numberOfForecastsInEnsemble > 0) {
+  alias productDefinitionTemplateNumber = one; # ensemble instant
+}
+if (productDefinitionTemplateNumber == 8 && defined(perturbationNumber) && defined(numberOfForecastsInEnsemble) && numberOfForecastsInEnsemble > 0) {
+  alias productDefinitionTemplateNumber = eleven; # ensemble interval
+}

definitions/grib2/cfVarName.def

@@ -119,6 +119,34 @@
 	 scaleFactorOfLowerLimit = 0 ;
 	 probabilityType = 3 ;
 	}
+#Time-mean 2D wave spectra (single)
+'avg_2dfd' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 86 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-maximum 2D wave spectra (single)
+'max_2dfd' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 86 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-minimum 2D wave spectra (single)
+'min_2dfd' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 86 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-standard-deviation 2D wave spectra (single)
+'std_2dfd' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 86 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #2 metre specific humidity
 'sh2' = {
 	 discipline = 0 ;
@@ -245,6 +273,45 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean 10 metre wind direction
+'avg_10wdir' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean 2 metre relative humidity with respect to water
+'avg_2rhw' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 93 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-maximum sea ice area fraction
+'max_ci' = {
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 2 metre specific humidity
+'max_2sh' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
 #Time-maximum 2 metre relative humidity
 'max_2r' = {
 	 discipline = 0 ;
@@ -255,6 +322,85 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Time-maximum 10 metre U wind component
+'max_10u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre V wind component
+'max_10v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 2 metre dewpoint temperature
+'max_2d' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre wind speed
+'max_10si' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 10 metre wind direction
+'max_10wdir' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-maximum 2 metre relative humidity with respect to water
+'max_2rhw' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 93 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 2 ;
+	}
+#Time-minimum sea ice area fraction
+'min_ci' = {
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 2 metre specific humidity
+'min_2sh' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
 #Time-minimum 2 metre relative humidity
 'min_2r' = {
 	 discipline = 0 ;
@@ -265,6 +411,155 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 3 ;
 	}
+#Time-minimum 10 metre U wind component
+'min_10u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre V wind component
+'min_10v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 2 metre dewpoint temperature
+'min_2d' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre wind speed
+'min_10si' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 10 metre wind direction
+'min_10wdir' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-minimum 2 metre relative humidity with respect to water
+'min_2rhw' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 93 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 3 ;
+	}
+#Time-standard-deviation sea ice area fraction
+'std_ci' = {
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 2 metre specific humidity
+'std_2sh' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 typeOfSecondFixedSurface = 255 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre U wind component
+'std_10u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre V wind component
+'std_10v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 2 metre temperature
+'std_2t' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 2 metre dewpoint temperature
+'std_2d' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre wind speed
+'std_10si' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 10 metre wind direction
+'std_10wdir' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
+#Time-standard-deviation 2 metre relative humidity with respect to water
+'std_2rhw' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 93 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 6 ;
+	}
 #5-wave geopotential height
 'wavh5' = {
 	 discipline = 0 ;
@@ -407,8 +702,8 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 86 ;
 	}
-#Mean 2 metre temperature
+#Time-mean 2 metre temperature
-'mean2t' = {
+'avg_2t' = {
 	 discipline = 0 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 0 ;
@@ -417,8 +712,8 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean of 10 metre wind speed
+#Time-mean 10 metre wind speed
-'mean10ws' = {
+'avg_10ws' = {
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 1 ;

definitions/grib2/local/ecmf/section4_extras.def

@@ -5,7 +5,7 @@ if (centre is "ecmf" or datasetForLocal is "era6") {
  concept modelName(unknown, "modelNameConcept.def", conceptsMasterDir, conceptsLocalDirAll): no_copy, dump, read_only;
 
  if (modelName isnot "unknown") {
-    concept modelVersion(unknown, "modelVersionConcept_[modelName].def", conceptsMasterDir, conceptsLocalDirAll): no_copy, dump, read_only;
+    concept modelVersion(unknown, "modelVersionConcept.[modelName].def", conceptsMasterDir, conceptsLocalDirAll): no_copy, dump, read_only;
     # alias ls.model = modelName;
     # alias mars.model = modelName;
  }

definitions/grib2/localConcepts/ecmf/modelVersionConcept.IFS.def

@@ -0,0 +1,18 @@
+'cy50r3' = { generatingProcessIdentifier = 163; }
+'cy50r2' = { generatingProcessIdentifier = 162; }
+'cy50r1' = { generatingProcessIdentifier = 161; }
+'cy49r3' = { generatingProcessIdentifier = 160; }
+'cy49r2' = { generatingProcessIdentifier = 159; }
+'cy49r1' = { generatingProcessIdentifier = 158; }
+'cy48r3' = { generatingProcessIdentifier = 157; }
+'climatedt' = { generatingProcessIdentifier = 156; }
+'cy48r2' = { generatingProcessIdentifier = 155; }
+'cy48r1' = { generatingProcessIdentifier = 154; }
+'cy47r3' = { generatingProcessIdentifier = 153; }
+'cy47r2' = { generatingProcessIdentifier = 152; }
+'cy47r1' = { generatingProcessIdentifier = 151; }
+'cy46r1' = { generatingProcessIdentifier = 150; }
+'cy45r1' = { generatingProcessIdentifier = 149; }
+'cy43r3' = { generatingProcessIdentifier = 148; }
+'cy43r1' = { generatingProcessIdentifier = 147; }
+'cy41r2' = { generatingProcessIdentifier = 146; }

definitions/grib2/localConcepts/ecmf/modelVersionConcept_IFS.def

@@ -1,10 +0,0 @@
-'cy49r1' = { generatingProcessIdentifier = 155; } 
-'cy48r1' = { generatingProcessIdentifier = 154; }
-'cy47r3' = { generatingProcessIdentifier = 153; }
-'cy47r2' = { generatingProcessIdentifier = 152; }
-'cy47r1' = { generatingProcessIdentifier = 151; }
-'cy46r1' = { generatingProcessIdentifier = 150; }
-'cy45r1' = { generatingProcessIdentifier = 149; }
-'cy43r3' = { generatingProcessIdentifier = 148; }
-'cy43r1' = { generatingProcessIdentifier = 147; }
-'cy41r2' = { generatingProcessIdentifier = 146; }

definitions/grib2/localConcepts/ecmf/name.def

@@ -18650,14 +18650,14 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 255 ;
 	}
-#Snow evaporation
+#Time-mean snow evaporation rate
-'Snow evaporation' = {
+'Time-mean snow evaporation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 44 ;
 	}
-#Snowmelt
+#Time-mean snowmelt rate
-'Snowmelt' = {
+'Time-mean snowmelt rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
@@ -18746,14 +18746,14 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 255 ;
 	}
-#Snow evaporation anomaly
+#Time-mean snow evaporation anomalous rate of accumulation
-'Snow evaporation anomaly' = {
+'Time-mean snow evaporation anomalous rate of accumulation' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
 	 parameterNumber = 44 ;
 	}
-#Snowmelt anomaly
+#Time-mean snowmelt anomalous rate of accumulation
-'Snowmelt anomaly' = {
+'Time-mean snowmelt anomalous rate of accumulation' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
 	 parameterNumber = 45 ;
@@ -18872,8 +18872,8 @@
 	 parameterCategory = 173 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation anomalous rate of accumulation
+#Time-mean evaporation anomalous rate of accumulation
-'Evaporation anomalous rate of accumulation' = {
+'Time-mean evaporation anomalous rate of accumulation' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
 	 parameterNumber = 182 ;

definitions/grib2/localConcepts/ecmf/paramId.def

@@ -18650,13 +18650,13 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 255 ;
 	}
-#Snow evaporation
+#Time-mean snow evaporation rate
 '172044' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 44 ;
 	}
-#Snowmelt
+#Time-mean snowmelt rate
 '172045' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
@@ -18746,13 +18746,13 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 255 ;
 	}
-#Snow evaporation anomaly
+#Time-mean snow evaporation anomalous rate of accumulation
 '173044' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
 	 parameterNumber = 44 ;
 	}
-#Snowmelt anomaly
+#Time-mean snowmelt anomalous rate of accumulation
 '173045' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
@@ -18872,7 +18872,7 @@
 	 parameterCategory = 173 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation anomalous rate of accumulation
+#Time-mean evaporation anomalous rate of accumulation
 '173182' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;

definitions/grib2/localConcepts/ecmf/shortName.def

@@ -18650,13 +18650,13 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 255 ;
 	}
-#Snow evaporation
+#Time-mean snow evaporation rate
 'esrate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 44 ;
 	}
-#Snowmelt
+#Time-mean snowmelt rate
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
@@ -18746,13 +18746,13 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 255 ;
 	}
-#Snow evaporation anomaly
+#Time-mean snow evaporation anomalous rate of accumulation
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
 	 parameterNumber = 44 ;
 	}
-#Snowmelt anomaly
+#Time-mean snowmelt anomalous rate of accumulation
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
@@ -18872,7 +18872,7 @@
 	 parameterCategory = 173 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation anomalous rate of accumulation
+#Time-mean evaporation anomalous rate of accumulation
 'evara' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;

definitions/grib2/localConcepts/ecmf/units.def

@@ -18650,13 +18650,13 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 255 ;
 	}
-#Snow evaporation
+#Time-mean snow evaporation rate
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 44 ;
 	}
-#Snowmelt
+#Time-mean snowmelt rate
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
@@ -18746,13 +18746,13 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 255 ;
 	}
-#Snow evaporation anomaly
+#Time-mean snow evaporation anomalous rate of accumulation
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
 	 parameterNumber = 44 ;
 	}
-#Snowmelt anomaly
+#Time-mean snowmelt anomalous rate of accumulation
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;
@@ -18872,7 +18872,7 @@
 	 parameterCategory = 173 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation anomalous rate of accumulation
+#Time-mean evaporation anomalous rate of accumulation
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 173 ;

definitions/grib2/localConcepts/ecmf/unstructuredGridType.def

@@ -8,3 +8,4 @@
 'eORCA12'   = { numberOfGridUsed = 7; }
 'CORE2'     = { numberOfGridUsed = 8; }
 'NG5'       = { numberOfGridUsed = 9; }
+'DART'      = { numberOfGridUsed = 10; }

definitions/grib2/localConcepts/era6/name.def

@@ -426,30 +426,70 @@
 	 constituentType = 0 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Mean carbon dioxide net ecosystem exchange flux
+#Time-mean carbon dioxide net ecosystem exchange flux
-'Mean carbon dioxide net ecosystem exchange flux' = {
+'Time-mean carbon dioxide net ecosystem exchange flux' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 59 ;
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean carbon dioxide gross primary production flux
+#Time-mean carbon dioxide gross primary production flux
-'Mean carbon dioxide gross primary production flux' = {
+'Time-mean carbon dioxide gross primary production flux' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 60 ;
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean carbon dioxide ecosystem respiration flux
+#Time-mean carbon dioxide ecosystem respiration flux
-'Mean carbon dioxide ecosystem respiration flux' = {
+'Time-mean carbon dioxide ecosystem respiration flux' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 61 ;
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean U component of wind
+'Time-mean U component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'Time-mean U component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'Time-mean V component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'Time-mean V component of wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean logarithm of surface pressure
 'Time-mean logarithm of surface pressure' = {
 	 discipline = 0 ;

definitions/grib2/localConcepts/era6/paramId.def

@@ -426,7 +426,7 @@
 	 constituentType = 0 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Mean carbon dioxide net ecosystem exchange flux
+#Time-mean carbon dioxide net ecosystem exchange flux
 '235062' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -434,7 +434,7 @@
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean carbon dioxide gross primary production flux
+#Time-mean carbon dioxide gross primary production flux
 '235063' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -442,7 +442,7 @@
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean carbon dioxide ecosystem respiration flux
+#Time-mean carbon dioxide ecosystem respiration flux
 '235064' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -450,6 +450,46 @@
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean U component of wind
+'235131' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'235131' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'235132' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'235132' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean logarithm of surface pressure
 '235152' = {
 	 discipline = 0 ;

definitions/grib2/localConcepts/era6/shortName.def

@@ -426,30 +426,70 @@
 	 constituentType = 0 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Mean carbon dioxide net ecosystem exchange flux
+#Time-mean carbon dioxide net ecosystem exchange flux
-'mcdneef' = {
+'avg_fco2nee' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 59 ;
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean carbon dioxide gross primary production flux
+#Time-mean carbon dioxide gross primary production flux
-'mcdgppf' = {
+'avg_fco2gpp' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 60 ;
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean carbon dioxide ecosystem respiration flux
+#Time-mean carbon dioxide ecosystem respiration flux
-'mcderf' = {
+'avg_fco2rec' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 61 ;
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean U component of wind
+'avg_u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'avg_u' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'avg_v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'avg_v' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean logarithm of surface pressure
 'avg_lnsp' = {
 	 discipline = 0 ;

definitions/grib2/localConcepts/era6/units.def

@@ -426,7 +426,7 @@
 	 constituentType = 0 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Mean carbon dioxide net ecosystem exchange flux
+#Time-mean carbon dioxide net ecosystem exchange flux
 'kg m**-2 s**-1' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -434,7 +434,7 @@
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean carbon dioxide gross primary production flux
+#Time-mean carbon dioxide gross primary production flux
 'kg m**-2 s**-1' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -442,7 +442,7 @@
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean carbon dioxide ecosystem respiration flux
+#Time-mean carbon dioxide ecosystem respiration flux
 'kg m**-2 s**-1' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -450,6 +450,46 @@
 	 constituentType = 3 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Time-mean U component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean U component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Time-mean V component of wind
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-mean logarithm of surface pressure
 'Numeric' = {
 	 discipline = 0 ;

definitions/grib2/localConcepts/s2s/name.def

@@ -29,6 +29,15 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Convective available potential energy
+'Convective available potential energy' = {
+	 discipline = 0 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Maximum temperature at 2 metres in the last 6 hours
 'Maximum temperature at 2 metres in the last 6 hours' = {
 	 discipline = 0 ;
@@ -173,6 +182,13 @@
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow albedo
+'Snow albedo' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 19 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Soil moisture top 20 cm
 'Soil moisture top 20 cm' = {
 	 discipline = 2 ;
@@ -299,4 +315,13 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 60 ;
 	 typeOfStatisticalProcessing = 0 ;
+	}
+#Total Cloud Cover
+'Total Cloud Cover' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
 }

definitions/grib2/localConcepts/s2s/paramId.def

@@ -29,6 +29,15 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Convective available potential energy
+'59' = {
+	 discipline = 0 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Maximum temperature at 2 metres in the last 6 hours
 '121' = {
 	 discipline = 0 ;
@@ -173,6 +182,13 @@
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow albedo
+'228032' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 19 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Soil moisture top 20 cm
 '228086' = {
 	 discipline = 2 ;
@@ -299,4 +315,13 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 60 ;
 	 typeOfStatisticalProcessing = 0 ;
+	}
+#Total Cloud Cover
+'228164' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
 }

definitions/grib2/localConcepts/s2s/shortName.def

@@ -29,6 +29,15 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Convective available potential energy
+'cape' = {
+	 discipline = 0 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Maximum temperature at 2 metres in the last 6 hours
 'mx2t6' = {
 	 discipline = 0 ;
@@ -173,6 +182,13 @@
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow albedo
+'asn' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 19 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Soil moisture top 20 cm
 'sm20' = {
 	 discipline = 2 ;
@@ -299,4 +315,13 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 60 ;
 	 typeOfStatisticalProcessing = 0 ;
+	}
+#Total Cloud Cover
+'tcc' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
 }

definitions/grib2/localConcepts/s2s/units.def

@@ -29,6 +29,15 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Convective available potential energy
+'J kg**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 7 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Maximum temperature at 2 metres in the last 6 hours
 'K' = {
 	 discipline = 0 ;
@@ -173,6 +182,13 @@
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow albedo
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 19 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Soil moisture top 20 cm
 'kg m**-3' = {
 	 discipline = 2 ;
@@ -299,4 +315,13 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 60 ;
 	 typeOfStatisticalProcessing = 0 ;
+	}
+#Total Cloud Cover
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
 }

definitions/grib2/localConcepts/uerra/cfName.def

@@ -80,6 +80,13 @@
 	 typeOfFirstFixedSurface = 8 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Forecast albedo
+'surface_albedo' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Sea-ice thickness
 'sea_ice_thickness' = {
 	 discipline = 10 ;

definitions/grib2/localConcepts/uerra/cfVarName.def

@@ -184,4 +184,14 @@
 	 scaledValueOfFirstFixedSurface = 2 ;
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 0 ;
+	}
+#10 metre wind direction
+'wdir10' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
 }

definitions/grib2/localConcepts/uerra/name.def

@@ -356,6 +356,27 @@
 	 parameterNumber = 84 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Low cloud cover
+'Low cloud cover' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Medium cloud cover
+'Medium cloud cover' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 4 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#High cloud cover
+'High cloud cover' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 5 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #2 metre specific humidity
 '2 metre specific humidity' = {
 	 discipline = 0 ;
@@ -367,6 +388,13 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow albedo
+'Snow albedo' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 19 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Total column vertically-integrated graupel (snow pellets)
 'Total column vertically-integrated graupel (snow pellets)' = {
 	 discipline = 0 ;
@@ -470,6 +498,16 @@
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 24 ;
 	}
+#10 metre wind direction
+'10 metre wind direction' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-integrated surface direct short wave radiation flux
 'Time-integrated surface direct short wave radiation flux' = {
 	 discipline = 0 ;
@@ -501,6 +539,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Forecast albedo
+'Forecast albedo' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Sea ice surface temperature
 'Sea ice surface temperature' = {
 	 discipline = 10 ;
@@ -525,6 +570,20 @@
 	 scaledValueOfSecondFixedSurface = missing() ;
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	}
+#Visibility
+'Visibility' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Wind direction
+'Wind direction' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Snowmelt
 'Snowmelt' = {
 	 discipline = 0 ;
@@ -549,4 +608,13 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 60 ;
 	 typeOfStatisticalProcessing = 0 ;
+	}
+#Total Cloud Cover
+'Total Cloud Cover' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
 }

definitions/grib2/localConcepts/uerra/paramId.def

@@ -356,6 +356,27 @@
 	 parameterNumber = 84 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Low cloud cover
+'3073' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Medium cloud cover
+'3074' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 4 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#High cloud cover
+'3075' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 5 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #2 metre specific humidity
 '174096' = {
 	 discipline = 0 ;
@@ -367,6 +388,13 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow albedo
+'228032' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 19 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Total column vertically-integrated graupel (snow pellets)
 '260001' = {
 	 discipline = 0 ;
@@ -470,6 +498,16 @@
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 24 ;
 	}
+#10 metre wind direction
+'260260' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-integrated surface direct short wave radiation flux
 '260264' = {
 	 discipline = 0 ;
@@ -501,6 +539,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Forecast albedo
+'260509' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Sea ice surface temperature
 '260649' = {
 	 discipline = 10 ;
@@ -525,6 +570,20 @@
 	 scaledValueOfSecondFixedSurface = missing() ;
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	}
+#Visibility
+'3020' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Wind direction
+'3031' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Snowmelt
 '3099' = {
 	 discipline = 0 ;
@@ -549,4 +608,13 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 60 ;
 	 typeOfStatisticalProcessing = 0 ;
+	}
+#Total Cloud Cover
+'228164' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
 }

definitions/grib2/localConcepts/uerra/shortName.def

@@ -356,6 +356,27 @@
 	 parameterNumber = 84 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Low cloud cover
+'lcc' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Medium cloud cover
+'mcc' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 4 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#High cloud cover
+'hcc' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 5 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #2 metre specific humidity
 '2sh' = {
 	 discipline = 0 ;
@@ -367,6 +388,13 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow albedo
+'asn' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 19 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Total column vertically-integrated graupel (snow pellets)
 'tcolg' = {
 	 discipline = 0 ;
@@ -470,6 +498,16 @@
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 24 ;
 	}
+#10 metre wind direction
+'10wdir' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-integrated surface direct short wave radiation flux
 'tidirswrf' = {
 	 discipline = 0 ;
@@ -501,6 +539,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Forecast albedo
+'al' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Sea ice surface temperature
 'sist' = {
 	 discipline = 10 ;
@@ -525,6 +570,20 @@
 	 scaledValueOfSecondFixedSurface = missing() ;
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	}
+#Visibility
+'vis' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Wind direction
+'wdir' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Snowmelt
 'snom' = {
 	 discipline = 0 ;
@@ -549,4 +608,13 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 60 ;
 	 typeOfStatisticalProcessing = 0 ;
+	}
+#Total Cloud Cover
+'tcc' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
 }

definitions/grib2/localConcepts/uerra/units.def

@@ -356,6 +356,27 @@
 	 parameterNumber = 84 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Low cloud cover
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 3 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Medium cloud cover
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 4 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#High cloud cover
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 5 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #2 metre specific humidity
 'kg kg**-1' = {
 	 discipline = 0 ;
@@ -367,6 +388,13 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
+#Snow albedo
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 19 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Total column vertically-integrated graupel (snow pellets)
 'kg m**-2' = {
 	 discipline = 0 ;
@@ -470,6 +498,16 @@
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 24 ;
 	}
+#10 metre wind direction
+'Degree true' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Time-integrated surface direct short wave radiation flux
 'J m**-2' = {
 	 discipline = 0 ;
@@ -501,6 +539,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Forecast albedo
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Sea ice surface temperature
 'K' = {
 	 discipline = 10 ;
@@ -525,6 +570,20 @@
 	 scaledValueOfSecondFixedSurface = missing() ;
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	}
+#Visibility
+'m' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
+#Wind direction
+'Degree true' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
+	}
 #Snowmelt
 'kg m**-2' = {
 	 discipline = 0 ;
@@ -549,4 +608,13 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 60 ;
 	 typeOfStatisticalProcessing = 0 ;
+	}
+#Total Cloud Cover
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 0 ;
 }

definitions/grib2/marsLevtypeConcept.def

@@ -1,70 +1,70 @@
 # Concept marsLevtype
-'sfc'  = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=8;}
+'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=8;}
-'o2d'  = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=9;}
+'o2d' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=9;}
-'sfc'  = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=162;}
+'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=162;}
-'sfc'  = {typeOfFirstFixedSurface=2; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=2; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=7; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=7; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=8; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=8; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=17; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=17; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=18; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=18; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=20; scaleFactorOfFirstFixedSurface=-2;
+'sfc' = {typeOfFirstFixedSurface=19; typeOfSecondFixedSurface=255;}
-          scaledValueOfFirstFixedSurface=29315; typeOfSecondFixedSurface=255;}
+'o2d' = {discipline=10; typeOfFirstFixedSurface=20; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=20; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=20; typeOfSecondFixedSurface=255;}
-'pl'   = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=255;}
+'pl'  = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=255;}
-'pl'   = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=100;}
+'pl'  = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=100;}
-'sfc'  = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=100;
+'sfc' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=100;
-          scaleFactorOfSecondFixedSurface=0; scaledValueOfSecondFixedSurface=80000;}
+         scaleFactorOfSecondFixedSurface=0; scaledValueOfSecondFixedSurface=80000;}
-'sfc'  = {typeOfFirstFixedSurface=100; scaleFactorOfFirstFixedSurface=0; scaledValueOfFirstFixedSurface=80000;
+'sfc' = {typeOfFirstFixedSurface=100; scaleFactorOfFirstFixedSurface=0; scaledValueOfFirstFixedSurface=80000;
-          typeOfSecondFixedSurface=100; scaleFactorOfSecondFixedSurface=0; scaledValueOfSecondFixedSurface=45000;}
+         typeOfSecondFixedSurface=100; scaleFactorOfSecondFixedSurface=0; scaledValueOfSecondFixedSurface=45000;}
-'sfc'  = {typeOfFirstFixedSurface=100; scaleFactorOfFirstFixedSurface=0;
+'sfc' = {typeOfFirstFixedSurface=100; scaleFactorOfFirstFixedSurface=0;
-          scaledValueOfFirstFixedSurface=45000; typeOfSecondFixedSurface=8;}
+         scaledValueOfFirstFixedSurface=45000; typeOfSecondFixedSurface=8;}
-'sfc'  = {typeOfFirstFixedSurface=101; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=101; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=102; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=102; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=103;}
+'sfc' = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=103;}
-'ml'   = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=255;}
+'ml'  = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=255;}
-'ml'   = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=105;}
+'ml'  = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=105;}
-'sfc'  = {typeOfFirstFixedSurface=106; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=106; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=106;typeOfSecondFixedSurface=106;}
+'sfc' = {typeOfFirstFixedSurface=106;typeOfSecondFixedSurface=106;}
-'pt'   = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=255;}
+'pt'  = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=255;}
-'pt'   = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=107;}
+'pt'  = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=107;}
-'pv'   = {typeOfFirstFixedSurface=109; typeOfSecondFixedSurface=255;}
+'pv'  = {typeOfFirstFixedSurface=109; typeOfSecondFixedSurface=255;}
-'sol'  = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=255;}
-'sol'  = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=114;}
+'sol' = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=114;}
-'hhl'  = {typeOfFirstFixedSurface=118; typeOfSecondFixedSurface=255;}
+'hhl' = {typeOfFirstFixedSurface=118; typeOfSecondFixedSurface=255;}
-'hpl'  = {typeOfFirstFixedSurface=119; typeOfSecondFixedSurface=255;}
+'hpl' = {typeOfFirstFixedSurface=119; typeOfSecondFixedSurface=255;}
-'sol'  = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=255;}
-'sol'  = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=151;}
+'sol' = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=151;}
-'sol'  = {typeOfFirstFixedSurface=152; typeOfSecondFixedSurface=255;}
+'sol' = {typeOfFirstFixedSurface=152; typeOfSecondFixedSurface=255;}
-'sol'  = {typeOfFirstFixedSurface=152; typeOfSecondFixedSurface=152;}
+'sol' = {typeOfFirstFixedSurface=152; typeOfSecondFixedSurface=152;}
-'o2d'  = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=160; scaleFactorOfFirstFixedSurface=0;
+'o2d' = {typeOfFirstFixedSurface=160; scaleFactorOfFirstFixedSurface=0;
-          scaledValueOfFirstFixedSurface=0; typeOfSecondFixedSurface=255;}
+         scaledValueOfFirstFixedSurface=0; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=160;}
+'o2d' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=160;}
-'o2d'  = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=9;}
+'o2d' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=9;}
-'o2d'  = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=20;
+'o2d' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=20;
-          scaledValueOfFirstFixedSurface=0; scaleFactorOfFirstFixedSurface=0;}
+         scaledValueOfFirstFixedSurface=0; scaleFactorOfFirstFixedSurface=0;}
-'sfc'  = {typeOfFirstFixedSurface=162; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=162; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=166; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=166; typeOfSecondFixedSurface=255;}
-'o3d'  = {typeOfFirstFixedSurface=168; typeOfSecondFixedSurface=255;}
+'o3d' = {typeOfFirstFixedSurface=168; typeOfSecondFixedSurface=255;}
-'o3d'  = {typeOfFirstFixedSurface=168; typeOfSecondFixedSurface=168;}
+'o3d' = {typeOfFirstFixedSurface=168; typeOfSecondFixedSurface=168;}
-'o2d'  = {typeOfFirstFixedSurface=169; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=169; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=170; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=170; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=171; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=171; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=173; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=173; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=173; typeOfSecondFixedSurface=175;}
+'o2d' = {typeOfFirstFixedSurface=173; typeOfSecondFixedSurface=175;}
-'o2d'  = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=255;}
-'sfc'  = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=255; discipline=1;}
+'sfc' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=255; discipline=1;}
-'o2d'  = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=176; typeOfSecondFixedSurface=255;}
+'o2d' = {typeOfFirstFixedSurface=176; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=160;
+'o2d' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=160;
-          scaleFactorOfSecondFixedSurface=0; scaledValueOfSecondFixedSurface=0;}
+         scaleFactorOfSecondFixedSurface=0; scaledValueOfSecondFixedSurface=0;}
-'o2d'  = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=176;}
+'o2d' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=176;}
-'sfc'  = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=176; discipline=1;}
+'sfc' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=176; discipline=1;}
-'o2d'  = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=176;}
+'o2d' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=176;}
-'sfc'  = {typeOfFirstFixedSurface=177; typeOfSecondFixedSurface=255;}
+'sfc' = {typeOfFirstFixedSurface=177; typeOfSecondFixedSurface=255;}
-'o2d'  = {typeOfFirstFixedSurface=188; typeOfSecondFixedSurface=189;}
+'o2d' = {typeOfFirstFixedSurface=188; typeOfSecondFixedSurface=189;}
 
 'sfc' = {typeOfFirstFixedSurface=5; typeOfSecondFixedSurface=255;}
 'sfc' = {typeOfFirstFixedSurface=14; typeOfSecondFixedSurface=255;}

definitions/grib2/mars_labeling.def

@@ -1,39 +1,42 @@
 # (C) Copyright 2005- ECMWF.
 
-codetable[2] marsClass   "mars/class.table" = "od" : dump,string_type,lowercase;
+codetable[2] marsClass  "mars/class.table" = "od" : dump,string_type,lowercase;
 codetable[2] marsType   "mars/type.table" = "an"  : dump,string_type,no_fail,lowercase;
-codetable[2] marsStream "mars/stream.table" = "oper" : dump,string_type,lowercase ;
+codetable[2] marsStream "mars/stream.table" = "oper" : dump,string_type,lowercase;
 ksec1expver[4] experimentVersionNumber = "0001" : dump;
 
-meta class g2_mars_labeling(0,marsClass,
+meta class g2_mars_labeling(
-                            marsType,
+    0,marsClass,
-                            marsStream,
+    marsType,
-                            experimentVersionNumber,
+    marsStream,
-                            typeOfProcessedData,
+    experimentVersionNumber,
-                            productDefinitionTemplateNumber,
+    typeOfProcessedData,
-                            stepType,
+    productDefinitionTemplateNumber,
-                            derivedForecast,
+    stepType,
-                            typeOfGeneratingProcess);
+    derivedForecast,
+    typeOfGeneratingProcess);
 
-meta type g2_mars_labeling(1,marsClass,
+meta type g2_mars_labeling(
-                           marsType,
+    1,marsClass,
-                           marsStream,
+    marsType,
-                           experimentVersionNumber,
+    marsStream,
-                           typeOfProcessedData,
+    experimentVersionNumber,
-                           productDefinitionTemplateNumber,
+    typeOfProcessedData,
-                           stepType,
+    productDefinitionTemplateNumber,
-                           derivedForecast,
+    stepType,
-                           typeOfGeneratingProcess);
+    derivedForecast,
+    typeOfGeneratingProcess);
 
-meta stream g2_mars_labeling(2,marsClass,
+meta stream g2_mars_labeling(
-                             marsType,
+    2,marsClass,
-                             marsStream,
+    marsType,
-                             experimentVersionNumber,
+    marsStream,
-                             typeOfProcessedData,
+    experimentVersionNumber,
-                             productDefinitionTemplateNumber,
+    typeOfProcessedData,
-                             stepType,
+    productDefinitionTemplateNumber,
-                             derivedForecast,
+    stepType,
-                             typeOfGeneratingProcess);
+    derivedForecast,
+    typeOfGeneratingProcess);
 
 alias ls.dataType = marsType;
 
@@ -41,5 +44,4 @@ alias mars.class  = class;
 alias mars.type   = type;
 alias mars.stream = stream;
 alias mars.expver = experimentVersionNumber;
-
+alias mars.domain = globalDomain; # For now...
-alias    mars.domain  =  globalDomain; # For now...

definitions/grib2/name.legacy.def

@@ -1,188 +1,249 @@
-#Volumetric soil moisture content
+# Automatically generated by ./create_def.pl, do not edit
-'Volumetric soil moisture content' = {
-  discipline = 2 ;
-  parameterCategory = 0 ;
-  parameterNumber = 9 ;
- }
-#Upper layer soil temperature
-'Upper layer soil temperature' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 1 ;
- }
-#Upper layer soil moisture
-'Upper layer soil moisture' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 2 ;
- }
-#Lower layer soil moisture
-'Lower layer soil moisture' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 3 ;
- }
-#Bottom layer soil temperature
-'Bottom layer soil temperature' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 4 ;
- }
-#Liquid volumetric soil moisture (non-frozen)
-'Liquid volumetric soil moisture (non-frozen)' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 5 ;
- }
-#Transpiration stress-onset (soil moisture)
-'Transpiration stress-onset (soil moisture)' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 7 ;
- }
-#Direct evaporation cease (soil moisture)
-'Direct evaporation cease (soil moisture)' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 8 ;
- }
-#Soil porosity
-'Soil porosity' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 9 ;
- }
 #Instantaneous eastward turbulent surface stress
 'Instantaneous eastward turbulent surface stress' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 2 ;
+	 parameterCategory = 2 ;
- parameterNumber = 38 ;
+	 parameterNumber = 38 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
-}
+	}
 #Instantaneous northward turbulent surface stress
 'Instantaneous northward turbulent surface stress' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 2 ;
+	 parameterCategory = 2 ;
- parameterNumber = 37 ;
+	 parameterNumber = 37 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
-}
+	}
+#Minimum dew point depression
+'Minimum dew point depression' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 14 ;
+	}
+#Maximum relative humidity
+'Maximum relative humidity' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 27 ;
+	}
+#Maximum absolute humidity
+'Maximum absolute humidity' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 28 ;
+	}
+#Maximum wind speed
+'Maximum wind speed' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 21 ;
+	}
+#Net long wave radiation flux (surface)
+'Net long wave radiation flux (surface)' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 0 ;
+	}
+#Net long wave radiation flux (top of atmosphere)
+'Net long wave radiation flux (top of atmosphere)' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 1 ;
+	}
+#Maximum snow albedo
+'Maximum snow albedo' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 17 ;
+	}
+#Volumetric soil moisture content
+'Volumetric soil moisture content' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 9 ;
+	}
+#Upper layer soil temperature
+'Upper layer soil temperature' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 1 ;
+	}
+#Upper layer soil moisture
+'Upper layer soil moisture' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 2 ;
+	}
+#Lower layer soil moisture
+'Lower layer soil moisture' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 3 ;
+	}
+#Bottom layer soil temperature
+'Bottom layer soil temperature' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 4 ;
+	}
+#Liquid volumetric soil moisture (non-frozen)
+'Liquid volumetric soil moisture (non-frozen)' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 5 ;
+	}
+#Transpiration stress-onset (soil moisture)
+'Transpiration stress-onset (soil moisture)' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 7 ;
+	}
+#Direct evaporation cease (soil moisture)
+'Direct evaporation cease (soil moisture)' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 8 ;
+	}
+#Soil porosity
+'Soil porosity' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 9 ;
+	}
 #Evaporation in the last 6 hours
 'Evaporation in the last 6 hours' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 1 ;
+	 parameterCategory = 1 ;
- parameterNumber = 79 ;
+	 parameterNumber = 79 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 6 ;
+	 lengthOfTimeRange = 6 ;
-}
+	}
 #Time-mean evapotranspiration rate in the last 24h
 'Time-mean evapotranspiration rate in the last 24h' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 39 ;
+	 parameterNumber = 39 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated potential evapotranspiration rate in the last 24h
 'Time-integrated potential evapotranspiration rate in the last 24h' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 40 ;
+	 parameterNumber = 40 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean potential evapotranspiration rate in the last 24h
 'Time-mean potential evapotranspiration rate in the last 24h' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 40 ;
+	 parameterNumber = 40 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean volumetric soil moisture
 'Time-mean volumetric soil moisture' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 25 ;
+	 parameterNumber = 25 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated water runoff and drainage rate in the last 24h
 'Time-integrated water runoff and drainage rate in the last 24h' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 42 ;
+	 parameterNumber = 42 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean water runoff and drainage rate in the last 24h
 'Time-mean water runoff and drainage rate in the last 24h' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 42 ;
+	 parameterNumber = 42 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean snow depth water equivalent
 'Time-mean snow depth water equivalent' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 1 ;
+	 parameterCategory = 1 ;
- parameterNumber = 60 ;
+	 parameterNumber = 60 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean skin temperature
 'Time-mean skin temperature' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 17 ;
+	 parameterNumber = 17 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated snow melt rate in the last 24h
 'Time-integrated snow melt rate in the last 24h' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 41 ;
+	 parameterNumber = 41 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Upward sea water velocity
 'Upward sea water velocity' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 4 ;
+	 parameterCategory = 4 ;
- parameterNumber = 27 ;
+	 parameterNumber = 27 ;
- typeOfFirstFixedSurface = 168 ;
+	 typeOfFirstFixedSurface = 168 ;
- typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
-}
+	}
 #Time-mean upward sea water velocity
 'Time-mean upward sea water velocity' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 4 ;
+	 parameterCategory = 4 ;
- parameterNumber = 27 ;
+	 parameterNumber = 27 ;
- typeOfFirstFixedSurface = 168 ;
+	 typeOfFirstFixedSurface = 168 ;
- typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
-}
+	}
-#Maximum individual wave height
+#Maximum temperature
-'Maximum individual wave height' = {
+'Maximum temperature' = {
- discipline = 10 ;
+	 discipline = 0 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 24 ;
+	 parameterNumber = 4 ;
-}
+	}
+#Minimum temperature
+'Minimum temperature' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 5 ;
+	}
+#Envelop-maximum individual wave height
+'Envelop-maximum individual wave height' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 24 ;
+	}
+#Soil moisture
+'Soil moisture' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	}
 #Soil temperature
 'Soil temperature' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 2 ;
+	 parameterNumber = 2 ;
 }

definitions/grib2/paramId.legacy.def

@@ -1,188 +1,249 @@
-#Volumetric soil moisture content
+# Automatically generated by ./create_def.pl, do not edit
-'260185' = {
-  discipline = 2 ;
-  parameterCategory = 0 ;
-  parameterNumber = 9 ;
- }
-#Upper layer soil temperature
-'260201' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 1 ;
- }
-#Upper layer soil moisture
-'260202' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 2 ;
- }
-#Lower layer soil moisture
-'260203' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 3 ;
- }
-#Bottom layer soil temperature
-'260204' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 4 ;
- }
-#Liquid volumetric soil moisture (non-frozen)
-'260205' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 5 ;
- }
-#Transpiration stress-onset (soil moisture)
-'260207' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 7 ;
- }
-#Direct evaporation cease (soil moisture)
-'260208' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 8 ;
- }
-#Soil porosity
-'260209' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 9 ;
- }
 #Instantaneous eastward turbulent surface stress
 '229' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 2 ;
+	 parameterCategory = 2 ;
- parameterNumber = 38 ;
+	 parameterNumber = 38 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
-}
+	}
 #Instantaneous northward turbulent surface stress
 '230' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 2 ;
+	 parameterCategory = 2 ;
- parameterNumber = 37 ;
+	 parameterNumber = 37 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
-}
+	}
+#Minimum dew point depression
+'260006' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 14 ;
+	}
+#Maximum relative humidity
+'260023' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 27 ;
+	}
+#Maximum absolute humidity
+'260024' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 28 ;
+	}
+#Maximum wind speed
+'260064' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 21 ;
+	}
+#Net long wave radiation flux (surface)
+'260095' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 0 ;
+	}
+#Net long wave radiation flux (top of atmosphere)
+'260096' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 1 ;
+	}
+#Maximum snow albedo
+'260161' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 17 ;
+	}
+#Volumetric soil moisture content
+'260185' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 9 ;
+	}
+#Upper layer soil temperature
+'260201' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 1 ;
+	}
+#Upper layer soil moisture
+'260202' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 2 ;
+	}
+#Lower layer soil moisture
+'260203' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 3 ;
+	}
+#Bottom layer soil temperature
+'260204' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 4 ;
+	}
+#Liquid volumetric soil moisture (non-frozen)
+'260205' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 5 ;
+	}
+#Transpiration stress-onset (soil moisture)
+'260207' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 7 ;
+	}
+#Direct evaporation cease (soil moisture)
+'260208' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 8 ;
+	}
+#Soil porosity
+'260209' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 9 ;
+	}
 #Evaporation in the last 6 hours
 '260265' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 1 ;
+	 parameterCategory = 1 ;
- parameterNumber = 79 ;
+	 parameterNumber = 79 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 6 ;
+	 lengthOfTimeRange = 6 ;
-}
+	}
 #Time-mean evapotranspiration rate in the last 24h
 '260435' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 39 ;
+	 parameterNumber = 39 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated potential evapotranspiration rate in the last 24h
 '260437' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 40 ;
+	 parameterNumber = 40 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean potential evapotranspiration rate in the last 24h
 '260438' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 40 ;
+	 parameterNumber = 40 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean volumetric soil moisture
 '260440' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 25 ;
+	 parameterNumber = 25 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated water runoff and drainage rate in the last 24h
 '260444' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 42 ;
+	 parameterNumber = 42 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean water runoff and drainage rate in the last 24h
 '260445' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 42 ;
+	 parameterNumber = 42 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean snow depth water equivalent
 '260472' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 1 ;
+	 parameterCategory = 1 ;
- parameterNumber = 60 ;
+	 parameterNumber = 60 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean skin temperature
 '260473' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 17 ;
+	 parameterNumber = 17 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated snow melt rate in the last 24h
 '260476' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 41 ;
+	 parameterNumber = 41 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Upward sea water velocity
 '262507' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 4 ;
+	 parameterCategory = 4 ;
- parameterNumber = 27 ;
+	 parameterNumber = 27 ;
- typeOfFirstFixedSurface = 168 ;
+	 typeOfFirstFixedSurface = 168 ;
- typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
-}
+	}
 #Time-mean upward sea water velocity
 '263507' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 4 ;
+	 parameterCategory = 4 ;
- parameterNumber = 27 ;
+	 parameterNumber = 27 ;
- typeOfFirstFixedSurface = 168 ;
+	 typeOfFirstFixedSurface = 168 ;
- typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
-}
+	}
-#Maximum individual wave height
+#Maximum temperature
+'3015' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 4 ;
+	}
+#Minimum temperature
+'3016' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 5 ;
+	}
+#Envelop-maximum individual wave height
 '140218' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 24 ;
+	 parameterNumber = 24 ;
-}
+	}
+#Soil moisture
+'228039' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	}
 #Soil temperature
 '228139' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 2 ;
+	 parameterNumber = 2 ;
 }

definitions/grib2/shortName.legacy.def

@@ -1,188 +1,249 @@
-#Volumetric soil moisture content
+# Automatically generated by ./create_def.pl, do not edit
-'soilw' = {
-  discipline = 2 ;
-  parameterCategory = 0 ;
-  parameterNumber = 9 ;
- }
-#Upper layer soil temperature
-'uplst' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 1 ;
- }
-#Upper layer soil moisture
-'uplsm' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 2 ;
- }
-#Lower layer soil moisture
-'lowlsm' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 3 ;
- }
-#Bottom layer soil temperature
-'botlst' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 4 ;
- }
-#Liquid volumetric soil moisture (non-frozen)
-'soill' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 5 ;
- }
-#Transpiration stress-onset (soil moisture)
-'smref' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 7 ;
- }
-#Direct evaporation cease (soil moisture)
-'smdry' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 8 ;
- }
-#Soil porosity
-'poros' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 9 ;
- }
 #Instantaneous eastward turbulent surface stress
 'iews' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 2 ;
+	 parameterCategory = 2 ;
- parameterNumber = 38 ;
+	 parameterNumber = 38 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
-}
+	}
 #Instantaneous northward turbulent surface stress
 'inss' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 2 ;
+	 parameterCategory = 2 ;
- parameterNumber = 37 ;
+	 parameterNumber = 37 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
-}
+	}
+#Minimum dew point depression
+'mindpd' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 14 ;
+	}
+#Maximum relative humidity
+'maxrh' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 27 ;
+	}
+#Maximum absolute humidity
+'maxah' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 28 ;
+	}
+#Maximum wind speed
+'maxgust' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 21 ;
+	}
+#Net long wave radiation flux (surface)
+'nlwrs' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 0 ;
+	}
+#Net long wave radiation flux (top of atmosphere)
+'nlwrt' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 1 ;
+	}
+#Maximum snow albedo
+'mxsalb' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 17 ;
+	}
+#Volumetric soil moisture content
+'soilw' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 9 ;
+	}
+#Upper layer soil temperature
+'uplst' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 1 ;
+	}
+#Upper layer soil moisture
+'uplsm' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 2 ;
+	}
+#Lower layer soil moisture
+'lowlsm' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 3 ;
+	}
+#Bottom layer soil temperature
+'botlst' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 4 ;
+	}
+#Liquid volumetric soil moisture (non-frozen)
+'soill' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 5 ;
+	}
+#Transpiration stress-onset (soil moisture)
+'smref' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 7 ;
+	}
+#Direct evaporation cease (soil moisture)
+'smdry' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 8 ;
+	}
+#Soil porosity
+'poros' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 9 ;
+	}
 #Evaporation in the last 6 hours
 'eva06' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 1 ;
+	 parameterCategory = 1 ;
- parameterNumber = 79 ;
+	 parameterNumber = 79 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 6 ;
+	 lengthOfTimeRange = 6 ;
-}
+	}
 #Time-mean evapotranspiration rate in the last 24h
 'avg_et24' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 39 ;
+	 parameterNumber = 39 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated potential evapotranspiration rate in the last 24h
 'acc_pet24' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 40 ;
+	 parameterNumber = 40 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean potential evapotranspiration rate in the last 24h
 'avg_pet24' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 40 ;
+	 parameterNumber = 40 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean volumetric soil moisture
 'avg_swv24' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 25 ;
+	 parameterNumber = 25 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated water runoff and drainage rate in the last 24h
 'acc_rod24' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 42 ;
+	 parameterNumber = 42 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean water runoff and drainage rate in the last 24h
 'avg_rod24' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 42 ;
+	 parameterNumber = 42 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean snow depth water equivalent
 'avg_sd24' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 1 ;
+	 parameterCategory = 1 ;
- parameterNumber = 60 ;
+	 parameterNumber = 60 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean skin temperature
 'avg_skt24' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 17 ;
+	 parameterNumber = 17 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated snow melt rate in the last 24h
 'acc_smr24' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 41 ;
+	 parameterNumber = 41 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Upward sea water velocity
 'wo' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 4 ;
+	 parameterCategory = 4 ;
- parameterNumber = 27 ;
+	 parameterNumber = 27 ;
- typeOfFirstFixedSurface = 168 ;
+	 typeOfFirstFixedSurface = 168 ;
- typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
-}
+	}
 #Time-mean upward sea water velocity
 'avg_wo' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 4 ;
+	 parameterCategory = 4 ;
- parameterNumber = 27 ;
+	 parameterNumber = 27 ;
- typeOfFirstFixedSurface = 168 ;
+	 typeOfFirstFixedSurface = 168 ;
- typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
-}
+	}
-#Maximum individual wave height
+#Maximum temperature
+'tmax' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 4 ;
+	}
+#Minimum temperature
+'tmin' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 5 ;
+	}
+#Envelop-maximum individual wave height
 'hmax' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 24 ;
+	 parameterNumber = 24 ;
-}
+	}
+#Soil moisture
+'sm' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	}
 #Soil temperature
 'st' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 2 ;
+	 parameterNumber = 2 ;
 }

definitions/grib2/templates/template.4.100.def

@@ -7,6 +7,5 @@ include "grib2/templates/template.4.wave.def"
 include "grib2/templates/template.4.generating_process.def"
 include "grib2/templates/template.4.forecast_time.def"
 include "grib2/templates/template.4.point_in_time.def"
-#include "grib2/templates/template.4.horizontal.def"
 include "grib2/templates/template.4.eps.def"
 include "grib2/templates/template.4.wave_spectra_list.def"

definitions/grib2/templates/template.4.101.def

@@ -7,5 +7,4 @@ include "grib2/templates/template.4.wave.def"
 include "grib2/templates/template.4.generating_process.def"
 include "grib2/templates/template.4.forecast_time.def"
 include "grib2/templates/template.4.point_in_time.def"
-#include "grib2/templates/template.4.horizontal.def"
 include "grib2/templates/template.4.wave_spectra_formula.def"

definitions/grib2/templates/template.4.102.def

@@ -7,6 +7,5 @@ include "grib2/templates/template.4.wave.def"
 include "grib2/templates/template.4.generating_process.def"
 include "grib2/templates/template.4.forecast_time.def"
 include "grib2/templates/template.4.point_in_time.def"
-#include "grib2/templates/template.4.horizontal.def"
 include "grib2/templates/template.4.eps.def"
 include "grib2/templates/template.4.wave_spectra_formula.def"

definitions/grib2/templates/template.4.1101.def

@@ -25,4 +25,3 @@ codetable[1] indicatorOfUnitForTimeIncrement ('4.4.table',masterDir,localDir)=25
 unsigned[4] timeIncrement=0 ;
 alias timeIncrementBetweenSuccessiveFields=timeIncrement;
 
-# include "grib2/templates/template.4.statistical.def"

definitions/grib2/templates/template.4.128.def

@@ -0,0 +1,10 @@
+# (C) Copyright 2005- ECMWF.
+
+# TEMPLATE 4.128, Anomalies significance and other derived products from an analysis or forecast in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+
+include "grib2/templates/template.4.parameter.def"
+include "grib2/templates/template.4.generating_process.def"
+include "grib2/templates/template.4.forecast_time.def"
+include "grib2/templates/template.4.horizontal.def"
+include "grib2/templates/template.4.point_in_time.def"
+include "grib2/templates/template.4.referenceperiod.def"

definitions/grib2/templates/template.4.129.def

@@ -0,0 +1,11 @@
+# (C) Copyright 2005- ECMWF.
+
+# TEMPLATE 4.129, Anomalies significance and other derived products from an individual ensemble forecast, control and perturbed in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+
+include "grib2/templates/template.4.parameter.def"
+include "grib2/templates/template.4.generating_process.def"
+include "grib2/templates/template.4.forecast_time.def"
+include "grib2/templates/template.4.horizontal.def"
+include "grib2/templates/template.4.point_in_time.def"
+include "grib2/templates/template.4.eps.def"
+include "grib2/templates/template.4.referenceperiod.def"

definitions/grib2/templates/template.4.130.def

@@ -0,0 +1,11 @@
+# (C) Copyright 2005- ECMWF.
+
+# TEMPLATE 4.130, Anomalies significance and other derived products from derived forecasts based on all ensemble members in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+
+include "grib2/templates/template.4.parameter.def"
+include "grib2/templates/template.4.generating_process.def"
+include "grib2/templates/template.4.forecast_time.def"
+include "grib2/templates/template.4.horizontal.def"
+include "grib2/templates/template.4.point_in_time.def"
+include "grib2/templates/template.4.derived.def"
+include "grib2/templates/template.4.referenceperiod.def"

definitions/grib2/templates/template.4.131.def

@@ -0,0 +1,11 @@
+# (C) Copyright 2005- ECMWF.
+
+# TEMPLATE 4.131, Anomalies significance and other derived products as probability forecasts in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+
+include "grib2/templates/template.4.parameter.def"
+include "grib2/templates/template.4.generating_process.def"
+include "grib2/templates/template.4.forecast_time.def"
+include "grib2/templates/template.4.horizontal.def"
+include "grib2/templates/template.4.point_in_time.def"
+include "grib2/templates/template.4.probability.def"
+include "grib2/templates/template.4.referenceperiod.def"

definitions/grib2/templates/template.4.132.def

@@ -0,0 +1,11 @@
+# (C) Copyright 2005- ECMWF.
+
+# TEMPLATE 4.132, Quantile forecasts of anomalies, significance and other derived products in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+
+include "grib2/templates/template.4.parameter.def"
+include "grib2/templates/template.4.generating_process.def"
+include "grib2/templates/template.4.forecast_time.def"
+include "grib2/templates/template.4.point_in_time.def"
+include "grib2/templates/template.4.horizontal.def"
+include "grib2/templates/template.4.quantile.def"
+include "grib2/templates/template.4.referenceperiod.def"

definitions/grib2/templates/template.4.133.def

@@ -0,0 +1,12 @@
+# (C) Copyright 2005- ECMWF.
+
+# TEMPLATE 4.133, Post-processed quantile forecasts of anomalies, significance and other derived products in relation to a reference period at a horizontal level or in a horizontal layer at a point in time
+
+include "grib2/templates/template.4.parameter.def"
+include "grib2/templates/template.4.postproc.def"
+include "grib2/templates/template.4.generating_process.def"
+include "grib2/templates/template.4.forecast_time.def"
+include "grib2/templates/template.4.point_in_time.def"
+include "grib2/templates/template.4.horizontal.def"
+include "grib2/templates/template.4.quantile.def"
+include "grib2/templates/template.4.referenceperiod.def"

definitions/grib2/templates/template.4.134.def

@@ -0,0 +1,11 @@
+# (C) Copyright 2005- ECMWF.
+
+# TEMPLATE 4.134, Quantile forecasts of anomalies, significance and other derived products in relation to a reference period at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+
+include "grib2/templates/template.4.parameter.def"
+include "grib2/templates/template.4.generating_process.def"
+include "grib2/templates/template.4.forecast_time.def"
+include "grib2/templates/template.4.horizontal.def"
+include "grib2/templates/template.4.quantile.def"
+include "grib2/templates/template.4.statistical.def"
+include "grib2/templates/template.4.referenceperiod.def"

definitions/grib2/templates/template.4.135.def

@@ -0,0 +1,13 @@
+# (C) Copyright 2005- ECMWF.
+
+# TEMPLATE 4.135, Post-processed quantile forecasts of anomalies, significance and other derived products in relation to a reference period at a horizontal level or in a horizontal layer in a continuous or non-continuous time interval
+
+include "grib2/templates/template.4.parameter.def"
+include "grib2/templates/template.4.postproc.def"
+include "grib2/templates/template.4.generating_process.def"
+include "grib2/templates/template.4.forecast_time.def"
+include "grib2/templates/template.4.horizontal.def"
+include "grib2/templates/template.4.quantile.def"
+include "grib2/templates/template.4.statistical.def"
+include "grib2/templates/template.4.referenceperiod.def"
+

definitions/grib2/templates/template.4.136.def

@@ -0,0 +1,11 @@
+# (C) Copyright 2005- ECMWF.
+
+# TEMPLATE 4.136, Probability forecasts of anomalies, significance and other derived products in relation to a reference period with spatiotemporal processing based on focal (moving window) statistics in relation to a reference period at a horizontal level or in at a point in time
+
+include "grib2/templates/template.4.parameter.def"
+include "grib2/templates/template.4.generating_process.def"
+include "grib2/templates/template.4.forecast_time.def"
+include "grib2/templates/template.4.horizontal.def"
+include "grib2/templates/template.4.probabilityLargeEnsemble.def"
+include "grib2/templates/template.4.referenceperiod.def"
+include "grib2/templates/template.4.focalStatistics.def"

definitions/grib2/templates/template.4.generalised_tile.def

@@ -40,6 +40,7 @@ alias nTileAtt=numberOfUsedTileAttributesForTileAttributeCombination;
 alias tile.nTileAtt=nTileAtt;
 
 alias mars.tile=typeOfTile;
-alias mars.tileAttribute=tileAttribute;
+alias mars.tileattribute=tileAttribute;
-transient paramtype = "tile";
+constant paramTypeTile = "tile";
-alias mars.paramType=paramtype;
+unalias mars.paramtype;
+alias mars.paramtype=paramTypeTile;

definitions/grib2/templates/template.4.horizontal.def

@@ -64,11 +64,15 @@ 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;
@@ -76,13 +80,6 @@ if (extraDim) {
             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

definitions/grib2/templates/template.4.statistical.def

@@ -54,12 +54,9 @@ statisticalProcessesList list(numberOfTimeRanges)
 if (numberOfTimeRanges == 1 || numberOfTimeRanges == 2) {
   concept stepTypeInternal {
     "instant" = {typeOfStatisticalProcessing=255;}
-    "avg"     = {typeOfStatisticalProcessing=0;typeOfTimeIncrement=255;}
+    "avg"     = {typeOfStatisticalProcessing=0;}
-    "avg"     = {typeOfStatisticalProcessing=0;typeOfTimeIncrement=2;}
-    "avg"     = {typeOfStatisticalProcessing=0;typeOfTimeIncrement=3;}
     "avgd"    = {typeOfStatisticalProcessing=0;typeOfTimeIncrement=1;}
-    "accum"   = {typeOfStatisticalProcessing=1;typeOfTimeIncrement=255;}
+    "accum"   = {typeOfStatisticalProcessing=1;}
-    "accum"   = {typeOfStatisticalProcessing=1;typeOfTimeIncrement=2;}
     "max"     = {typeOfStatisticalProcessing=2;}
     "min"     = {typeOfStatisticalProcessing=3;}
     "diff"    = {typeOfStatisticalProcessing=4;} # end-start

definitions/grib2/typeOfLevelConcept.def

@@ -20,6 +20,7 @@
 'neutralBuoyancy'              = {typeOfFirstFixedSurface=16;  typeOfSecondFixedSurface=255;}
 'mostUnstableParcel'           = {typeOfFirstFixedSurface=17;  typeOfSecondFixedSurface=255;}
 'mixedLayerParcel'             = {typeOfFirstFixedSurface=18;  typeOfSecondFixedSurface=255;}
+'lowestLevelOfCloudCoverExceedance' = {typeOfFirstFixedSurface=19; typeOfSecondFixedSurface=255;}
 'isothermal'                   = {typeOfFirstFixedSurface=20;  typeOfSecondFixedSurface=255;}
 'isobaricInPa'                 = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=255; pressureUnits='Pa';}
 'isobaricInhPa'                = {typeOfFirstFixedSurface=100; pressureUnits='hPa'; typeOfSecondFixedSurface=255;}
@@ -97,4 +98,4 @@
 'road'           = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=255;}
 'roadLayer'      = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=187;}
 'urbanCanyon'    = {typeOfFirstFixedSurface=187; typeOfSecondFixedSurface=185;}
-'unknown'        = {dummy=0;}
+'unknown'        = {dummyc=1;}

definitions/grib2/units.legacy.def

@@ -1,188 +1,249 @@
-#Volumetric soil moisture content
+# Automatically generated by ./create_def.pl, do not edit
-'Proportion' = {
-  discipline = 2 ;
-  parameterCategory = 0 ;
-  parameterNumber = 9 ;
- }
-#Upper layer soil temperature
-'K' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 1 ;
- }
-#Upper layer soil moisture
-'kg m**-3' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 2 ;
- }
-#Lower layer soil moisture
-'kg m**-3' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 3 ;
- }
-#Bottom layer soil temperature
-'K' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 4 ;
- }
-#Liquid volumetric soil moisture (non-frozen)
-'Proportion' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 5 ;
- }
-#Transpiration stress-onset (soil moisture)
-'Proportion' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 7 ;
- }
-#Direct evaporation cease (soil moisture)
-'Proportion' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 8 ;
- }
-#Soil porosity
-'Proportion' = {
-  discipline = 2 ;
-  parameterCategory = 3 ;
-  parameterNumber = 9 ;
- }
 #Instantaneous eastward turbulent surface stress
 'N m**-2' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 2 ;
+	 parameterCategory = 2 ;
- parameterNumber = 38 ;
+	 parameterNumber = 38 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
-}
+	}
 #Instantaneous northward turbulent surface stress
 'N m**-2' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 2 ;
+	 parameterCategory = 2 ;
- parameterNumber = 37 ;
+	 parameterNumber = 37 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
-}
+	}
+#Minimum dew point depression
+'K' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 14 ;
+	}
+#Maximum relative humidity
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 27 ;
+	}
+#Maximum absolute humidity
+'kg m**-3' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 28 ;
+	}
+#Maximum wind speed
+'m s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 21 ;
+	}
+#Net long wave radiation flux (surface)
+'W m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 0 ;
+	}
+#Net long wave radiation flux (top of atmosphere)
+'W m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 1 ;
+	}
+#Maximum snow albedo
+'%' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 17 ;
+	}
+#Volumetric soil moisture content
+'Proportion' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 9 ;
+	}
+#Upper layer soil temperature
+'K' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 1 ;
+	}
+#Upper layer soil moisture
+'kg m**-3' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 2 ;
+	}
+#Lower layer soil moisture
+'kg m**-3' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 3 ;
+	}
+#Bottom layer soil temperature
+'K' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 4 ;
+	}
+#Liquid volumetric soil moisture (non-frozen)
+'Proportion' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 5 ;
+	}
+#Transpiration stress-onset (soil moisture)
+'Proportion' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 7 ;
+	}
+#Direct evaporation cease (soil moisture)
+'Proportion' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 8 ;
+	}
+#Soil porosity
+'Proportion' = {
+	 discipline = 2 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 9 ;
+	}
 #Evaporation in the last 6 hours
 'kg m**-2' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 1 ;
+	 parameterCategory = 1 ;
- parameterNumber = 79 ;
+	 parameterNumber = 79 ;
- typeOfFirstFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 1 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 6 ;
+	 lengthOfTimeRange = 6 ;
-}
+	}
 #Time-mean evapotranspiration rate in the last 24h
 'kg m**-2 s**-1' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 39 ;
+	 parameterNumber = 39 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated potential evapotranspiration rate in the last 24h
 'kg m**-2' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 40 ;
+	 parameterNumber = 40 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean potential evapotranspiration rate in the last 24h
 'kg m**-2 s**-1' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 40 ;
+	 parameterNumber = 40 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean volumetric soil moisture
 'm**3 m**-3' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 25 ;
+	 parameterNumber = 25 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated water runoff and drainage rate in the last 24h
 'kg m**-2' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 42 ;
+	 parameterNumber = 42 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean water runoff and drainage rate in the last 24h
 'kg m**-2 s**-1' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 42 ;
+	 parameterNumber = 42 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean snow depth water equivalent
 'kg m**-2' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 1 ;
+	 parameterCategory = 1 ;
- parameterNumber = 60 ;
+	 parameterNumber = 60 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-mean skin temperature
 'K' = {
- discipline = 0 ;
+	 discipline = 0 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 17 ;
+	 parameterNumber = 17 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Time-integrated snow melt rate in the last 24h
 'kg m**-2' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 41 ;
+	 parameterNumber = 41 ;
- indicatorOfUnitForTimeRange = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
- typeOfStatisticalProcessing = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
- lengthOfTimeRange = 24 ;
+	 lengthOfTimeRange = 24 ;
-}
+	}
 #Upward sea water velocity
 'm s**-1' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 4 ;
+	 parameterCategory = 4 ;
- parameterNumber = 27 ;
+	 parameterNumber = 27 ;
- typeOfFirstFixedSurface = 168 ;
+	 typeOfFirstFixedSurface = 168 ;
- typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
-}
+	}
 #Time-mean upward sea water velocity
 'm s**-1' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 4 ;
+	 parameterCategory = 4 ;
- parameterNumber = 27 ;
+	 parameterNumber = 27 ;
- typeOfFirstFixedSurface = 168 ;
+	 typeOfFirstFixedSurface = 168 ;
- typeOfSecondFixedSurface = 168 ;
+	 typeOfSecondFixedSurface = 168 ;
- typeOfStatisticalProcessing = 0 ;
+	 typeOfStatisticalProcessing = 0 ;
-}
+	}
-#Maximum individual wave height
+#Maximum temperature
+'K' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 4 ;
+	}
+#Minimum temperature
+'K' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 5 ;
+	}
+#Envelop-maximum individual wave height
 'm' = {
- discipline = 10 ;
+	 discipline = 10 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 24 ;
+	 parameterNumber = 24 ;
-}
+	}
+#Soil moisture
+'kg m**-3' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	}
 #Soil temperature
 'K' = {
- discipline = 2 ;
+	 discipline = 2 ;
- parameterCategory = 0 ;
+	 parameterCategory = 0 ;
- parameterNumber = 2 ;
+	 parameterNumber = 2 ;
 }

definitions/mars/grib.dacl.pb.def

@@ -1,4 +1,3 @@
-alias   mars.step     = stepRange;
+alias mars.step     = stepRange;
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
 
+include "mars/mars.quantile.def"

definitions/mars/grib.dacw.pb.def

@@ -1,4 +1,4 @@
-alias   mars.step     = stepRange;
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
 
+alias mars.step     = stepRange;
+
+include "mars/mars.quantile.def"

definitions/mars/grib.eefo.pb.def

@@ -1,4 +1,3 @@
-alias   mars.step     = stepRange;
+alias mars.step     = stepRange;
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
-alias   mars.quantile = marsQuantile;
 
+include "mars/mars.quantile.def"

definitions/mars/grib.eefo.pd.def

@@ -1,3 +1,3 @@
-alias   mars.step     = stepRange;
+alias mars.step     = stepRange;
-meta marsQuantile sprintf("%d:%d",perturbationNumber,numberOfForecastsInEnsemble);
+
-alias   mars.quantile = marsQuantile;
+include "mars/mars.quantile.def"

definitions/mars/grib.eehs.cd.def

@@ -1,3 +1,3 @@
-alias   mars.step     = stepRange;
+alias mars.step     = stepRange;
-alias   mars.quantile = quantile;
 
+include "mars/mars.quantile.def"