Skip to content

GitLab

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

streamWrite*: const double *data

parent 29b0db9f
Hide whitespace changes
Inline Side-by-side
src/cdi.h
View file @ b2bb02e8
......@@ -232,13 +232,13 @@ off_t streamNvals(int streamID);
void streamReadVar(int streamID, int varID, double *data, int *nmiss);
/* streamWriteVar: Write a variable */
void streamWriteVar(int streamID, int varID, double *data, int nmiss);
void streamWriteVar(int streamID, int varID, const double *data, int nmiss);
/* streamReadVarSlice: Read a horizontal slice of a variable */
void streamReadVarSlice(int streamID, int varID, int levelID, double *data, int *nmiss);
/* streamWriteVarSlice: Write a horizontal slice of a variable */
void streamWriteVarSlice(int streamID, int varID, int levelID, double *data, int nmiss);
void streamWriteVarSlice(int streamID, int varID, int levelID, const double *data, int nmiss);
/* STREAM record I/O routines */
......@@ -246,7 +246,7 @@ void streamWriteVarSlice(int streamID, int varID, int levelID, double *data,
void streamInqRecord(int streamID, int *varID, int *levelID);
void streamDefRecord(int streamID, int varID, int levelID);
void streamReadRecord(int streamID, double *data, int *nmiss);
void streamWriteRecord(int streamID, double *data, int nmiss);
void streamWriteRecord(int streamID, const double *data, int nmiss);
void streamCopyRecord(int streamIDdest, int streamIDsrc);
void streamInqGinfo(int streamID, int *intnum, float *fltnum);
......
src/cdi.inc
View file @ b2bb02e8
......@@ -4,7 +4,7 @@
!
! Author:
! -------
! Uwe Schulzweida, MPI-MET, Hamburg, June 2009
! Uwe Schulzweida, MPI-MET, Hamburg, September 2009
!
INTEGER CDI_UNDEFID
......@@ -40,8 +40,8 @@
!
INTEGER FILETYPE_GRB
PARAMETER (FILETYPE_GRB = 1)
INTEGER FILETYPE_GB2
PARAMETER (FILETYPE_GB2 = 2)
INTEGER FILETYPE_GRB2
PARAMETER (FILETYPE_GRB2 = 2)
INTEGER FILETYPE_NC
PARAMETER (FILETYPE_NC = 3)
INTEGER FILETYPE_NC2
......
src/stream.c
View file @ b2bb02e8
......@@ -1549,7 +1549,7 @@ The function streamWriteVar writes the values of one time step of a variable
to an open dataset.
@EndFunction
*/
void streamWriteVar(int streamID, int varID, double *data, int nmiss)
void streamWriteVar(int streamID, int varID, const double *data, int nmiss)
{
static char func[] = "streamWriteVar";
int filetype;
......@@ -1714,7 +1714,7 @@ The function streamWriteVarSlice writes the values of a horizontal slice of a
variable to an open dataset.
@EndFunction
*/
void streamWriteVarSlice(int streamID, int varID, int levelID, double *data, int nmiss)
void streamWriteVarSlice(int streamID, int varID, int levelID, const double *data, int nmiss)
{
static char func[] = "streamWriteVarSlice";
int filetype;
......
src/stream_cdf.c
View file @ b2bb02e8
......@@ -644,7 +644,7 @@ void cdfDefMissval(int streamID, int varID, int dtype)
}
void cdfWriteRecord(int streamID, double *data, int nmiss)
void cdfWriteRecord(int streamID, const double *data, int nmiss)
{
#if defined (HAVE_LIBNETCDF)
static char func[] = "cdfWriteRecord";
......@@ -2908,7 +2908,8 @@ void cdfReadVarDP(int streamID, int varID, double *data, int *nmiss)
#endif
}
void cdfWriteVarDP(int streamID, int varID, double *data, int nmiss)
void cdfWriteVarDP(int streamID, int varID, const double *data, int nmiss)
{
#if defined (HAVE_LIBNETCDF)
static char func[] = "cdfWriteVarDP";
......@@ -2928,6 +2929,7 @@ void cdfWriteVarDP(int streamID, int varID, double *data, int nmiss)
int i;
int dtype;
int vlistID;
double *mdata = NULL;
stream_t *streamptr;
streamptr = stream_to_pointer(streamID);
......@@ -3019,11 +3021,14 @@ void cdfWriteVarDP(int streamID, int varID, double *data, int nmiss)
laddoffset = IS_NOT_EQUAL(addoffset, 0);
lscalefactor = IS_NOT_EQUAL(scalefactor, 1);
missval = vlistInqVarMissval(vlistID, varID);
nvals = gridInqSize(gridID)*zaxisInqSize(zaxisID);
if ( laddoffset || lscalefactor )
{
missval = vlistInqVarMissval(vlistID, varID);
mdata = (double *) malloc(nvals*sizeof(double));
memcpy(mdata, data, nvals*sizeof(double));
if ( nmiss > 0 )
{
......@@ -3031,8 +3036,8 @@ void cdfWriteVarDP(int streamID, int varID, double *data, int nmiss)
{
if ( !DBL_IS_EQUAL(data[i], missval) )
{
if ( laddoffset ) data[i] -= addoffset;
if ( lscalefactor ) data[i] /= scalefactor;
if ( laddoffset ) mdata[i] -= addoffset;
if ( lscalefactor ) mdata[i] /= scalefactor;
}
}
}
......@@ -3040,8 +3045,8 @@ void cdfWriteVarDP(int streamID, int varID, double *data, int nmiss)
{
for ( i = 0; i < nvals; i++ )
{
if ( laddoffset ) data[i] -= addoffset;
if ( lscalefactor ) data[i] /= scalefactor;
if ( laddoffset ) mdata[i] -= addoffset;
if ( lscalefactor ) mdata[i] /= scalefactor;
}
}
}
......@@ -3049,11 +3054,24 @@ void cdfWriteVarDP(int streamID, int varID, double *data, int nmiss)
if ( dtype == DATATYPE_UINT8 || dtype == DATATYPE_INT8 ||
dtype == DATATYPE_INT16 || dtype == DATATYPE_INT32 )
{
for ( i = 0; i < nvals; i++ ) data[i] = NINT(data[i]);
if ( mdata )
{
for ( i = 0; i < nvals; i++ ) mdata[i] = NINT(mdata[i]);
}
else
{
mdata = (double *) malloc(nvals*sizeof(double));
for ( i = 0; i < nvals; i++ ) mdata[i] = NINT(data[i]);
}
}
}
cdf_put_vara_double(fileID, ncvarid, start, count, data);
if ( mdata )
cdf_put_vara_double(fileID, ncvarid, start, count, mdata);
else
cdf_put_vara_double(fileID, ncvarid, start, count, data);
if ( mdata ) free(mdata);
#endif
}
......@@ -3292,7 +3310,8 @@ int cdfReadVarSliceDP(int streamID, int varID, int levelID, double *data, int *n
return (0);
}
int cdfWriteVarSliceDP(int streamID, int varID, int levelID, double *data, int nmiss)
int cdfWriteVarSliceDP(int streamID, int varID, int levelID, const double *data, int nmiss)
{
#if defined (HAVE_LIBNETCDF)
static char func[] = "cdfWriteVarSliceDP";
......@@ -3312,6 +3331,7 @@ int cdfWriteVarSliceDP(int streamID, int varID, int levelID, double *data, int n
int i;
int dtype;
int vlistID;
double *mdata = NULL;
stream_t *streamptr;
extern int CDF_Debug;
......@@ -3403,14 +3423,17 @@ int cdfWriteVarSliceDP(int streamID, int varID, int levelID, double *data, int n
if ( laddoffset || lscalefactor )
{
mdata = (double *) malloc(nvals*sizeof(double));
memcpy(mdata, data, nvals*sizeof(double));
if ( nmiss > 0 )
{
for ( i = 0; i < nvals; i++ )
{
if ( !DBL_IS_EQUAL(data[i], missval) )
if ( !DBL_IS_EQUAL(mdata[i], missval) )
{
if ( laddoffset ) data[i] -= addoffset;
if ( lscalefactor ) data[i] /= scalefactor;
if ( laddoffset ) mdata[i] -= addoffset;
if ( lscalefactor ) mdata[i] /= scalefactor;
}
}
}
......@@ -3418,8 +3441,8 @@ int cdfWriteVarSliceDP(int streamID, int varID, int levelID, double *data, int n
{
for ( i = 0; i < nvals; i++ )
{
if ( laddoffset ) data[i] -= addoffset;
if ( lscalefactor ) data[i] /= scalefactor;
if ( laddoffset ) mdata[i] -= addoffset;
if ( lscalefactor ) mdata[i] /= scalefactor;
}
}
}
......@@ -3427,7 +3450,15 @@ int cdfWriteVarSliceDP(int streamID, int varID, int levelID, double *data, int n
if ( dtype == DATATYPE_UINT8 || dtype == DATATYPE_INT8 ||
dtype == DATATYPE_INT16 || dtype == DATATYPE_INT32 )
{
for ( i = 0; i < nvals; i++ ) data[i] = NINT(data[i]);
if ( mdata )
{
for ( i = 0; i < nvals; i++ ) mdata[i] = NINT(mdata[i]);
}
else
{
mdata = (double *) malloc(nvals*sizeof(double));
for ( i = 0; i < nvals; i++ ) mdata[i] = NINT(data[i]);
}
}
if ( CDF_Debug )
......@@ -3435,7 +3466,7 @@ int cdfWriteVarSliceDP(int streamID, int varID, int levelID, double *data, int n
double fmin, fmax;
fmin = 1.0e200;
fmax = -1.0e200;
for ( i = 1; i < nvals; ++i )
for ( i = 0; i < nvals; ++i )
{
if ( !DBL_IS_EQUAL(data[i], missval) )
{
......@@ -3448,8 +3479,12 @@ int cdfWriteVarSliceDP(int streamID, int varID, int levelID, double *data, int n
}
}
cdf_put_vara_double(fileID, ncvarid, start, count, data);
if ( mdata )
cdf_put_vara_double(fileID, ncvarid, start, count, mdata);
else
cdf_put_vara_double(fileID, ncvarid, start, count, data);
if ( mdata ) free(mdata);
#endif
return (0);
}
......
src/stream_cdf.h
View file @ b2bb02e8
......@@ -13,12 +13,12 @@ void cdfEndDef(int streamID);
int cdfDefRecord(int streamID);
int cdfCopyRecord(int streamIDdest, int streamIDsrc);
int cdfReadRecord(int streamID, double *data, int *nmiss);
void cdfWriteRecord(int streamID, double *data, int nmiss);
void cdfWriteRecord(int streamID, const double *data, int nmiss);
void cdfReadVarDP(int streamID, int varID, double *data, int *nmiss);
void cdfWriteVarDP(int streamID, int varID, double *data, int nmiss);
void cdfWriteVarDP(int streamID, int varID, const double *data, int nmiss);
int cdfReadVarSliceDP(int streamID, int varID, int levelID, double *data, int *nmiss);
int cdfWriteVarSliceDP(int streamID, int varID, int levelID, double *data, int nmiss);
int cdfWriteVarSliceDP(int streamID, int varID, int levelID, const double *data, int nmiss);
#endif
src/stream_record.c
View file @ b2bb02e8
......@@ -355,7 +355,7 @@ void streamReadRecord(int streamID, double *data, int *nmiss)
}
void streamWriteRecord(int streamID, double *data, int nmiss)
void streamWriteRecord(int streamID, const double *data, int nmiss)
{
static char func[] = "streamWriteRecord";
int status = 0;
......
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

Imprint | Privacy Policy