diff --git a/src/grib_dumper_class_wmo.c b/src/grib_dumper_class_wmo.c
index 5e5281eb1..2c8eb75d0 100644
--- a/src/grib_dumper_class_wmo.c
+++ b/src/grib_dumper_class_wmo.c
@@ -97,397 +97,398 @@ static void init_class      (grib_dumper_class* c){}
 
 static int  init(grib_dumper* d)
 {
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
-  self->section_offset=0;
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    self->section_offset=0;
 
-  return GRIB_SUCCESS;
+    return GRIB_SUCCESS;
 }
 
 static int  destroy  (grib_dumper* d){
-  return GRIB_SUCCESS;
+    return GRIB_SUCCESS;
 }
 
 
 static void aliases(grib_dumper* d,grib_accessor* a)
 {
-int i;
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    int i;
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
 
-  if( (d->option_flags & GRIB_DUMP_FLAG_ALIASES) == 0)
-    return;
+    if( (d->option_flags & GRIB_DUMP_FLAG_ALIASES) == 0)
+        return;
 
-  if(a->all_names[1])
-  {
-    char *sep = "";
-    fprintf(self->dumper.out," [");
-
-    for(i = 1; i < MAX_ACCESSOR_NAMES; i++)
+    if(a->all_names[1])
     {
-      if(a->all_names[i])
-      {
-        if(a->all_name_spaces[i])
-          fprintf(self->dumper.out,"%s%s.%s", sep,a->all_name_spaces[i],a->all_names[i]);
-        else
-          fprintf(self->dumper.out,"%s%s", sep,a->all_names[i]);
-      }
-    sep = ", ";
+        char *sep = "";
+        fprintf(self->dumper.out," [");
+
+        for(i = 1; i < MAX_ACCESSOR_NAMES; i++)
+        {
+            if(a->all_names[i])
+            {
+                if(a->all_name_spaces[i])
+                    fprintf(self->dumper.out,"%s%s.%s", sep,a->all_name_spaces[i],a->all_names[i]);
+                else
+                    fprintf(self->dumper.out,"%s%s", sep,a->all_names[i]);
+            }
+            sep = ", ";
+        }
+        fprintf(self->dumper.out,"]");
     }
-    fprintf(self->dumper.out,"]");
-  }
 }
 
 static void dump_long(grib_dumper* d,grib_accessor* a,const char* comment)
 {
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
-  long value = 0; size_t size =0;
-  long *values=NULL;
-  int err = 0;
-  int i=0;
-  long count=0;
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    long value = 0; size_t size =0;
+    long *values=NULL;
+    int err = 0;
+    int i=0;
+    long count=0;
 
-  grib_value_count(a,&count);
-  size=count;
+    grib_value_count(a,&count);
+    size=count;
 
-  
-  if (size>1) {
-  	values=(long*)grib_context_malloc_clear(a->context,sizeof(long)*size);
-	err=grib_unpack_long(a,values,&size);
-  } else {
-	err=grib_unpack_long(a,&value,&size);
-  }
+    if (size>1) {
+        values=(long*)grib_context_malloc_clear(a->context,sizeof(long)*size);
+        err=grib_unpack_long(a,values,&size);
+    } else {
+        err=grib_unpack_long(a,&value,&size);
+    }
 
-  if( a->length == 0  &&
-      (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0)
-    return;
+    if( a->length == 0  &&
+            (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0)
+        return;
 
-  if( (a->flags & GRIB_ACCESSOR_FLAG_READ_ONLY) != 0 &&
-      (d->option_flags & GRIB_DUMP_FLAG_READ_ONLY) == 0)
-    return;
+    if( (a->flags & GRIB_ACCESSOR_FLAG_READ_ONLY) != 0 &&
+            (d->option_flags & GRIB_DUMP_FLAG_READ_ONLY) == 0)
+        return;
 
-  set_begin_end(d,a);
+    set_begin_end(d,a);
 
 
-  print_offset(self->dumper.out,self->begin,self->theEnd);
+    print_offset(self->dumper.out,self->begin,self->theEnd);
 
-  if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
+    if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
         fprintf(self->dumper.out,"%s ",a->creator->op);
 
-  if (size>1) {
-	int cols=19;
-	int count=0;
-	fprintf(self->dumper.out,"%s = { \t",a->name);
-	for (i=0;i<size;i++) {
-		if (count>cols) {fprintf(self->dumper.out,"\n\t\t\t\t");count=0;}
-		fprintf(self->dumper.out,"%ld ",values[i]);
-		count++;
-	}
-	fprintf(self->dumper.out,"}\n");
-	grib_context_free(a->context,values);
-  } else {
-	  if( ((a->flags & GRIB_ACCESSOR_FLAG_CAN_BE_MISSING) != 0) && grib_is_missing_internal(a) )
-		fprintf(self->dumper.out,"%s = MISSING",a->name);
-	  else
-		fprintf(self->dumper.out,"%s = %ld",a->name,value);
+    if (size>1) {
+        int cols=19;
+        int count=0;
+        fprintf(self->dumper.out,"%s = { \t",a->name);
+        if (values) {
+            for (i=0;i<size;i++) {
+                if (count>cols) {fprintf(self->dumper.out,"\n\t\t\t\t");count=0;}
+                fprintf(self->dumper.out,"%ld ",values[i]);
+                count++;
+            }
+            fprintf(self->dumper.out,"}\n");
+            grib_context_free(a->context,values);
+        }
+    } else {
+        if( ((a->flags & GRIB_ACCESSOR_FLAG_CAN_BE_MISSING) != 0) && grib_is_missing_internal(a) )
+            fprintf(self->dumper.out,"%s = MISSING",a->name);
+        else
+            fprintf(self->dumper.out,"%s = %ld",a->name,value);
 
-	  print_hexadecimal(self->dumper.out,d->option_flags,a);
+        print_hexadecimal(self->dumper.out,d->option_flags,a);
 
-	  if(comment) fprintf(self->dumper.out," [%s]",comment);
-  }
-  if(err)
-    fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_long]",err,grib_get_error_message(err));
+        if(comment) fprintf(self->dumper.out," [%s]",comment);
+    }
+    if(err)
+        fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_long]",err,grib_get_error_message(err));
 
-  aliases(d,a);
+    aliases(d,a);
 
 
-  fprintf(self->dumper.out,"\n");
+    fprintf(self->dumper.out,"\n");
 }
 
 static int test_bit(long a, long b) {return a&(1<<b);}
 
 static void dump_bits(grib_dumper* d,grib_accessor* a,const char* comment)
 {
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
-  int i;
-  long value = 0; size_t size = 1;
-  int err = grib_unpack_long(a,&value,&size);
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    int i;
+    long value = 0; size_t size = 1;
+    int err = grib_unpack_long(a,&value,&size);
 
-  if( a->length == 0  &&
-      (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0)
-    return;
+    if( a->length == 0  &&
+            (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0)
+        return;
 
-  set_begin_end(d,a);
+    set_begin_end(d,a);
 
-  /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
-  print_offset(self->dumper.out,self->begin,self->theEnd);
-  if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
+    /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
+    print_offset(self->dumper.out,self->begin,self->theEnd);
+    if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
         fprintf(self->dumper.out,"%s ",a->creator->op);
 
-  fprintf(self->dumper.out,"%s = %ld [",a->name,value);
+    fprintf(self->dumper.out,"%s = %ld [",a->name,value);
 
-  for(i=0;i<(a->length*8);i++) {
-    if(test_bit(value,a->length*8-i-1))
-      fprintf(self->dumper.out,"1");
-    else
-      fprintf(self->dumper.out,"0");
-  }
-/*
+    for(i=0;i<(a->length*8);i++) {
+        if(test_bit(value,a->length*8-i-1))
+            fprintf(self->dumper.out,"1");
+        else
+            fprintf(self->dumper.out,"0");
+    }
+    /*
   if(comment)
     fprintf(self->dumper.out,":%s]",comment);
   else
-*/
-  fprintf(self->dumper.out,"]");
+     */
+    fprintf(self->dumper.out,"]");
 
-  if (err==0) print_hexadecimal(self->dumper.out,d->option_flags,a);
+    if (err==0) print_hexadecimal(self->dumper.out,d->option_flags,a);
 
-  if(err)
-    fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_bits]",err,grib_get_error_message(err));
+    if(err)
+        fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_bits]",err,grib_get_error_message(err));
 
-  aliases(d,a);
-  fprintf(self->dumper.out,"\n");
+    aliases(d,a);
+    fprintf(self->dumper.out,"\n");
 }
 
 static void dump_double(grib_dumper* d,grib_accessor* a,const char* comment)
 {
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
-  double value; size_t size = 1;
-  int err = grib_unpack_double(a,&value,&size);
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    double value; size_t size = 1;
+    int err = grib_unpack_double(a,&value,&size);
 
 
-  if( a->length == 0  &&
-      (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0)
-    return;
+    if( a->length == 0  &&
+            (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0)
+        return;
 
-  set_begin_end(d,a);
+    set_begin_end(d,a);
 
-  /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
+    /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
 
-  print_offset(self->dumper.out,self->begin,self->theEnd);
-  if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
+    print_offset(self->dumper.out,self->begin,self->theEnd);
+    if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
         fprintf(self->dumper.out,"%s ",a->creator->op);
 
-  if( ((a->flags & GRIB_ACCESSOR_FLAG_CAN_BE_MISSING) != 0) && grib_is_missing_internal(a))
-    fprintf(self->dumper.out,"%s = MISSING",a->name);
-  else
-    fprintf(self->dumper.out,"%s = %g",a->name,value);
-  /*if(comment) fprintf(self->dumper.out," [%s]",comment);*/
+    if( ((a->flags & GRIB_ACCESSOR_FLAG_CAN_BE_MISSING) != 0) && grib_is_missing_internal(a))
+        fprintf(self->dumper.out,"%s = MISSING",a->name);
+    else
+        fprintf(self->dumper.out,"%s = %g",a->name,value);
+    /*if(comment) fprintf(self->dumper.out," [%s]",comment);*/
 
-  if (err==0) print_hexadecimal(self->dumper.out,d->option_flags,a);
+    if (err==0) print_hexadecimal(self->dumper.out,d->option_flags,a);
 
-  if(err)
-    fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_double]",err,grib_get_error_message(err));
-  aliases(d,a);
-  fprintf(self->dumper.out,"\n");
+    if(err)
+        fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_double]",err,grib_get_error_message(err));
+    aliases(d,a);
+    fprintf(self->dumper.out,"\n");
 }
 
 static void dump_string(grib_dumper* d,grib_accessor* a,const char* comment)
 {
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
-  size_t size=0;
-  char *value=NULL;
-  char *p=NULL;
-  int err = _grib_get_string_length(a,&size);
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    size_t size=0;
+    char *value=NULL;
+    char *p=NULL;
+    int err = _grib_get_string_length(a,&size);
 
-  value=(char*)grib_context_malloc_clear(a->context,size);
-  if (!value) {
-  	grib_context_log(a->context,GRIB_LOG_FATAL,"unable to allocate %d bytes",(int)size);
-	return;
-  }
-  err=grib_unpack_string(a,value,&size);
-  p=value;
+    value=(char*)grib_context_malloc_clear(a->context,size);
+    if (!value) {
+        grib_context_log(a->context,GRIB_LOG_FATAL,"unable to allocate %d bytes",(int)size);
+        return;
+    }
+    err=grib_unpack_string(a,value,&size);
+    p=value;
 
-  if( a->length == 0  &&
-      (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0) {
-	grib_context_free(a->context,value);
-    return;
-  }
+    if( a->length == 0  &&
+            (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0) {
+        grib_context_free(a->context,value);
+        return;
+    }
 
-  set_begin_end(d,a);
+    set_begin_end(d,a);
 
-  while(*p) { if(!isprint(*p)) *p = '.'; p++; }
+    while(*p) { if(!isprint(*p)) *p = '.'; p++; }
 
-  /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
-  print_offset(self->dumper.out,self->begin,self->theEnd);
-  if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
+    /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
+    print_offset(self->dumper.out,self->begin,self->theEnd);
+    if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
         fprintf(self->dumper.out,"%s ",a->creator->op);
 
-  fprintf(self->dumper.out,"%s = %s",a->name,value);
+    fprintf(self->dumper.out,"%s = %s",a->name,value);
 
-  if (err==0) print_hexadecimal(self->dumper.out,d->option_flags,a);
+    if (err==0) print_hexadecimal(self->dumper.out,d->option_flags,a);
 
-  /*if(comment) fprintf(self->dumper.out," [%s]",comment);*/
-  if(err)
-    fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_string]",err,grib_get_error_message(err));
-  aliases(d,a);
-  fprintf(self->dumper.out,"\n");
-  if (value) grib_context_free(a->context,value);
+    /*if(comment) fprintf(self->dumper.out," [%s]",comment);*/
+    if(err)
+        fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_string]",err,grib_get_error_message(err));
+    aliases(d,a);
+    fprintf(self->dumper.out,"\n");
+    if (value) grib_context_free(a->context,value);
 }
 
 static void dump_bytes(grib_dumper* d,grib_accessor* a,const char* comment)
 {
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
-  int i,k,err =0;
-  int more = 0;
-  size_t size = a->length;
-  unsigned char* buf = (unsigned char*)grib_context_malloc(d->handle->context,size);
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    int i,k,err =0;
+    int more = 0;
+    size_t size = a->length;
+    unsigned char* buf = (unsigned char*)grib_context_malloc(d->handle->context,size);
 
-  if( a->length == 0  &&
-      (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0)
-    return;
+    if( a->length == 0  &&
+            (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0)
+        return;
 
-  set_begin_end(d,a);
+    set_begin_end(d,a);
 
-  /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
-  print_offset(self->dumper.out,self->begin,self->theEnd);
-  if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
+    /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
+    print_offset(self->dumper.out,self->begin,self->theEnd);
+    if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
         fprintf(self->dumper.out,"%s ",a->creator->op);
 
-  fprintf(self->dumper.out,"%s = %ld",a->name,a->length);
-  aliases(d,a);
-  fprintf(self->dumper.out," {");
+    fprintf(self->dumper.out,"%s = %ld",a->name,a->length);
+    aliases(d,a);
+    fprintf(self->dumper.out," {");
 
-  if(!buf)
-  {
-    if(size == 0)
-      fprintf(self->dumper.out,"}\n");
-    else
-      fprintf(self->dumper.out," *** ERR cannot malloc(%ld) }\n",(long)size);
-    return;
-  }
-
-  print_hexadecimal(self->dumper.out,d->option_flags,a);
-
-  fprintf(self->dumper.out,"\n");
-
-  err = grib_unpack_bytes(a,buf,&size);
-  if(err){
-    grib_context_free(d->handle->context,buf);
-    fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_bytes]\n}",err,grib_get_error_message(err));
-    return ;
-  }
-
-  if(size > 100) {
-    more = size - 100;
-    size = 100;
-  }
-
-  k = 0;
-  /* if(size > 100) size = 100;  */
-  while(k < size)
-  {
-    int j;
-    for(i = 0; i < d->depth + 3 ; i++) fprintf(self->dumper.out," ");
-    for(j = 0; j < 16 && k < size; j++, k++)
+    if(!buf)
     {
-      fprintf(self->dumper.out,"%02x",buf[k]);
-      if(k != size-1)
-        fprintf(self->dumper.out,", ");
+        if(size == 0)
+            fprintf(self->dumper.out,"}\n");
+        else
+            fprintf(self->dumper.out," *** ERR cannot malloc(%ld) }\n",(long)size);
+        return;
     }
+
+    print_hexadecimal(self->dumper.out,d->option_flags,a);
+
     fprintf(self->dumper.out,"\n");
-  }
 
-  if(more)
-  {
-    for(i = 0; i < d->depth + 3 ; i++) fprintf(self->dumper.out," ");
-    fprintf(self->dumper.out,"... %d more values\n",more);
-  }
+    err = grib_unpack_bytes(a,buf,&size);
+    if(err){
+        grib_context_free(d->handle->context,buf);
+        fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_bytes]\n}",err,grib_get_error_message(err));
+        return ;
+    }
 
-  for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");
-  fprintf(self->dumper.out,"} # %s %s \n",a->creator->op, a->name);
-  grib_context_free(d->handle->context,buf);
+    if(size > 100) {
+        more = size - 100;
+        size = 100;
+    }
+
+    k = 0;
+    /* if(size > 100) size = 100;  */
+    while(k < size)
+    {
+        int j;
+        for(i = 0; i < d->depth + 3 ; i++) fprintf(self->dumper.out," ");
+        for(j = 0; j < 16 && k < size; j++, k++)
+        {
+            fprintf(self->dumper.out,"%02x",buf[k]);
+            if(k != size-1)
+                fprintf(self->dumper.out,", ");
+        }
+        fprintf(self->dumper.out,"\n");
+    }
+
+    if(more)
+    {
+        for(i = 0; i < d->depth + 3 ; i++) fprintf(self->dumper.out," ");
+        fprintf(self->dumper.out,"... %d more values\n",more);
+    }
+
+    for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");
+    fprintf(self->dumper.out,"} # %s %s \n",a->creator->op, a->name);
+    grib_context_free(d->handle->context,buf);
 }
 
 static void dump_values(grib_dumper* d,grib_accessor* a)
 {
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
-  int k,err =0;
-  int more = 0;
-  double*  buf = NULL;
-  size_t size=0;
-  long count=0;
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    int k,err =0;
+    int more = 0;
+    double*  buf = NULL;
+    size_t size=0;
+    long count=0;
 
-  if( a->length == 0  &&
-      (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0)
-    return;
+    if( a->length == 0  &&
+            (d->option_flags & GRIB_DUMP_FLAG_CODED) != 0)
+        return;
 
-  grib_value_count(a,&count);
-  size=count;
+    grib_value_count(a,&count);
+    size=count;
 
-  if(size == 1){
-    dump_double(d,a,NULL);
-    return ;
-  }
-  buf = (double*)grib_context_malloc(d->handle->context,size * sizeof(double));
+    if(size == 1){
+        dump_double(d,a,NULL);
+        return ;
+    }
+    buf = (double*)grib_context_malloc(d->handle->context,size * sizeof(double));
 
-  set_begin_end(d,a);
+    set_begin_end(d,a);
 
-  /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
-  print_offset(self->dumper.out,self->begin,self->theEnd);
-  if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
+    /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
+    print_offset(self->dumper.out,self->begin,self->theEnd);
+    if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0)
         fprintf(self->dumper.out,"%s ",a->creator->op);
 
-  fprintf(self->dumper.out,"%s = (%ld,%ld)",a->name,(long)size,a->length);
-  aliases(d,a);
-  fprintf(self->dumper.out," {");
+    fprintf(self->dumper.out,"%s = (%ld,%ld)",a->name,(long)size,a->length);
+    aliases(d,a);
+    fprintf(self->dumper.out," {");
 
-  if(!buf)
-  {
-    if(size == 0)
-      fprintf(self->dumper.out,"}\n");
-    else
-      fprintf(self->dumper.out," *** ERR cannot malloc(%ld) }\n",(long)size);
-    return;
-  }
-
-  fprintf(self->dumper.out,"\n");
-
-  err =  grib_unpack_double(a,buf,&size);
-
-  if(err){
-    grib_context_free(d->handle->context,buf);
-    fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_values]\n}",err,grib_get_error_message(err));
-    return ;
-  }
-
-  if(size > 100) {
-    more = size - 100;
-    size = 100;
-  }
-
-
-  k = 0;
-  while(k < size)
-  {
-#if 1
-    int j;
-    /*for(i = 0; i < d->depth + 3 ; i++) fprintf(self->dumper.out," ");*/
-    for(j = 0; j < 8 && k < size; j++, k++)
+    if(!buf)
     {
-      fprintf(self->dumper.out,"%.10e",buf[k]);
-      if(k != size-1)
-        fprintf(self->dumper.out,", ");
+        if(size == 0)
+            fprintf(self->dumper.out,"}\n");
+        else
+            fprintf(self->dumper.out," *** ERR cannot malloc(%ld) }\n",(long)size);
+        return;
     }
+
     fprintf(self->dumper.out,"\n");
+
+    err =  grib_unpack_double(a,buf,&size);
+
+    if(err){
+        grib_context_free(d->handle->context,buf);
+        fprintf(self->dumper.out," *** ERR=%d (%s) [grib_dumper_wmo::dump_values]\n}",err,grib_get_error_message(err));
+        return ;
+    }
+
+    if(size > 100) {
+        more = size - 100;
+        size = 100;
+    }
+
+
+    k = 0;
+    while(k < size)
+    {
+#if 1
+        int j;
+        /*for(i = 0; i < d->depth + 3 ; i++) fprintf(self->dumper.out," ");*/
+        for(j = 0; j < 8 && k < size; j++, k++)
+        {
+            fprintf(self->dumper.out,"%.10e",buf[k]);
+            if(k != size-1)
+                fprintf(self->dumper.out,", ");
+        }
+        fprintf(self->dumper.out,"\n");
 #else
 
-    fprintf(self->dumper.out,"%d %g\n",k,buf[k]);
+        fprintf(self->dumper.out,"%d %g\n",k,buf[k]);
 
 #endif
 
-  }
-  if(more)
-  {
-    /*for(i = 0; i < d->depth + 3 ; i++) fprintf(self->dumper.out," ");*/
-    fprintf(self->dumper.out,"... %d more values\n",more);
-  }
+    }
+    if(more)
+    {
+        /*for(i = 0; i < d->depth + 3 ; i++) fprintf(self->dumper.out," ");*/
+        fprintf(self->dumper.out,"... %d more values\n",more);
+    }
 
-  /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
-  fprintf(self->dumper.out,"} # %s %s \n",a->creator->op, a->name);
-  grib_context_free(d->handle->context,buf);
+    /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
+    fprintf(self->dumper.out,"} # %s %s \n",a->creator->op, a->name);
+    grib_context_free(d->handle->context,buf);
 }
 
 static void dump_label(grib_dumper* d,grib_accessor* a,const char* comment)
 {
-  /*grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    /*grib_dumper_wmo *self = (grib_dumper_wmo*)d;
 
   for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");
   fprintf(self->dumper.out,"----> %s %s %s\n",a->creator->op, a->name,comment?comment:"");*/
@@ -495,145 +496,145 @@ static void dump_label(grib_dumper* d,grib_accessor* a,const char* comment)
 
 static void dump_section(grib_dumper* d,grib_accessor* a,grib_block_of_accessors* block)
 {
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
-  grib_section* s = a->sub_section;
-  int is_wmo_section=0;
-  char* upper=NULL;
-  char tmp[512];
-  char *p=NULL,*q=NULL;
-  if (!strncmp(a->name,"section",7)) is_wmo_section=1;
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    grib_section* s = a->sub_section;
+    int is_wmo_section=0;
+    char* upper=NULL;
+    char tmp[512];
+    char *p=NULL,*q=NULL;
+    if (!strncmp(a->name,"section",7)) is_wmo_section=1;
+
+    /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
+    if (is_wmo_section) {
+        upper=(char*)malloc(strlen(a->name)+1);
+        p=(char*)a->name;
+        q=upper;
+        while (*p != '\0') {
+            *q=toupper(*p);
+            q++;
+            p++;
+        }
+        *q='\0';
+        sprintf(tmp,"%s ( length=%ld, padding=%ld )",upper,(long)s->length,(long)s->padding);
+        fprintf(self->dumper.out,"======================   %-35s   ======================\n",tmp);
+        free(upper);
+        self->section_offset=a->offset;
+    } else {
 
-  /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
-  if (is_wmo_section) {
-    upper=(char*)malloc(strlen(a->name)+1);
-    p=(char*)a->name;
-    q=upper;
-    while (*p != '\0') {
-      *q=toupper(*p);
-      q++;
-      p++;
     }
-    *q='\0';
-    sprintf(tmp,"%s ( length=%ld, padding=%ld )",upper,(long)s->length,(long)s->padding);
-    fprintf(self->dumper.out,"======================   %-35s   ======================\n",tmp);
-    free(upper);
-    self->section_offset=a->offset;
-  } else {
 
-  }
+    /*printf("------------- section_offset = %ld\n",self->section_offset);*/
+    d->depth += 3;
+    grib_dump_accessors_block(d,block);
+    d->depth -= 3;
 
-  /*printf("------------- section_offset = %ld\n",self->section_offset);*/
-  d->depth += 3;
-  grib_dump_accessors_block(d,block);
-  d->depth -= 3;
-
-  /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
-  /*fprintf(self->dumper.out,"<===== %s %s\n",a->creator->op, a->name);*/
+    /*for(i = 0; i < d->depth ; i++) fprintf(self->dumper.out," ");*/
+    /*fprintf(self->dumper.out,"<===== %s %s\n",a->creator->op, a->name);*/
 }
 
 static void set_begin_end(grib_dumper* d,grib_accessor* a) {
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
-  if ((d->option_flags & GRIB_DUMP_FLAG_OCTECT) != 0) {
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    if ((d->option_flags & GRIB_DUMP_FLAG_OCTECT) != 0) {
 
-    self->begin=a->offset-self->section_offset+1;
-    self->theEnd=grib_get_next_position_offset(a)-self->section_offset;
-  } else {
-    self->begin=a->offset;
-    self->theEnd=grib_get_next_position_offset(a);
-  }
+        self->begin=a->offset-self->section_offset+1;
+        self->theEnd=grib_get_next_position_offset(a)-self->section_offset;
+    } else {
+        self->begin=a->offset;
+        self->theEnd=grib_get_next_position_offset(a);
+    }
 }
 
 static void print_offset(FILE* out,long begin,long theEnd) {
-  char tmp[50];
-  if (begin == theEnd)
-    fprintf(out,"%-10ld" ,begin);
-  else {
-    sprintf(tmp,"%ld-%ld" ,begin,theEnd);
-    fprintf(out,"%-10s",tmp);
-  }
+    char tmp[50];
+    if (begin == theEnd)
+        fprintf(out,"%-10ld" ,begin);
+    else {
+        sprintf(tmp,"%ld-%ld" ,begin,theEnd);
+        fprintf(out,"%-10s",tmp);
+    }
 }
 
 static void print_hexadecimal(FILE* out,unsigned long flags,grib_accessor* a) {
-  int i=0;
-  unsigned long offset=0;
-  grib_handle* h=grib_handle_of_accessor(a);
-  if ((flags & GRIB_DUMP_FLAG_HEXADECIMAL) != 0 && a->length != 0) {
-    fprintf(out," (");
-    offset=a->offset;
-    for (i=0;i<a->length;i++) {
-      fprintf(out," 0x%.2X",h->buffer->data[offset]);
-      offset++;
+    int i=0;
+    unsigned long offset=0;
+    grib_handle* h=grib_handle_of_accessor(a);
+    if ((flags & GRIB_DUMP_FLAG_HEXADECIMAL) != 0 && a->length != 0) {
+        fprintf(out," (");
+        offset=a->offset;
+        for (i=0;i<a->length;i++) {
+            fprintf(out," 0x%.2X",h->buffer->data[offset]);
+            offset++;
+        }
+        fprintf(out," )");
     }
-    fprintf(out," )");
-  }
 }
 
 
 static void dump_string_array(grib_dumper* d,grib_accessor* a,const char* comment)
 {
-  grib_dumper_wmo *self = (grib_dumper_wmo*)d;
-  char **values;
-  size_t size = 0,i=0;
-  grib_context* c=NULL;
-  int err = 0;
-  int tab=0;
-  long count=0;
+    grib_dumper_wmo *self = (grib_dumper_wmo*)d;
+    char **values;
+    size_t size = 0,i=0;
+    grib_context* c=NULL;
+    int err = 0;
+    int tab=0;
+    long count=0;
 
-  c=a->context;
+    c=a->context;
 
-  grib_value_count(a,&count);
-  if (count==0) return;
-  size=count;
-  if (size==1) {
-    dump_string(d,a,comment);
-    return;
-  }
+    grib_value_count(a,&count);
+    if (count==0) return;
+    size=count;
+    if (size==1) {
+        dump_string(d,a,comment);
+        return;
+    }
 
-  values=(char**)grib_context_malloc_clear(c,size*sizeof(char*));
-  if (!values) {
-    grib_context_log(c,GRIB_LOG_FATAL,"unable to allocate %d bytes",(int)size);
-  return;
-  }
+    values=(char**)grib_context_malloc_clear(c,size*sizeof(char*));
+    if (!values) {
+        grib_context_log(c,GRIB_LOG_FATAL,"unable to allocate %d bytes",(int)size);
+        return;
+    }
 
-  err = grib_unpack_string_array(a,values,&size);
+    err = grib_unpack_string_array(a,values,&size);
 
-  if ( (a->flags & GRIB_ACCESSOR_FLAG_DUMP) == 0)
-    return;
+    if ( (a->flags & GRIB_ACCESSOR_FLAG_DUMP) == 0)
+        return;
 
 
-  /* print_offset(self->dumper.out,d,a); */
-  print_offset(self->dumper.out,self->begin,self->theEnd);
+    /* print_offset(self->dumper.out,d,a); */
+    print_offset(self->dumper.out,self->begin,self->theEnd);
 
-  if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0) {
-    fprintf(self->dumper.out,"  ");
-    fprintf(self->dumper.out,"# type %s \n",a->creator->op);
-  }
+    if ((d->option_flags & GRIB_DUMP_FLAG_TYPE) != 0) {
+        fprintf(self->dumper.out,"  ");
+        fprintf(self->dumper.out,"# type %s \n",a->creator->op);
+    }
 
-  aliases(d,a);
-  if(comment) {
-    fprintf(self->dumper.out,"  ");
-    fprintf(self->dumper.out,"# %s \n",comment);
-  }
-  if (a->flags & GRIB_ACCESSOR_FLAG_READ_ONLY) {
-    fprintf(self->dumper.out,"  ");
-    fprintf(self->dumper.out,"#-READ ONLY- ");
-    tab=13;
-  } else
-    fprintf(self->dumper.out,"  ");
+    aliases(d,a);
+    if(comment) {
+        fprintf(self->dumper.out,"  ");
+        fprintf(self->dumper.out,"# %s \n",comment);
+    }
+    if (a->flags & GRIB_ACCESSOR_FLAG_READ_ONLY) {
+        fprintf(self->dumper.out,"  ");
+        fprintf(self->dumper.out,"#-READ ONLY- ");
+        tab=13;
+    } else
+        fprintf(self->dumper.out,"  ");
 
-  tab++;
-  fprintf(self->dumper.out,"%s = {\n",a->name);
-  for  (i=0;i<size;i++) {
-      fprintf(self->dumper.out,"%-*s\"%s\",\n",(int)(tab+strlen(a->name)+4)," ",values[i]);
-  }
-  fprintf(self->dumper.out,"  }");
+    tab++;
+    fprintf(self->dumper.out,"%s = {\n",a->name);
+    for  (i=0;i<size;i++) {
+        fprintf(self->dumper.out,"%-*s\"%s\",\n",(int)(tab+strlen(a->name)+4)," ",values[i]);
+    }
+    fprintf(self->dumper.out,"  }");
 
-  if(err) {
-    fprintf(self->dumper.out,"  ");
-    fprintf(self->dumper.out,"# *** ERR=%d (%s)",err,grib_get_error_message(err));
-  }
+    if(err) {
+        fprintf(self->dumper.out,"  ");
+        fprintf(self->dumper.out,"# *** ERR=%d (%s)",err,grib_get_error_message(err));
+    }
 
-  fprintf(self->dumper.out,"\n");
-  grib_context_free(c,values);
+    fprintf(self->dumper.out,"\n");
+    grib_context_free(c,values);
 }