Merge remote-tracking branch 'origin/develop' into feature/mtg2_tablesVersion_switch

Author: mjg41

src/accessor/grib_accessor_class_g2_param_concept_filename.cc

@@ -18,6 +18,12 @@ void grib_accessor_g2_param_concept_filename_t::init(const long len, grib_argume
     grib_accessor_gen_t::init(len, arg);
     grib_handle* h = grib_handle_of_accessor(this);
 
+    const int numArgs = arg->get_count();
+    if (numArgs != 3) {
+        grib_context_log(context_, GRIB_LOG_FATAL, "Accessor %s (key %s): %d arguments provided but expected 3",
+                         class_name_, name_, numArgs);
+    }
+
     basename_                = arg->get_string(h, 0);
     MTG2Switch_              = arg->get_name(h, 1);
     tablesVersionMTG2Switch_ = arg->get_name(h, 2);

src/accessor/grib_accessor_class_message_is_valid.cc

@@ -68,12 +68,8 @@ int grib_accessor_message_is_valid_t::check_grid_pl_array()
 
     char gridType[128] = {0,};
     size_t len = 128;
-    ret = grib_get_string(handle_, "gridType", gridType, &len);
-    if (ret == GRIB_SUCCESS && STR_EQUAL(gridType, "reduced_ll")) {
-        // Unfortunately in our archive we have such grids with zeroes in the pl!
-        return GRIB_SUCCESS;
-    }
-
+    ret = grib_get_string_internal(handle_, "gridType", gridType, &len);
+    if (ret != GRIB_SUCCESS) return ret;
 
     if ((ret = grib_get_size(handle_, "pl", &plsize)) != GRIB_SUCCESS)
         return ret;
@@ -90,16 +86,42 @@ int grib_accessor_message_is_valid_t::check_grid_pl_array()
 
     pl = (long*)grib_context_malloc_clear(c, sizeof(long) * plsize);
     if (!pl) return GRIB_OUT_OF_MEMORY;
-    if ((ret = grib_get_long_array(handle_, "pl", pl, &plsize)) != GRIB_SUCCESS)
+    if ((ret = grib_get_long_array_internal(handle_, "pl", pl, &plsize)) != GRIB_SUCCESS)
         return ret;
 
-    for (size_t j = 0; j < plsize; j++) {
-        if (pl[j] == 0) {
-            grib_context_log(c, GRIB_LOG_ERROR, "%s: Invalid PL array: entry at index=%zu is zero", TITLE, j);
+    long numberOfDataPoints = 0;
+    if ((ret = grib_get_long_internal(handle_, "numberOfDataPoints", &numberOfDataPoints)) != GRIB_SUCCESS)
+        return ret;
+    size_t sum_pl = 0;
+    for (size_t j = 0; j < plsize; j++) sum_pl += pl[j];
+
+    if (STR_EQUAL(gridType, "reduced_ll")) {
+        // For reduced_ll grids, sum(pl) must equal numberOfDataPoints in every situation
+        if (sum_pl != (size_t)numberOfDataPoints) {
+            grib_context_log(c, GRIB_LOG_ERROR, "%s: Sum of PL array (=%zu) must equal numberOfDataPoints (=%ld)",
+                             TITLE, sum_pl, numberOfDataPoints);
+            grib_context_free(c, pl);
+            return GRIB_WRONG_GRID;
+        }
+    }
+    else {
+        // Other reduced grids
+        // Unfortunately in our archive we have reduced_ll grids with zeroes in the pl!
+        for (size_t j = 0; j < plsize; j++) {
+            if (pl[j] == 0) {
+                grib_context_log(c, GRIB_LOG_ERROR, "%s: Invalid PL array: entry at index=%zu is zero", TITLE, j);
+                grib_context_free(c, pl);
+                return GRIB_WRONG_GRID;
+            }
+        }
+        if (sum_pl < (size_t)numberOfDataPoints) {
+            grib_context_log(c, GRIB_LOG_ERROR, "%s: Sum of PL array (=%zu) cannot be less than numberOfDataPoints (=%ld)",
+                    TITLE, sum_pl, numberOfDataPoints);
             grib_context_free(c, pl);
             return GRIB_WRONG_GRID;
         }
     }
+
     grib_context_free(c, pl);
 
     return GRIB_SUCCESS;

src/accessor/grib_accessor_class_mtg2_switch_default.cc

@@ -18,6 +18,11 @@ void grib_accessor_mtg2_switch_default_t::init(const long len, grib_arguments* a
     grib_accessor_long_t::init(len, arg);
 
     grib_handle* h = grib_handle_of_accessor(this);
+    const int numArgs = arg->get_count();
+    if (numArgs != 4) {
+        grib_context_log(context_, GRIB_LOG_FATAL, "Accessor %s (key %s): %d arguments provided but expected 4",
+                         class_name_, name_, numArgs);
+    }
 
     tablesVersion_           = arg->get_name(h, 0);
     tablesVersionMTG2Switch_ = arg->get_name(h, 1);