Merge branch 'develop' into feature/modernisation_merge_accessor_classes

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 )

definitions/mars/grib.mmam.fcmean.def

@@ -4,5 +4,6 @@ alias mars.fcmonth = marsForecastMonth;
 unalias mars.step;
 
 alias mars.method = methodNumber;
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
+if (class is "od" || class is "en") {
+    alias mars.system = systemNumber;
+}

definitions/mars/grib.mmsa.em.def

@@ -6,7 +6,10 @@ if (class is "od") { alias mars.system = systemNumber; }
 if (class is "c3") { alias mars.system = systemNumber; }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }
+

definitions/mars/grib.mmsa.fcmean.def

@@ -8,7 +8,10 @@ if (class is "od") { alias mars.system = systemNumber; }
 if (class is "c3") { alias mars.system = systemNumber; }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }
+

definitions/mars/grib.mmsf.an.def

@@ -15,7 +15,7 @@ if (class isnot "gw") { # ECC-1448
 }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }

definitions/mars/grib.mmsf.fc.def

@@ -18,7 +18,7 @@ if (class isnot "gw") { # ECC-1448
 }
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }

definitions/mars/grib.msmm.em.def

@@ -5,13 +5,15 @@ unalias mars.step;
 alias mars.origin = centre;
 alias mars.method = methodNumber;
 
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
-if (class is "c3") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en" || class is "c3") {
+    alias mars.system = systemNumber;
+}
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }
+

definitions/mars/grib.msmm.fcmax.def

@@ -6,13 +6,15 @@ alias mars.number = perturbationNumber;
 alias mars.origin = centre;
 alias mars.method = methodNumber;
 
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
-if (class is "c3") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en" || class is "c3") {
+    alias mars.system = systemNumber;
+}
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }
+

definitions/mars/grib.msmm.fcmean.def

@@ -6,14 +6,12 @@ alias mars.method  = methodNumber;
 
 unalias mars.step;
 
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
-if (class is "c3") { alias mars.system = systemNumber; }
-if (class is "ci") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en" || class is "c3" || class is "ci") {
+    alias mars.system = systemNumber;
+}
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }

definitions/mars/grib.msmm.fcmin.def

@@ -5,14 +5,14 @@ alias mars.number  = perturbationNumber;
 alias mars.origin  = centre;
 alias mars.method = methodNumber;
 
-
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
-if (class is "c3") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en" || class is "c3") {
+    alias mars.system = systemNumber;
+}
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }

definitions/mars/grib.msmm.fcstdev.def

@@ -7,13 +7,14 @@ unalias mars.step;
 
 alias mars.method = methodNumber;
 
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
-if (class is "c3") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en" || class is "c3") {
+    alias mars.system = systemNumber;
+}
 
 # See ECC-624
-if (centre == 80 && subCentre == 98 && class is "c3") {
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
   constant cnmc_cmcc = 'cmcc';
   alias mars.origin = cnmc_cmcc;
 }
+
+if (class is "ci") { unalias mars.method; }

definitions/mars/grib.msmm.hcmean.def

@@ -0,0 +1,18 @@
+# assert(16);
+alias mars.fcmonth = marsForecastMonth;
+unalias mars.step;
+
+alias mars.origin = centre;
+alias mars.method = methodNumber;
+
+if (class is "od" || class is "me" || class is "en" || class is "c3") {
+    alias mars.system = systemNumber;
+}
+
+# See ECC-624
+if (centre == 80 && subCentre == 98 && (class is "c3" || class is "ci")) {
+  constant cnmc_cmcc = 'cmcc';
+  alias mars.origin = cnmc_cmcc;
+}
+
+if (class is "ci") { unalias mars.method; }

definitions/mars/grib.ocea.an.def

@@ -1,5 +1,6 @@
 alias mars.number = perturbationNumber;
 alias mars.method = methodNumber;
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
+
+if (class is "od" || class is "me" || class is "en") {
+    alias mars.system = systemNumber;
+}

definitions/mars/grib.ocea.ff.def

@@ -1,5 +1,5 @@
 alias mars.number = perturbationNumber;
 alias mars.method = methodNumber;
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en") {
+    alias mars.system = systemNumber;
+}

definitions/mars/grib.ocea.fx.def

@@ -1,5 +1,5 @@
 alias mars.number = perturbationNumber;
 alias mars.method = methodNumber;
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en") {
+    alias mars.system = systemNumber;
+}

definitions/mars/grib.ocea.of.def

@@ -1,5 +1,5 @@
 alias mars.number = perturbationNumber;
 alias mars.method = methodNumber;
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en") {
+    alias mars.system = systemNumber;
+}

definitions/mars/grib.ocea.or.def

@@ -1,5 +1,5 @@
 alias mars.number = perturbationNumber;
 alias mars.method = methodNumber;
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en") {
+    alias mars.system = systemNumber;
+}

definitions/mars/grib.swmm.fcmax.def

@@ -4,6 +4,6 @@ alias mars.number  = perturbationNumber;
 unalias mars.step;
 
 alias mars.method = methodNumber;
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en") {
+    alias mars.system = systemNumber;
+}

definitions/mars/grib.swmm.fcmean.def

@@ -4,6 +4,6 @@ alias mars.number  = perturbationNumber;
 unalias mars.step;
 
 alias mars.method = methodNumber;
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en") {
+    alias mars.system = systemNumber;
+}

definitions/mars/grib.swmm.fcmin.def

@@ -4,6 +4,6 @@ alias mars.number  = perturbationNumber;
 unalias mars.step;
 
 alias mars.method = methodNumber;
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en") {
+    alias mars.system = systemNumber;
+}

definitions/mars/grib.swmm.fcstdev.def

@@ -4,6 +4,6 @@ alias mars.number  = perturbationNumber;
 unalias mars.step;
 
 alias mars.method = methodNumber;
-if (class is "od") { alias mars.system = systemNumber; }
-if (class is "me") { alias mars.system = systemNumber; }
-if (class is "en") { alias mars.system = systemNumber; }
+if (class is "od" || class is "me" || class is "en") {
+    alias mars.system = systemNumber;
+}

src/CMakeLists.txt

@@ -357,7 +357,6 @@ list( APPEND eccodes_src_files
     eccodes_prototypes.h
     grib_dumper_class.h
     grib_dumper_factory.h
-    grib_emoslib.h
     grib_iterator_class.h
     grib_iterator_factory.h
     grib_nearest_class.h

src/accessor/grib_accessor_class_g1end_of_interval_monthly.cc

@@ -106,9 +106,8 @@ int grib_accessor_g1end_of_interval_monthly_t::compare(grib_accessor* b)
     long count  = 0;
     size_t alen = 0;
     size_t blen = 0;
-    int err     = 0;
 
-    err = value_count(&count);
+    int err = value_count(&count);
     if (err)
         return err;
     alen = count;
@@ -128,7 +127,10 @@ int grib_accessor_g1end_of_interval_monthly_t::compare(grib_accessor* b)
     dirty_    = 1;
 
     err = unpack_double(aval, &alen);
+    if (err) return err;
     err = b->unpack_double(bval, &blen);
+    if (err) return err;
+
     for (size_t i = 0; i < alen && retval == GRIB_SUCCESS; ++i) {
         if (aval[i] != bval[i]) retval = GRIB_DOUBLE_VALUE_MISMATCH;
     }

src/accessor/grib_accessor_class_gen.cc

@@ -123,7 +123,7 @@ long grib_accessor_gen_t::byte_offset()
 
 int grib_accessor_gen_t::unpack_bytes(unsigned char* val, size_t* len)
 {
-    unsigned char* buf = grib_handle_of_accessor(this)->buffer->data;
+    const unsigned char* buf = grib_handle_of_accessor(this)->buffer->data;
     const long length  = byte_count();
     const long offset  = byte_offset();
 

src/accessor/grib_accessor_class_getenv.cc

@@ -18,7 +18,7 @@ void grib_accessor_getenv_t::init(const long l, grib_arguments* args)
     grib_accessor_ascii_t::init(l, args);
     static char undefined[] = "undefined";
 
-    name_          = grib_arguments_get_string(grib_handle_of_accessor(this), args, 0);
+    envvar_          = grib_arguments_get_string(grib_handle_of_accessor(this), args, 0);
     default_value_ = grib_arguments_get_string(grib_handle_of_accessor(this), args, 1);
     if (!default_value_)
         default_value_ = undefined;
@@ -36,7 +36,7 @@ int grib_accessor_getenv_t::unpack_string(char* val, size_t* len)
     size_t l = 0;
 
     if (!value_) {
-        v = getenv(name_);
+        v = getenv(envvar_);
         if (!v)
             v = (char*)default_value_;
         value_ = v;

src/accessor/grib_accessor_class_getenv.h

@@ -26,7 +26,7 @@ class grib_accessor_getenv_t : public grib_accessor_ascii_t
 
 private:
     // TODO(maee): shadows name_?
-    const char* name_;
+    const char* envvar_;
     char* value_;
     const char* default_value_;
 };

src/accessor/grib_accessor_class_group.cc

@@ -16,7 +16,7 @@ grib_accessor* grib_accessor_group = &_grib_accessor_group;
 void grib_accessor_group_t::init(const long len, grib_arguments* arg)
 {
     grib_accessor_gen_t::init(len, arg);
-    grib_buffer* buffer = grib_handle_of_accessor(this)->buffer;
+    const grib_buffer* buffer = grib_handle_of_accessor(this)->buffer;
 
     size_t i = 0;
     unsigned char* v;

src/accessor/grib_accessor_class_gts_header.cc

@@ -56,6 +56,6 @@ int grib_accessor_gts_header_t::value_count(long* count)
 
 size_t grib_accessor_gts_header_t::string_length()
 {
-    grib_handle* h = grib_handle_of_accessor(this);
+    const grib_handle* h = grib_handle_of_accessor(this);
     return h->gts_header_len;
 }

src/accessor/grib_accessor_class_md5.cc

@@ -23,8 +23,8 @@ void grib_accessor_md5_t::init(const long len, grib_arguments* arg)
     grib_string_list* current = 0;
     grib_context* context     = context_;
 
-    offset_    = grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++);
-    length_    = grib_arguments_get_expression(grib_handle_of_accessor(this), arg, n++);
+    offset_key_    = grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++);
+    length_key_    = grib_arguments_get_expression(grib_handle_of_accessor(this), arg, n++);
     blocklist_ = NULL;
     while ((b = (char*)grib_arguments_get_name(grib_handle_of_accessor(this), arg, n++)) != NULL) {
         if (!blocklist_) {
@@ -97,9 +97,9 @@ int grib_accessor_md5_t::unpack_string(char* v, size_t* len)
         return GRIB_BUFFER_TOO_SMALL;
     }
 
-    if ((ret = grib_get_long_internal(grib_handle_of_accessor(this), offset_, &offset)) != GRIB_SUCCESS)
+    if ((ret = grib_get_long_internal(grib_handle_of_accessor(this), offset_key_, &offset)) != GRIB_SUCCESS)
         return ret;
-    if ((ret = grib_expression_evaluate_long(grib_handle_of_accessor(this), length_, &length)) != GRIB_SUCCESS)
+    if ((ret = grib_expression_evaluate_long(grib_handle_of_accessor(this), length_key_, &length)) != GRIB_SUCCESS)
         return ret;
     mess = (unsigned char*)grib_context_malloc(context_, length);
     memcpy(mess, grib_handle_of_accessor(this)->buffer->data + offset, length);

src/accessor/grib_accessor_class_md5.h

@@ -27,7 +27,7 @@ class grib_accessor_md5_t : public grib_accessor_gen_t
     int compare(grib_accessor*) override;
 
 private:
-    const char* offset_;
-    grib_expression* length_;
+    const char* offset_key_;
+    grib_expression* length_key_;
     grib_string_list* blocklist_;
 };