reactivate vlistInqVarID(), used in MPIOM

ChangeLog

@@ -23,7 +23,7 @@
 
 2012-06-20  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 
-	* cdf_write_var_data: bug fix for unscaled uint8, int8, int16,int32 (bug introduced in 1.5.5)
+	* cdf_write_var_data: bug fix for unscaled uint8, int8, int16, int32 (bug introduced in 1.5.5)
 
 2012-06-18  Uwe Schulzweida  <Uwe.Schulzweida@zmaw.de>
 

src/cdi.h

@@ -395,6 +395,9 @@ void    vlistInqVar(int vlistID, int varID, int *gridID, int *zaxisID, int *tste
 int     vlistInqVarGrid(int vlistID, int varID);
 int     vlistInqVarZaxis(int vlistID, int varID);
 
+/* used in MPIOM */
+int     vlistInqVarID(int vlistID, int code);
+
 int     vlistInqVarTsteptype(int vlistID, int varID);
 void    vlistDefVarTsteptype(int vlistID, int varID, int tsteptype);
 

src/cdi.inc

@@ -789,6 +789,14 @@
 !                                     INTEGER         varID)
       EXTERNAL        vlistInqVarZaxis
 
+!
+!  used in MPIOM
+!
+      INTEGER         vlistInqVarID
+!                                    (INTEGER         vlistID,
+!                                     INTEGER         code)
+      EXTERNAL        vlistInqVarID
+
       INTEGER         vlistInqVarTsteptype
 !                                    (INTEGER         vlistID,
 !                                     INTEGER         varID)

src/cdiFortran.c

@@ -162,6 +162,10 @@ FCALLSCSUB3 (vlistChangeVarZaxis, VLISTCHANGEVARZAXIS, vlistchangevarzaxis, INT,
 FCALLSCSUB5 (vlistInqVar, VLISTINQVAR, vlistinqvar, INT, INT, PINT, PINT, PINT)
 FCALLSCFUN2 (INT, vlistInqVarGrid, VLISTINQVARGRID, vlistinqvargrid, INT, INT)
 FCALLSCFUN2 (INT, vlistInqVarZaxis, VLISTINQVARZAXIS, vlistinqvarzaxis, INT, INT)
+
+/*  used in MPIOM  */
+
+FCALLSCFUN2 (INT, vlistInqVarID, VLISTINQVARID, vlistinqvarid, INT, INT)
 FCALLSCFUN2 (INT, vlistInqVarTsteptype, VLISTINQVARTSTEPTYPE, vlistinqvartsteptype, INT, INT)
 FCALLSCSUB3 (vlistDefVarTsteptype, VLISTDEFVARTSTEPTYPE, vlistdefvartsteptype, INT, INT, INT)
 FCALLSCSUB3 (vlistDefVarCompType, VLISTDEFVARCOMPTYPE, vlistdefvarcomptype, INT, INT, INT)

src/config.h.in

@@ -185,11 +185,6 @@
 /* Version number of package */
 #undef VERSION
 
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 

src/vlist_var.c

@@ -681,14 +681,14 @@ void vlistInqVarUnits(int vlistID, int varID, char *units)
 	  if ( tableInqParUnits(tableID, code, units) != 0 )
 	    units[0] = '\0';
 	}
-    }  
+    }
   else
     strcpy(units, vlistptr->vars[varID].units);
 
   return;
 }
 
-/* not used 
+/* used in MPIOM ! */
 int vlistInqVarID(int vlistID, int code)
 {
   int varID;
@@ -701,17 +701,12 @@ int vlistInqVarID(int vlistID, int code)
     {
       param = vlistptr->vars[varID].param;
       cdiDecodeParam(param, &pnum, &pcat, &pdis);
-      if ( pnum == code ) break;
+      if ( pnum == code ) return (varID);
     }
 
-  if ( varID == vlistptr->nvars )
-    {
-      varID = CDI_UNDEFID;
-    }
-
-  return (varID);
+  return (CDI_UNDEFID);
 }
-*/
+
 
 int vlistInqVarSize(int vlistID, int varID)
 {