Docu update

OPERATORS

@@ -41,6 +41,7 @@ Operator catalog:
    Copy          copy            Copy datasets
    Copy          cat             Concatenate datasets
    Replace       replace         Replace variables
+   Mergegrid     mergegrid       Merge grid
    Merge         merge           Merge datasets with different fields
    Merge         mergetime       Merge datasets sorted by date and time
    Split         splitcode       Split code numbers

doc/tex/Modules

@@ -6,6 +6,7 @@ Showinfo      Information
 Filedes       Information
 Copy	      File operations
 Replace	      File operations
+Mergegrid     File operations
 Merge	      File operations
 Split	      File operations
 Splittime     File operations

doc/tex/cdo.tex

@@ -163,7 +163,7 @@
 \end{picture}
 
 \begin{flushright}
-\large\bf{Climate Data Operators \\ Version 1.5.9 \\ December 2012}
+\large\bf{Climate Data Operators \\ Version 1.6.0 \\ March 2013}
 \end{flushright}
 
 \vfill

doc/tex/cdoprog.tex

@@ -14,7 +14,7 @@
 \put(0,0.0){\line(1,0){3.95}}
 \end{picture}
 \begin{flushright}
-{\small{Climate Data Operators \\ Version 1.5.9 \\ December 2012}}
+{\small{Climate Data Operators \\ Version 1.6.0 \\ March 2013}}
 \end{flushright}
 
 \vspace*{0mm}

doc/tex/mod/Mergegrid

 @BeginModule
-@NewPage
 @Name      = Merge grid
 @Title     = Merge grid
 @Section   = File operations
@@ -13,10 +12,10 @@
 @Title     = Merge grid
 
 @BeginDescription
-Merges all variables from @file{ifile2} to @file{ifile1} and write the result to @file{ofile}.
-Only the non missing values of @file{ifile2} will be used. The grid of @file{ifile2} should 
-be smaller or equal to the grid of @file{ifile1}. All grid points of @file{ifile2} have to fit
-into the grid of @file{ifile1}. Both input files need to have the same variables and the 
-same number of timesteps.
+Merges grid points of all variables from @file{ifile2} to @file{ifile1} and write the result to @file{ofile}.
+Only the non missing values of @file{ifile2} will be used. The horizontal grid of @file{ifile2} should 
+be smaller or equal to the grid of @file{ifile1} and the resolution must be the same.
+Only regular rectangular grids are supported. Both input files need to have the same variables 
+and the same number of timesteps.
 @EndDescription
 @EndOperator

doc/tex/mod/Zonstat

@@ -12,7 +12,7 @@ This module computes zonal statistical values of the input fields.
 According to the chosen operator the zonal minimum, maximum, 
 sum, average, variance, standard deviation or a certain percentile
 is written to @file{ofile}. All input fields need to have the same
-regular lonlat grid. 
+regular lon/lat grid. 
 @EndDescription
 @EndModule
 

src/operator_help.h

@@ -217,6 +217,22 @@ static char *ReplaceHelp[] = {
     NULL
 };
 
+static char *Merge gridHelp[] = {
+    "NAME",
+    "    mergegrid - Merge grid",
+    "",
+    "SYNOPSIS",
+    "    mergegrid  ifile1 ifile2 ofile",
+    "",
+    "DESCRIPTION",
+    "    Merges grid points of all variables from ifile2 to ifile1 and write the result to ofile.",
+    "    Only the non missing values of ifile2 will be used. The horizontal grid of ifile2 should ",
+    "    be smaller or equal to the grid of ifile1 and the resolution must be the same.",
+    "    Only regular rectangular grids are supported. Both input files need to have the same variables ",
+    "    and the same number of timesteps.",
+    NULL
+};
+
 static char *MergeHelp[] = {
     "NAME",
     "    merge, mergetime - Merge datasets",
@@ -1629,7 +1645,7 @@ static char *ZonstatHelp[] = {
     "    According to the chosen operator the zonal minimum, maximum, ",
     "    sum, average, variance, standard deviation or a certain percentile",
     "    is written to ofile. All input fields need to have the same",
-    "    regular lonlat grid. ",
+    "    regular lon/lat grid. ",
     "",
     "OPERATORS",
     "    zonmin   Zonal minimum",