Docu update

ChangeLog

-2012-01-??  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
+2012-01-30  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 
 	* using CDI library version 1.5.4
 	* Version 1.5.4 released

NEWS

 CDO NEWS
 --------
 
-Version 1.5.4 (?? January 2012):
+Version 1.5.4 (30 January 2012):
 
    New features:
      * setgridtype: added parameter lonlat to convert curvilinear to regular lon/lat grids

doc/tex/cdoprog.tex

@@ -41,7 +41,7 @@
 \makebox[0.85in][l]{{\bf{-a}}                  } & \makebox[2.76in][l]{Generate an absolute time axis} \\ %\hline
 \makebox[0.85in][l]{{\bf{-b}} $<\!nbits\!>$    } & \makebox[2.76in][l]{Set the number of bits for the output precision} \\
                                                  & (I8/I16/I32/F32/F64 for nc,nc2,nc4,nc4c; \\
-                                                 &  F32/F64 for srv,ext,ieg;  1-24 for grb,grb2) \\
+                                                 &  F32/F64 for grb2,srv,ext,ieg;  1-24 for grb,grb2) \\
                                                  & Add L or B for Little or Big endian byteorder\\ %\hline
 \makebox[0.85in][l]{{\bf{-f}} $<\!format\!>$   } & \makebox[2.76in][l]{Outputformat: grb,grb2,nc,nc2,nc4,nc4c,srv,ext,ieg} \\ %\hline
 \makebox[0.85in][l]{{\bf{-g}} $<\!grid\!>$     } & \makebox[2.76in][l]{Grid or file name} \\

doc/tex/usage.tex

@@ -24,9 +24,9 @@ The following options are available for all operators:
               \hline
               \rowcolor{pcolor2}
                 \sl $<$format$>$ & \sl $<$nbits$>$ \\
-                {\tt grb, grb2}           & {\tt 1 - 24}              \\
+                {\tt grb, grb2}           & {\tt P1 - P24}              \\
                 {\tt nc, nc2, nc4, nc4c}  & {\tt I8/I16/I32/F32/F64}  \\
-                {\tt srv, ext, ieg}       & {\tt F32/F64}             \\
+                {\tt grb2, srv, ext, ieg}       & {\tt F32/F64}             \\
               \hline
               \end{tabular}
               \vspace*{1mm}

src/cdo.c

@@ -187,7 +187,7 @@ void usage(void)
   fprintf(stderr, "  Options:\n");
   fprintf(stderr, "    -a             Generate an absolute time axis\n");
   fprintf(stderr, "    -b <nbits>     Set the number of bits for the output precision\n");
-  fprintf(stderr, "                   (I8/I16/I32/F32/F64 for nc/nc2/nc4/nc4c; F32/F64 for srv/ext/ieg; 1 - 24 for grb/grb2)\n");
+  fprintf(stderr, "                   (I8/I16/I32/F32/F64 for nc/nc2/nc4/nc4c; F32/F64 for grb2/srv/ext/ieg; P1 - P24 for grb/grb2)\n");
   fprintf(stderr, "                   Add L or B to set the byteorder to Little or Big endian\n");
   fprintf(stderr, "    -f <format>    Format of the output file. (grb/grb2/nc/nc2/nc4/nc4c/srv/ext/ieg)\n");
   fprintf(stderr, "    -g <grid>      Set default grid name or file. Available grids: \n");
@@ -409,7 +409,7 @@ void setDefaultDataType(char *datatypestr)
 	  else
 	    {
 	      fprintf(stderr, "Unsupported number of bits %d!\n", nbits);
-	      fprintf(stderr, "Use I8/I16/I32/F32/F64 for nc/nc2/nc4/nc4c; F32/F64 for srv/ext/ieg; 1 - 24 for grb/grb2.\n");
+	      fprintf(stderr, "Use I8/I16/I32/F32/F64 for nc/nc2/nc4/nc4c; F32/F64 for grb2/srv/ext/ieg; P1 - P24 for grb/grb2.\n");
 	      exit(EXIT_FAILURE);
 	    }
 	}
@@ -568,7 +568,7 @@ void setDefaultFileType(char *filetypestr, int labort)
 	      fprintf(stderr, "Unexpected character >%c< in file type >%s<!\n", *ftstr, filetypestr);
 	      fprintf(stderr, "Use format[_nbits] with:\n");
 	      fprintf(stderr, "    format = grb, grb2, nc, nc2, nc4, nc4c, srv, ext or ieg\n");
-	      fprintf(stderr, "    nbits  = 32/64 for nc/nc2/nc4/nc4c/srv/ext/ieg; 1 - 24 for grb/grb2\n");
+	      fprintf(stderr, "    nbits  = 32/64 for grb2/nc/nc2/nc4/nc4c/srv/ext/ieg; 1 - 24 for grb/grb2\n");
 	      exit(EXIT_FAILURE);
 	    }
 	}