Commit 6c90648e authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

gridPrint/zaxisPrint: removed parameter index.

parent 38fea27e
...@@ -852,15 +852,7 @@ int main(int argc, char *argv[]) ...@@ -852,15 +852,7 @@ int main(int argc, char *argv[])
int vlistID1 = streamInqVlist(streamID1); int vlistID1 = streamInqVlist(streamID1);
if ( Longinfo ) if ( Longinfo ) vlistPrint(vlistID1);
{
int ngrids, nzaxis;
vlistPrint(vlistID1);
ngrids = vlistNgrids(vlistID1);
nzaxis = vlistNzaxis(vlistID1);
for ( int index = 0; index < ngrids; index++ ) gridPrint(vlistGrid(vlistID1, index), index, 1);
for ( int index = 0; index < nzaxis; index++ ) zaxisPrint(vlistZaxis(vlistID1, index), index);
}
int nvars = vlistNvars(vlistID1); int nvars = vlistNvars(vlistID1);
int taxisID1 = vlistInqTaxis(vlistID1); int taxisID1 = vlistInqTaxis(vlistID1);
......
...@@ -735,7 +735,7 @@ int gridInqMaskGME(int gridID, int mask[]); ...@@ -735,7 +735,7 @@ int gridInqMaskGME(int gridID, int mask[]);
void gridDefMask(int gridID, const int mask[]); void gridDefMask(int gridID, const int mask[]);
int gridInqMask(int gridID, int mask[]); int gridInqMask(int gridID, int mask[]);
void gridPrint(int gridID, int index, int opt); void gridPrint(int gridID, int opt);
/* gridCreate: Create a horizontal Grid */ /* gridCreate: Create a horizontal Grid */
int gridCreate(int gridtype, int size); int gridCreate(int gridtype, int size);
...@@ -981,7 +981,7 @@ int zaxisInqSize(int zaxisID); ...@@ -981,7 +981,7 @@ int zaxisInqSize(int zaxisID);
/* zaxisDuplicate: Duplicate a Z-axis */ /* zaxisDuplicate: Duplicate a Z-axis */
int zaxisDuplicate(int zaxisID); int zaxisDuplicate(int zaxisID);
void zaxisPrint(int zaxisID, int index); void zaxisPrint(int zaxisID);
/* zaxisDefLevels: Define the levels of a Z-axis */ /* zaxisDefLevels: Define the levels of a Z-axis */
void zaxisDefLevels(int zaxisID, const double levels[]); void zaxisDefLevels(int zaxisID, const double levels[]);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
! !
! Author: ! Author:
! ------- ! -------
! Uwe Schulzweida, MPI-MET, Hamburg, November 2016 ! Uwe Schulzweida, MPI-MET, Hamburg, January 2017
! !
INTEGER CDI_MAX_NAME INTEGER CDI_MAX_NAME
...@@ -1495,7 +1495,6 @@ ...@@ -1495,7 +1495,6 @@
! gridPrint ! gridPrint
! (INTEGER gridID, ! (INTEGER gridID,
! INTEGER index,
! INTEGER opt) ! INTEGER opt)
EXTERNAL gridPrint EXTERNAL gridPrint
...@@ -1962,8 +1961,7 @@ ...@@ -1962,8 +1961,7 @@
EXTERNAL zaxisDuplicate EXTERNAL zaxisDuplicate
! zaxisPrint ! zaxisPrint
! (INTEGER zaxisID, ! (INTEGER zaxisID)
! INTEGER index)
EXTERNAL zaxisPrint EXTERNAL zaxisPrint
! zaxisDefLevels ! zaxisDefLevels
......
...@@ -308,7 +308,7 @@ FCALLSCSUB2 (gridDefMaskGME, GRIDDEFMASKGME, griddefmaskgme, INT, INTV) ...@@ -308,7 +308,7 @@ FCALLSCSUB2 (gridDefMaskGME, GRIDDEFMASKGME, griddefmaskgme, INT, INTV)
FCALLSCFUN2 (INT, gridInqMaskGME, GRIDINQMASKGME, gridinqmaskgme, INT, INTV) FCALLSCFUN2 (INT, gridInqMaskGME, GRIDINQMASKGME, gridinqmaskgme, INT, INTV)
FCALLSCSUB2 (gridDefMask, GRIDDEFMASK, griddefmask, INT, INTV) FCALLSCSUB2 (gridDefMask, GRIDDEFMASK, griddefmask, INT, INTV)
FCALLSCFUN2 (INT, gridInqMask, GRIDINQMASK, gridinqmask, INT, INTV) FCALLSCFUN2 (INT, gridInqMask, GRIDINQMASK, gridinqmask, INT, INTV)
FCALLSCSUB3 (gridPrint, GRIDPRINT, gridprint, INT, INT, INT) FCALLSCSUB2 (gridPrint, GRIDPRINT, gridprint, INT, INT)
FCALLSCFUN2 (INT, gridCreate, GRIDCREATE, gridcreate, INT, INT) FCALLSCFUN2 (INT, gridCreate, GRIDCREATE, gridcreate, INT, INT)
FCALLSCSUB1 (gridDestroy, GRIDDESTROY, griddestroy, INT) FCALLSCSUB1 (gridDestroy, GRIDDESTROY, griddestroy, INT)
FCALLSCFUN1 (INT, gridDuplicate, GRIDDUPLICATE, gridduplicate, INT) FCALLSCFUN1 (INT, gridDuplicate, GRIDDUPLICATE, gridduplicate, INT)
...@@ -409,7 +409,7 @@ FCALLSCSUB1 (zaxisDestroy, ZAXISDESTROY, zaxisdestroy, INT) ...@@ -409,7 +409,7 @@ FCALLSCSUB1 (zaxisDestroy, ZAXISDESTROY, zaxisdestroy, INT)
FCALLSCFUN1 (INT, zaxisInqType, ZAXISINQTYPE, zaxisinqtype, INT) FCALLSCFUN1 (INT, zaxisInqType, ZAXISINQTYPE, zaxisinqtype, INT)
FCALLSCFUN1 (INT, zaxisInqSize, ZAXISINQSIZE, zaxisinqsize, INT) FCALLSCFUN1 (INT, zaxisInqSize, ZAXISINQSIZE, zaxisinqsize, INT)
FCALLSCFUN1 (INT, zaxisDuplicate, ZAXISDUPLICATE, zaxisduplicate, INT) FCALLSCFUN1 (INT, zaxisDuplicate, ZAXISDUPLICATE, zaxisduplicate, INT)
FCALLSCSUB2 (zaxisPrint, ZAXISPRINT, zaxisprint, INT, INT) FCALLSCSUB1 (zaxisPrint, ZAXISPRINT, zaxisprint, INT)
FCALLSCSUB2 (zaxisDefLevels, ZAXISDEFLEVELS, zaxisdeflevels, INT, DOUBLEV) FCALLSCSUB2 (zaxisDefLevels, ZAXISDEFLEVELS, zaxisdeflevels, INT, DOUBLEV)
FCALLSCFUN2 (INT, zaxisInqLevels, ZAXISINQLEVELS, zaxisinqlevels, INT, DOUBLEV) FCALLSCFUN2 (INT, zaxisInqLevels, ZAXISINQLEVELS, zaxisinqlevels, INT, DOUBLEV)
FCALLSCSUB3 (zaxisDefLevel, ZAXISDEFLEVEL, zaxisdeflevel, INT, INT, DOUBLE) FCALLSCSUB3 (zaxisDefLevel, ZAXISDEFLEVEL, zaxisdeflevel, INT, INT, DOUBLE)
......
...@@ -3493,7 +3493,7 @@ void gridPrintKernel(grid_t *gridptr, int opt, FILE *fp) ...@@ -3493,7 +3493,7 @@ void gridPrintKernel(grid_t *gridptr, int opt, FILE *fp)
} }
void gridPrint(int gridID, int index, int opt) void gridPrint(int gridID, int opt)
{ {
grid_t *gridptr = grid_to_pointer(gridID); grid_t *gridptr = grid_to_pointer(gridID);
......
...@@ -1331,7 +1331,7 @@ int zaxisDuplicate(int zaxisID) ...@@ -1331,7 +1331,7 @@ int zaxisDuplicate(int zaxisID)
} }
static static
void zaxisPrintKernel(zaxis_t *zaxisptr, int index, FILE *fp) void zaxisPrintKernel(zaxis_t *zaxisptr, FILE *fp)
{ {
xassert(zaxisptr); xassert(zaxisptr);
...@@ -1344,9 +1344,6 @@ void zaxisPrintKernel(zaxis_t *zaxisptr, int index, FILE *fp) ...@@ -1344,9 +1344,6 @@ void zaxisPrintKernel(zaxis_t *zaxisptr, int index, FILE *fp)
int nbyte; int nbyte;
int nbyte0 = 0; int nbyte0 = 0;
fprintf(fp, "#\n");
fprintf(fp, "# zaxisID %d\n", index);
fprintf(fp, "#\n");
fprintf(fp, "zaxistype = %s\n", zaxisNamePtr(type)); fprintf(fp, "zaxistype = %s\n", zaxisNamePtr(type));
fprintf(fp, "size = %d\n", nlevels); fprintf(fp, "size = %d\n", nlevels);
if ( nlevels == 1 ) if ( nlevels == 1 )
...@@ -1457,21 +1454,21 @@ void zaxisPrintKernel(zaxis_t *zaxisptr, int index, FILE *fp) ...@@ -1457,21 +1454,21 @@ void zaxisPrintKernel(zaxis_t *zaxisptr, int index, FILE *fp)
} }
void zaxisPrint(int zaxisID, int index) void zaxisPrint(int zaxisID)
{ {
zaxis_t *zaxisptr = zaxis_to_pointer(zaxisID); zaxis_t *zaxisptr = zaxis_to_pointer(zaxisID);
zaxisPrintKernel(zaxisptr, index, stdout); zaxisPrintKernel(zaxisptr, stdout);
} }
static static
void zaxisPrintP ( void * voidptr, FILE * fp ) void zaxisPrintP(void * voidptr, FILE * fp)
{ {
zaxis_t *zaxisptr = ( zaxis_t * ) voidptr; zaxis_t *zaxisptr = ( zaxis_t * ) voidptr;
xassert ( zaxisptr ); xassert ( zaxisptr );
zaxisPrintKernel(zaxisptr, zaxisptr->self, fp); zaxisPrintKernel(zaxisptr, fp);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment