Skip to content
Snippets Groups Projects
Commit 61861bdf authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

printinfo.h update.

parent 73bb622b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 33 additions and 26 deletions
app/printinfo.h
+ 33
− 26
View file @ 61861bdf
// This file is used in CDI and CDO !!!
#if defined (HAVE_CONFIG_H)
# include "../src/config.h"
#include "../src/config.h"
#endif
#include <stdio.h>
#ifdef CDO
#define streamInqFiletype pstreamInqFiletype
#define streamInqByteorder pstreamInqByteorder
#define streamInqTimestep pstreamInqTimestep
#endif
#define DATE_FORMAT "%5.4d-%2.2d-%2.2d"
#define TIME_FORMAT "%2.2d:%2.2d:%2.2d"
......@@ -199,9 +205,9 @@ void print_xyvals2D(int gridID, int dig)
gridInqXunits(gridID, xunits);
gridInqYunits(gridID, yunits);
int gridsize = gridInqSize(gridID);
double *xvals2D = (double*) malloc((size_t)gridsize*sizeof(double));
double *yvals2D = (double*) malloc((size_t)gridsize*sizeof(double));
size_t gridsize = gridInqSize(gridID);
double *xvals2D = (double*) malloc(gridsize*sizeof(double));
double *yvals2D = (double*) malloc(gridsize*sizeof(double));
gridInqXvals(gridID, xvals2D);
gridInqYvals(gridID, yvals2D);
......@@ -210,7 +216,7 @@ void print_xyvals2D(int gridID, int dig)
double xlast = xvals2D[0];
double yfirst = yvals2D[0];
double ylast = yvals2D[0];
for ( int i = 1; i < gridsize; i++ )
for ( size_t i = 1; i < gridsize; i++ )
{
if ( xvals2D[i] < xfirst ) xfirst = xvals2D[i];
if ( xvals2D[i] > xlast ) xlast = xvals2D[i];
......@@ -245,16 +251,16 @@ void print_xyvals2D(int gridID, int dig)
}
}
fprintf(stdout, "%33s : %.*g to %.*g", xname, dig, xfirst, dig, xlast);
if ( IS_NOT_EQUAL(xinc, 0) )
fprintf(stdout, " by %.*g", dig, xinc);
fprintf(stdout, "%33s : %.*g", xname, dig, xfirst);
if ( gridsize > 1 ) fprintf(stdout, " to %.*g", dig, xlast);
if ( IS_NOT_EQUAL(xinc, 0) ) fprintf(stdout, " by %.*g", dig, xinc);
fprintf(stdout, " %s", xunits);
if ( gridIsCircular(gridID) ) fprintf(stdout, " circular");
fprintf(stdout, "\n");
fprintf(stdout, "%33s : %.*g to %.*g", yname, dig, yfirst, dig, ylast);
if ( IS_NOT_EQUAL(yinc, 0) )
fprintf(stdout, " by %.*g", dig, yinc);
fprintf(stdout, " %s", xunits);
fprintf(stdout, "%33s : %.*g", yname, dig, yfirst);
if ( gridsize > 1 ) fprintf(stdout, " to %.*g", dig, ylast);
if ( IS_NOT_EQUAL(yinc, 0) ) fprintf(stdout, " by %.*g", dig, yinc);
fprintf(stdout, " %s", yunits);
fprintf(stdout, "\n");
free(xvals2D);
......@@ -271,10 +277,10 @@ void printGridInfoKernel(int gridID, int index, bool lproj)
fprintf(stderr, "Internal problem (%s): sub grid not equal GRID_PROJECTION!\n", __func__);
int trunc = gridInqTrunc(gridID);
int gridsize = gridInqSize(gridID);
int xsize = gridInqXsize(gridID);
int ysize = gridInqYsize(gridID);
int xysize = xsize*ysize;
size_t gridsize = gridInqSize(gridID);
size_t xsize = gridInqXsize(gridID);
size_t ysize = gridInqYsize(gridID);
size_t xysize = xsize*ysize;
// int prec = gridInqPrec(gridID);
// int dig = (prec == CDI_DATATYPE_FLT64) ? 15 : 7;
......@@ -298,6 +304,7 @@ void printGridInfoKernel(int gridID, int index, bool lproj)
if ( gridtype == GRID_LONLAT ||
gridtype == GRID_PROJECTION ||
gridtype == GRID_GENERIC ||
gridtype == GRID_CHARXY ||
gridtype == GRID_GAUSSIAN ||
gridtype == GRID_GAUSSIAN_REDUCED )
{
......@@ -306,11 +313,11 @@ void printGridInfoKernel(int gridID, int index, bool lproj)
#ifdef CDO
set_text_color(stdout, RESET, GREEN);
#endif
fprintf(stdout, "points=%d", gridsize);
fprintf(stdout, "points=%zu", gridsize);
if ( gridtype == GRID_GAUSSIAN_REDUCED )
fprintf(stdout, " nlat=%d", ysize);
fprintf(stdout, " nlat=%zu", ysize);
else if ( xysize )
fprintf(stdout, " (%dx%d)", xsize, ysize);
fprintf(stdout, " (%zux%zu)", xsize, ysize);
if ( gridtype == GRID_GAUSSIAN || gridtype == GRID_GAUSSIAN_REDUCED )
fprintf(stdout, " np=%d", gridInqNP(gridID));
......@@ -354,7 +361,7 @@ void printGridInfoKernel(int gridID, int index, bool lproj)
#ifdef CDO
set_text_color(stdout, RESET, GREEN);
#endif
fprintf(stdout, "points=%d nsp=%d truncation=%d", gridsize, gridsize/2, trunc);
fprintf(stdout, "points=%zu nsp=%zu truncation=%d", gridsize, gridsize/2, trunc);
if ( gridInqComplexPacking(gridID) ) fprintf(stdout, " complexPacking");
my_reset_text_color(stdout);
fprintf(stdout, "\n");
......@@ -364,7 +371,7 @@ void printGridInfoKernel(int gridID, int index, bool lproj)
#ifdef CDO
set_text_color(stdout, RESET, GREEN);
#endif
fprintf(stdout, "points=%d nfc=%d truncation=%d\n", gridsize, gridsize/2, trunc);
fprintf(stdout, "points=%zu nfc=%zu truncation=%d\n", gridsize, gridsize/2, trunc);
my_reset_text_color(stdout);
}
else if ( gridtype == GRID_GME )
......@@ -374,7 +381,7 @@ void printGridInfoKernel(int gridID, int index, bool lproj)
#ifdef CDO
set_text_color(stdout, RESET, GREEN);
#endif
fprintf(stdout, "points=%d nd=%d ni=%d\n", gridsize, nd, ni);
fprintf(stdout, "points=%zu nd=%d ni=%d\n", gridsize, nd, ni);
my_reset_text_color(stdout);
}
else if ( gridtype == GRID_CURVILINEAR || gridtype == GRID_UNSTRUCTURED )
......@@ -383,9 +390,9 @@ void printGridInfoKernel(int gridID, int index, bool lproj)
set_text_color(stdout, RESET, GREEN);
#endif
if ( gridtype == GRID_CURVILINEAR )
fprintf(stdout, "points=%d (%dx%d)", gridsize, xsize, ysize);
fprintf(stdout, "points=%zu (%zux%zu)", gridsize, xsize, ysize);
else
fprintf(stdout, "points=%d", gridsize);
fprintf(stdout, "points=%zu", gridsize);
if ( gridtype == GRID_UNSTRUCTURED && gridInqNvertex(gridID) > 0 )
fprintf(stdout, " nvertex=%d", gridInqNvertex(gridID));
......@@ -416,9 +423,9 @@ void printGridInfoKernel(int gridID, int index, bool lproj)
set_text_color(stdout, RESET, GREEN);
#endif
if ( ysize == 0 )
fprintf(stdout, "points=%d\n", gridsize);
fprintf(stdout, "points=%zu\n", gridsize);
else
fprintf(stdout, "points=%d (%dx%d)\n", gridsize, xsize, ysize);
fprintf(stdout, "points=%zu (%zux%zu)\n", gridsize, xsize, ysize);
my_reset_text_color(stdout);
}
......
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

Imprint | Privacy Policy