removed flag CMP_CODE

ChangeLog

@@ -5,6 +5,7 @@
 
 2015-06-03  Uwe Schulzweida
 
+	* removed flag CMP_CODE
 	* replace: compare only parameter name; removed check of parameter number
 	* setpartabn: replace vlistDefVarCode() by vlistDefVarParam()
 

src/Mergegrid.c

@@ -197,7 +197,7 @@ void *Mergegrid(void *argument)
 
   vlistID2 = streamInqVlist(streamID2);
 
-  vlistCompare(vlistID1, vlistID2, CMP_CODE | CMP_NLEVEL);
+  vlistCompare(vlistID1, vlistID2, CMP_NAME | CMP_NLEVEL);
 
   ndiffgrids = 0;
   for ( index = 1; index < vlistNgrids(vlistID1); index++ )

src/cdo_vlist.c

@@ -177,10 +177,6 @@ void vlistCompare(int vlistID1, int vlistID2, int flag)
     {
       if ( nvars > 1 )
 	{
-	  if ( flag & CMP_CODE )
-	    if ( vlistInqVarCode(vlistID1, varID) != vlistInqVarCode(vlistID2, varID) )
-	      cdoAbort("Input streams have different structure!");
-
 	  if ( flag & CMP_NAME )
 	    {
 	      char name1[CDI_MAX_NAME], name2[CDI_MAX_NAME];

src/functs.h

@@ -48,11 +48,10 @@
 #define  func_lat      99
 
 enum cmp_flag {
-  CMP_CODE     = 1,
-  CMP_NAME     = 2,
-  CMP_GRID     = 4,
-  CMP_NLEVEL   = 8,
-  CMP_GRIDSIZE = 16,
+  CMP_NAME     = 1,
+  CMP_GRID     = 2,
+  CMP_NLEVEL   = 4,
+  CMP_GRIDSIZE = 8,
   CMP_HRD      = CMP_NAME | CMP_GRIDSIZE,
   CMP_DIM      =            CMP_GRIDSIZE | CMP_NLEVEL | CMP_GRID,
   CMP_ALL      = CMP_NAME | CMP_GRIDSIZE | CMP_NLEVEL | CMP_GRID