Commit ec9e6466 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

zaxisPrint: changed output format of level bounds

parent 192d7c92
...@@ -1195,7 +1195,6 @@ static void zaxisPrintKernel ( zaxis_t * zaxisptr, int index, FILE * fp ) ...@@ -1195,7 +1195,6 @@ static void zaxisPrintKernel ( zaxis_t * zaxisptr, int index, FILE * fp )
unsigned char uuid[CDI_UUID_SIZE]; unsigned char uuid[CDI_UUID_SIZE];
int levelID; int levelID;
int nbyte; int nbyte;
double level;
xassert ( zaxisptr ); xassert ( zaxisptr );
...@@ -1224,16 +1223,14 @@ static void zaxisPrintKernel ( zaxis_t * zaxisptr, int index, FILE * fp ) ...@@ -1224,16 +1223,14 @@ static void zaxisPrintKernel ( zaxis_t * zaxisptr, int index, FILE * fp )
fprintf(fp, "%*s", nbyte0, ""); fprintf(fp, "%*s", nbyte0, "");
nbyte = nbyte0; nbyte = nbyte0;
} }
level = zaxisInqLevel(zaxisID, levelID); nbyte += fprintf(fp, "%.9g ", zaxisptr->vals[levelID]);
nbyte += fprintf(fp, "%.9g ", level);
} }
fprintf(fp, "\n"); fprintf(fp, "\n");
if ( zaxisptr->lbounds && zaxisptr->ubounds ) if ( zaxisptr->lbounds && zaxisptr->ubounds )
{ {
double level1, level2; nbyte0 = fprintf(fp, "lbounds = ");
nbyte = nbyte0; nbyte = nbyte0;
nbyte0 = fprintf(fp, "bounds = ");
for ( levelID = 0; levelID < nlevels; levelID++ ) for ( levelID = 0; levelID < nlevels; levelID++ )
{ {
if ( nbyte > 80 ) if ( nbyte > 80 )
...@@ -1242,27 +1239,35 @@ static void zaxisPrintKernel ( zaxis_t * zaxisptr, int index, FILE * fp ) ...@@ -1242,27 +1239,35 @@ static void zaxisPrintKernel ( zaxis_t * zaxisptr, int index, FILE * fp )
fprintf(fp, "%*s", nbyte0, ""); fprintf(fp, "%*s", nbyte0, "");
nbyte = nbyte0; nbyte = nbyte0;
} }
level1 = zaxisInqLbound(zaxisID, levelID); nbyte += fprintf(fp, "%.9g ", zaxisptr->lbounds[levelID]);
level2 = zaxisInqUbound(zaxisID, levelID); }
nbyte += fprintf(fp, "%.9g-%.9g ", level1, level2); fprintf(fp, "\n");
nbyte0 = fprintf(fp, "ubounds = ");
nbyte = nbyte0;
for ( levelID = 0; levelID < nlevels; levelID++ )
{
if ( nbyte > 80 )
{
fprintf(fp, "\n");
fprintf(fp, "%*s", nbyte0, "");
nbyte = nbyte0;
}
nbyte += fprintf(fp, "%.9g ", zaxisptr->ubounds[levelID]);
} }
fprintf(fp, "\n"); fprintf(fp, "\n");
} }
if ( type == ZAXIS_HYBRID || type == ZAXIS_HYBRID_HALF ) if ( type == ZAXIS_HYBRID || type == ZAXIS_HYBRID_HALF )
{ {
int i; int vctsize = zaxisptr->vctsize;
int vctsize; const double *vct = zaxisptr->vct;
const double *vct;
vctsize = zaxisptr->vctsize;
vct = zaxisptr->vct;
fprintf(fp, "vctsize = %d\n", vctsize); fprintf(fp, "vctsize = %d\n", vctsize);
if ( vctsize ) if ( vctsize )
{ {
nbyte0 = fprintf(fp, "vct = "); nbyte0 = fprintf(fp, "vct = ");
nbyte = nbyte0; nbyte = nbyte0;
for ( i = 0; i < vctsize; i++ ) for ( int i = 0; i < vctsize; i++ )
{ {
if ( nbyte > 70 || i == vctsize/2 ) if ( nbyte > 70 || i == vctsize/2 )
{ {
......
Supports Markdown
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