From 98c83ee52c3a419107ed60ee9e5126b55737719d Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 31 Aug 2016 09:58:24 +0100
Subject: [PATCH] Turn off GRIB multi-field support. Not relevant for BUFR

---
 tools/bufr_compare.c | 3 +++
 tools/bufr_filter.c  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/tools/bufr_compare.c b/tools/bufr_compare.c
index dd5ad8047..2938dd078 100644
--- a/tools/bufr_compare.c
+++ b/tools/bufr_compare.c
@@ -374,6 +374,9 @@ int grib_tool_init(grib_runtime_options* options)
         }
     }
 
+    /* Turn off GRIB multi-field support mode. Not relevant for BUFR */
+    grib_multi_support_off(grib_context_get_default());
+
     return 0;
 }
 
diff --git a/tools/bufr_filter.c b/tools/bufr_filter.c
index 878558557..d10ae0a1e 100644
--- a/tools/bufr_filter.c
+++ b/tools/bufr_filter.c
@@ -60,6 +60,9 @@ int grib_tool_init(grib_runtime_options* options)
     if ( options->outfile && options->outfile->name )
         options->action->context->outfilename=options->outfile->name;
 
+    /* Turn off GRIB multi-field support mode. Not relevant for BUFR */
+    grib_multi_support_off(grib_context_get_default());
+
     return 0;
 }