Merge branch 'develop' into feature/OceanInMars

.appveyor.yml

@@ -74,6 +74,7 @@ build_script:
                -D ENABLE_FORTRAN=0 ^
                -D ENABLE_NETCDF=1 ^
                -D ENABLE_JPG=1 ^
+               -D ENABLE_AEC=0 ^
                -D IEEE_LE=1 ^
                -D ENABLE_MEMFS=1 ^
                -D ENABLE_EXTRA_TESTS=ON ^

.github/workflows/ci.yml

@@ -27,5 +27,7 @@ jobs:
       codecov_upload: true
       build_package_inputs: |
         self_coverage: true
-        dependencies: ecmwf/ecbuild
+        dependencies: |
+          ecmwf/ecbuild
+          libaec
         dependency_branch: develop

CMakeLists.txt

@@ -115,9 +115,12 @@ ecbuild_add_option( FEATURE NETCDF
     NO_TPL )
 
 find_package( AEC )
+if(NOT DEFINED ENABLE_AEC AND NOT AEC_FOUND)
+  ecbuild_critical("AEC support is highly recommended from ecCodes >= 2.25.0\nTo force build without it use -DENABLE_AEC=OFF")
+endif()
 ecbuild_add_option( FEATURE AEC
     DESCRIPTION "Support for Adaptive Entropy Coding"
-    DEFAULT OFF
+    DEFAULT ON
     CONDITION AEC_FOUND )
 
 ecbuild_find_python( VERSION 2.6 NO_LIBS )

bamboo/CLANG-env.sh

@@ -16,5 +16,6 @@ module unload libemos
 module unload metview
 
 module load cmake/3.16.5
+module load aec
 
 module switch gnu clang

bamboo/GCC-env.sh

@@ -15,3 +15,5 @@ module unload libemos
 module unload metview
 
 module load cmake/3.16.5
+module load aec
+

bamboo/INTEL-env.sh

@@ -16,5 +16,6 @@ module unload netcdf4
 module list
 
 module load cmake/3.16.5
+module load aec
 
 module switch gnu intel/17.0.3

definitions/grib1/data.grid_simple_matrix.def

@@ -75,8 +75,8 @@ if(matrixOfValues == 0)
                decimalScaleFactor,
                optimizeScaleFactor,
                halfByte,
-               packingType,
-               grid_ieee
+               packingType
+               #grid_ieee
         ) : read_only;
             alias data.packedValues = codedValues;
         meta values data_apply_bitmap(codedValues,bitmap,missingValue,binaryScaleFactor) : dump;

tests/grib_check_param_concepts.c

@@ -59,10 +59,14 @@ static int scale_factor_missing(const char* value)
 */
 static int grib_check_param_concepts(const char* key, const char* filename)
 {
+    int isLocal = 0;
     grib_concept_value* concept_value = grib_parse_concept_file(NULL, filename);
     if (!concept_value)
         return GRIB_IO_PROBLEM;
 
+    if (strstr(filename, "/localConcepts/")) {
+        isLocal = 1;
+    }
     while (concept_value) {
         grib_concept_condition* concept_condition = concept_value->conditions;
         /* Convention:
@@ -98,6 +102,11 @@ static int grib_check_param_concepts(const char* key, const char* filename)
                         key, concept_value->name, expression->cclass->name);
                 Assert(0);
             }
+            if (!isLocal && strcmp(condition_name, "localTablesVersion") == 0) {
+                fprintf(stderr, "%s %s: Cannot have localTablesVersion key in WMO file %s!\n",
+                        key, concept_value->name, filename);
+                return GRIB_INVALID_KEY_VALUE;
+            }
             if (strcmp(condition_name, "typeOfFirstFixedSurface") == 0) {
                 type1Missing = type_of_surface_missing(condition_name, condition_value);
             }