move definition of zaxisSize() from cdi.h to zaxis.h

.gitattributes

@@ -284,6 +284,7 @@ src/vlist_att.h -text
 src/vlist_var.c -text
 src/vlist_var.h -text
 src/zaxis.c -text
+src/zaxis.h -text
 tables/cosmo002 -text
 tables/cosmo201 -text
 tables/cosmo202 -text

src/Makefile.am

@@ -117,6 +117,7 @@ libcdi_la_SOURCES = 	 \
 	vlist_var.c 	 \
 	vlist_var.h	 \
 	zaxis.c		 \
+	zaxis.h		 \
         stream.c         \
         swap.c
 

src/Makefile.in

@@ -438,6 +438,7 @@ libcdi_la_SOURCES = \
 	vlist_var.c 	 \
 	vlist_var.h	 \
 	zaxis.c		 \
+	zaxis.h		 \
         stream.c         \
         swap.c
 

src/cdi.h

@@ -769,7 +769,6 @@ int     zaxisDuplicate(int zaxisID);
 void    zaxisResize(int zaxisID, int size);
 
 void    zaxisPrint(int zaxisID);
-int     zaxisSize(void);
 
 /*      zaxisDefLevels: Define the levels of a Z-axis */
 void    zaxisDefLevels(int zaxisID, const double *levels_vec);

src/cdi.inc

@@ -1315,9 +1315,6 @@
 !                                     INTEGER         opt)
       EXTERNAL        gridPrint
 
-      INTEGER         gridSize
-      EXTERNAL        gridSize
-
       INTEGER         gridCreate
 !                                    (INTEGER         gridtype,
 !                                     INTEGER         size)
@@ -1780,9 +1777,6 @@
 !                                    (INTEGER         zaxisID)
       EXTERNAL        zaxisPrint
 
-      INTEGER         zaxisSize
-      EXTERNAL        zaxisSize
-
 !                     zaxisDefLevels
 !                                    (INTEGER         zaxisID,
 !                                     DOUBLEPRECISION levels_vec)

src/cdiFortran.c

@@ -281,7 +281,6 @@ FCALLSCFUN2 (INT, gridInqMaskGME, GRIDINQMASKGME, gridinqmaskgme, INT, PINT)
 FCALLSCSUB2 (gridDefMask, GRIDDEFMASK, griddefmask, INT, PINT)
 FCALLSCFUN2 (INT, gridInqMask, GRIDINQMASK, gridinqmask, INT, PINT)
 FCALLSCSUB2 (gridPrint, GRIDPRINT, gridprint, INT, INT)
-FCALLSCFUN0 (INT, gridSize, GRIDSIZE, gridsize)
 FCALLSCFUN2 (INT, gridCreate, GRIDCREATE, gridcreate, INT, INT)
 FCALLSCSUB1 (gridDestroy, GRIDDESTROY, griddestroy, INT)
 FCALLSCFUN1 (INT, gridDuplicate, GRIDDUPLICATE, gridduplicate, INT)
@@ -389,7 +388,6 @@ FCALLSCFUN1 (INT, zaxisInqSize, ZAXISINQSIZE, zaxisinqsize, INT)
 FCALLSCFUN1 (INT, zaxisDuplicate, ZAXISDUPLICATE, zaxisduplicate, INT)
 FCALLSCSUB2 (zaxisResize, ZAXISRESIZE, zaxisresize, INT, INT)
 FCALLSCSUB1 (zaxisPrint, ZAXISPRINT, zaxisprint, INT)
-FCALLSCFUN0 (INT, zaxisSize, ZAXISSIZE, zaxissize)
 FCALLSCSUB2 (zaxisDefLevels, ZAXISDEFLEVELS, zaxisdeflevels, INT, PDOUBLE)
 FCALLSCSUB2 (zaxisInqLevels, ZAXISINQLEVELS, zaxisinqlevels, INT, PDOUBLE)
 FCALLSCSUB3 (zaxisDefLevel, ZAXISDEFLEVEL, zaxisdeflevel, INT, INT, DOUBLE)

src/make_cdilib

@@ -145,7 +145,7 @@ h="cdi_limits.h taxis.h dtypes.h file.h service.h extra.h \
    ieg.h cdi.h timebase.h calendar.h basetime.h datetime.h \
    stream_int.h cgribex.h gribapi.h \
    stream_cgribex.h  stream_gribapi.h  stream_grb.h  stream_cdf.h \
-   tablepar.h table.h gaussgrid.h grid.h varscan.h binary.h swap.h \
+   tablepar.h table.h gaussgrid.h grid.h zaxis.h varscan.h binary.h swap.h \
    service.h stream_srv.h stream_ext.h stream_ieg.h cdf_int.h  \
    cdf.h vlist.h vlist_var.h vlist_att.h model.h institution.h \
    namespace.h resource_handle.h pio_util.h pio.h pio_impl.h"

src/varscan.c

@@ -11,6 +11,7 @@
 #include "varscan.h"
 #include "vlist.h"
 #include "grid.h"
+#include "zaxis.h"
 
 
 extern void zaxisGetIndexList ( int, int * );

src/vlist.c

@@ -6,6 +6,7 @@
 #include "cdi.h"
 #include "stream_int.h"
 #include "vlist.h"
+#include "zaxis.h"
 #include "varscan.h"
 #include "namespace.h"
 #include "pio_util.h"

src/zaxis.h

+#ifndef _ZAXIS_H
+#define _ZAXIS_H
+
+int zaxisSize(void);
+
+#endif