Skip to content

GitLab

Commit 820e6340 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

new exse lib

parent bdecff85
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 74 deletions
ChangeLog
View file @ 820e6340
2006-11-?? Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
2006-09-?? Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using EXSE library version 1.0.1
* Version 1.0.3 released
2006-09-18 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using GRIB library version 1.0.2
* grbCopyRecord: add SZIP support
......
configure
View file @ 820e6340
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for cdi 1.0.2.
# Generated by GNU Autoconf 2.59 for cdi 1.0.3.
#
# Report bugs to <Uwe.Schulzweida@zmaw.de>.
#
......@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.0.2'
PACKAGE_STRING='cdi 1.0.2'
PACKAGE_VERSION='1.0.3'
PACKAGE_STRING='cdi 1.0.3'
PACKAGE_BUGREPORT='Uwe.Schulzweida@zmaw.de'
# Factoring default headers for most tests.
......@@ -795,7 +795,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures cdi 1.0.2 to adapt to many kinds of systems.
\`configure' configures cdi 1.0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -862,7 +862,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.0.2:";;
short | recursive ) echo "Configuration of cdi 1.0.3:";;
esac
cat <<\_ACEOF
......@@ -1006,7 +1006,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.0.2
cdi configure 1.0.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
......@@ -1020,7 +1020,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by cdi $as_me 1.0.2, which was
It was created by cdi $as_me 1.0.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
......@@ -1707,7 +1707,7 @@ fi
# Define the identity of the package.
PACKAGE=cdi
VERSION=1.0.2
VERSION=1.0.3
cat >>confdefs.h <<_ACEOF
......@@ -6400,7 +6400,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by cdi $as_me 1.0.2, which was
This file was extended by cdi $as_me 1.0.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -6463,7 +6463,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
cdi config.status 1.0.2
cdi config.status 1.0.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
......
configure.ac
View file @ 820e6340
# Process this file with autoconf to produce a configure script.
AC_INIT(cdi, 1.0.2, Uwe.Schulzweida@zmaw.de)
AC_INIT(cdi, 1.0.3, Uwe.Schulzweida@zmaw.de)
CONFIG_ABORT=yes
......
src/binary.c
View file @ 820e6340
......@@ -162,36 +162,36 @@ int binReadInt64(int fileID, int byteswap, size_t size, INT64 *ptr)
}
int binReadReal4(int fileID, int byteswap, size_t size, REAL4 *ptr)
int binReadFlt32(int fileID, int byteswap, size_t size, FLT32 *ptr)
{
static char func[] = "binReadReal4";
static char func[] = "binReadFlt32";
if ( sizeof(REAL4) == 4 )
if ( sizeof(FLT32) == 4 )
{
fileRead(fileID, (void *) ptr, 4*size);
if ( byteswap ) swap4byte(ptr, size);
}
else
{
Error(func, "not implemented for %d byte float", sizeof(REAL4));
Error(func, "not implemented for %d byte float", sizeof(FLT32));
}
return (0);
}
int binReadReal8(int fileID, int byteswap, size_t size, REAL8 *ptr)
int binReadFlt64(int fileID, int byteswap, size_t size, FLT64 *ptr)
{
static char func[] = "binReadReal8";
static char func[] = "binReadFlt64";
if ( sizeof(REAL8) == 8 )
if ( sizeof(FLT64) == 8 )
{
fileRead(fileID, (void *) ptr, 8*size);
if ( byteswap ) swap8byte(ptr, size);
}
else
{
Error(func, "not implemented for %d byte float", sizeof(REAL8));
Error(func, "not implemented for %d byte float", sizeof(FLT64));
}
return (0);
......@@ -234,36 +234,36 @@ int binWriteInt64(int fileID, int byteswap, size_t size, INT64 *ptr)
}
int binWriteReal4(int fileID, int byteswap, size_t size, REAL4 *ptr)
int binWriteFlt32(int fileID, int byteswap, size_t size, FLT32 *ptr)
{
static char func[] = "binWriteReal4";
static char func[] = "binWriteFlt32";
if ( sizeof(REAL4) == 4 )
if ( sizeof(FLT32) == 4 )
{
if ( byteswap ) swap4byte(ptr, size);
fileWrite(fileID, (void *) ptr, 4*size);
}
else
{
Error(func, "not implemented for %d byte float", sizeof(REAL4));
Error(func, "not implemented for %d byte float", sizeof(FLT32));
}
return (0);
}
int binWriteReal8(int fileID, int byteswap, size_t size, REAL8 *ptr)
int binWriteFlt64(int fileID, int byteswap, size_t size, FLT64 *ptr)
{
static char func[] = "binWriteReal8";
static char func[] = "binWriteFlt64";
if ( sizeof(REAL8) == 8 )
if ( sizeof(FLT64) == 8 )
{
if ( byteswap ) swap8byte(ptr, size);
fileWrite(fileID, (void *) ptr, 8*size);
}
else
{
Error(func, "not implemented for %d byte float", sizeof(REAL8));
Error(func, "not implemented for %d byte float", sizeof(FLT64));
}
return (0);
......
src/binary.h
View file @ 820e6340
......@@ -23,10 +23,10 @@ int binReadInt64(int fileID, int byteswap, size_t size, INT64 *ptr);
int binWriteInt32(int fileID, int byteswap, size_t size, INT32 *ptr);
int binWriteInt64(int fileID, int byteswap, size_t size, INT64 *ptr);
int binReadReal4(int fileID, int byteswap, size_t size, REAL4 *ptr);
int binReadReal8(int fileID, int byteswap, size_t size, REAL8 *ptr);
int binReadFlt32(int fileID, int byteswap, size_t size, FLT32 *ptr);
int binReadFlt64(int fileID, int byteswap, size_t size, FLT64 *ptr);
int binWriteReal4(int fileID, int byteswap, size_t size, REAL4 *ptr);
int binWriteReal8(int fileID, int byteswap, size_t size, REAL8 *ptr);
int binWriteFlt32(int fileID, int byteswap, size_t size, FLT32 *ptr);
int binWriteFlt64(int fileID, int byteswap, size_t size, FLT64 *ptr);
#endif /* _BINARY_H */
src/dtypes.h
View file @ 820e6340
......@@ -30,15 +30,15 @@
# define INT64 long long
#endif
/* REAL4 */
/* FLT32 */
#undef REAL4
#define REAL4 float
#undef FLT32
#define FLT32 float
/* Real8 */
/* FLT64 */
#undef REAL8
#define REAL8 double
#undef FLT64
#define FLT64 double
/* UINT32 and UINT64 */
......
src/extralib.c
View file @ 820e6340
......@@ -32,7 +32,7 @@ static int extDefaultDprec = 0;
*/
#undef LIBVERSION
#define LIBVERSION 1.0.0
#define LIBVERSION 1.0.1
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
static const char ext_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
......@@ -270,36 +270,36 @@ int extInqData(EXTREC *extp, int prec, void *data)
{
case SINGLE_PRECISION:
{
if ( sizeof(REAL4) == 4 )
if ( sizeof(FLT32) == 4 )
{
if ( byteswap ) swap4byte(buffer, datasize);
if ( dprec == prec )
memcpy(data, buffer, datasize*sizeof(REAL4));
memcpy(data, buffer, datasize*sizeof(FLT32));
else
for (i = 0; i < datasize; i++)
((double *) data)[i] = (double) ((float *) buffer)[i];
}
else
{
Error(func, "not implemented for %d byte float", sizeof(REAL4));
Error(func, "not implemented for %d byte float", sizeof(FLT32));
}
break;
}
case DOUBLE_PRECISION:
if ( sizeof(REAL8) == 8 )
if ( sizeof(FLT64) == 8 )
{
if ( byteswap ) swap8byte(buffer, datasize);
if ( dprec == prec )
memcpy(data, buffer, datasize*sizeof(REAL8));
memcpy(data, buffer, datasize*sizeof(FLT64));
else
for (i = 0; i < datasize; i++)
((float *) data)[i] = (float) ((double *) buffer)[i];
}
else
{
Error(func, "not implemented for %d byte float", sizeof(REAL8));
Error(func, "not implemented for %d byte float", sizeof(FLT64));
}
break;
default:
......@@ -375,7 +375,7 @@ int extDefData(EXTREC *extp, int prec, const void *data)
case SINGLE_PRECISION:
{
if ( dprec == prec )
memcpy(buffer, data, datasize*sizeof(REAL4));
memcpy(buffer, data, datasize*sizeof(FLT32));
else
for (i = 0; i < datasize; i++)
((float *) buffer)[i] = (float) ((double *) data)[i];
......@@ -385,7 +385,7 @@ int extDefData(EXTREC *extp, int prec, const void *data)
case DOUBLE_PRECISION:
{
if ( dprec == prec )
memcpy(buffer, data, datasize*sizeof(REAL8));
memcpy(buffer, data, datasize*sizeof(FLT64));
else
for (i = 0; i < datasize; i++)
((double *) buffer)[i] = (double) ((float *) data)[i];
......@@ -591,12 +591,12 @@ int extWrite(int fileID, EXTREC *extp)
{
case SINGLE_PRECISION:
{
binWriteReal4(fileID, byteswap, datasize, (REAL4 *) buffer);
binWriteFlt32(fileID, byteswap, datasize, (FLT32 *) buffer);
break;
}
case DOUBLE_PRECISION:
{
binWriteReal8(fileID, byteswap, datasize, (REAL8 *) buffer);
binWriteFlt64(fileID, byteswap, datasize, (FLT64 *) buffer);
break;
}
default:
......
src/ieglib.c
View file @ 820e6340
......@@ -29,7 +29,7 @@ static int iegDefaultDprec = 0;
*/
#undef LIBVERSION
#define LIBVERSION 1.0.0
#define LIBVERSION 1.0.1
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
static const char ieg_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
......@@ -243,36 +243,36 @@ int iegInqData(IEGREC *iegp, int prec, void *data)
{
case SINGLE_PRECISION:
{
if ( sizeof(REAL4) == 4 )
if ( sizeof(FLT32) == 4 )
{
if ( byteswap ) swap4byte(buffer, datasize);
if ( dprec == prec )
memcpy(data, buffer, datasize*sizeof(REAL4));
memcpy(data, buffer, datasize*sizeof(FLT32));
else
for (i = 0; i < datasize; i++)
((double *) data)[i] = (double) ((float *) buffer)[i];
}
else
{
Error(func, "not implemented for %d byte float", sizeof(REAL4));
Error(func, "not implemented for %d byte float", sizeof(FLT32));
}
break;
}
case DOUBLE_PRECISION:
if ( sizeof(REAL8) == 8 )
if ( sizeof(FLT64) == 8 )
{
if ( byteswap ) swap8byte(buffer, datasize);
if ( dprec == prec )
memcpy(data, buffer, datasize*sizeof(REAL8));
memcpy(data, buffer, datasize*sizeof(FLT64));
else
for (i = 0; i < datasize; i++)
((float *) data)[i] = (float) ((double *) buffer)[i];
}
else
{
Error(func, "not implemented for %d byte float", sizeof(REAL8));
Error(func, "not implemented for %d byte float", sizeof(FLT64));
}
break;
default:
......@@ -338,7 +338,7 @@ int iegDefData(IEGREC *iegp, int prec, const void *data)
case SINGLE_PRECISION:
{
if ( dprec == prec )
memcpy(buffer, data, datasize*sizeof(REAL4));
memcpy(buffer, data, datasize*sizeof(FLT32));
else
for (i = 0; i < datasize; i++)
((float *) buffer)[i] = (float) ((double *) data)[i];
......@@ -348,7 +348,7 @@ int iegDefData(IEGREC *iegp, int prec, const void *data)
case DOUBLE_PRECISION:
{
if ( dprec == prec )
memcpy(buffer, data, datasize*sizeof(REAL8));
memcpy(buffer, data, datasize*sizeof(FLT64));
else
for (i = 0; i < datasize; i++)
((double *) buffer)[i] = (double) ((float *) data)[i];
......@@ -552,7 +552,7 @@ int iegWrite(int fileID, IEGREC *iegp)
binWriteInt32(fileID, byteswap, 18, (INT32 *) tmpbuf);
refval = iegp->refval;
binWriteReal4(fileID, byteswap, 1, (REAL4 *) &refval);
binWriteFlt32(fileID, byteswap, 1, (FLT32 *) &refval);
for ( i = 0; i < 3; i++ ) ((INT32 *) tmpbuf)[i] = (INT32) iegp->igdb[18+i];
binWriteInt32(fileID, byteswap, 3, (INT32 *) tmpbuf);
......@@ -560,11 +560,11 @@ int iegWrite(int fileID, IEGREC *iegp)
if ( dprec == SINGLE_PRECISION )
{
for ( i = 0; i < 100; i++ ) fvct[i] = (float) iegp->vct[i];
binWriteReal4(fileID, byteswap, 100, fvct);
binWriteFlt32(fileID, byteswap, 100, fvct);
}
else
{
binWriteReal8(fileID, byteswap, 100, iegp->vct);
binWriteFlt64(fileID, byteswap, 100, iegp->vct);
}
binWriteF77Block(fileID, byteswap, blocklen);
......@@ -582,12 +582,12 @@ int iegWrite(int fileID, IEGREC *iegp)
{
case SINGLE_PRECISION:
{
binWriteReal4(fileID, byteswap, datasize, (REAL4 *) buffer);
binWriteFlt32(fileID, byteswap, datasize, (FLT32 *) buffer);
break;
}
case DOUBLE_PRECISION:
{
binWriteReal8(fileID, byteswap, datasize, (REAL8 *) buffer);
binWriteFlt64(fileID, byteswap, datasize, (FLT64 *) buffer);
break;
}
default:
......
src/servicelib.c
View file @ 820e6340
......@@ -32,7 +32,7 @@ static int srvDefaultDprec = 0;
*/
#undef LIBVERSION
#define LIBVERSION 1.0.0
#define LIBVERSION 1.0.1
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
static const char srv_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
......@@ -274,36 +274,36 @@ int srvInqData(SRVREC *srvp, int prec, void *data)
{
case SINGLE_PRECISION:
{
if ( sizeof(REAL4) == 4 )
if ( sizeof(FLT32) == 4 )
{
if ( byteswap ) swap4byte(buffer, datasize);
if ( dprec == prec )
memcpy(data, buffer, datasize*sizeof(REAL4));
memcpy(data, buffer, datasize*sizeof(FLT32));
else
for (i = 0; i < datasize; i++)
((double *) data)[i] = (double) ((float *) buffer)[i];
}
else
{
Error(func, "not implemented for %d byte float", sizeof(REAL4));
Error(func, "not implemented for %d byte float", sizeof(FLT32));
}
break;
}
case DOUBLE_PRECISION:
if ( sizeof(REAL8) == 8 )
if ( sizeof(FLT64) == 8 )
{
if ( byteswap ) swap8byte(buffer, datasize);
if ( dprec == prec )
memcpy(data, buffer, datasize*sizeof(REAL8));
memcpy(data, buffer, datasize*sizeof(FLT64));
else
for (i = 0; i < datasize; i++)
((float *) data)[i] = (float) ((double *) buffer)[i];
}
else
{
Error(func, "not implemented for %d byte float", sizeof(REAL8));
Error(func, "not implemented for %d byte float", sizeof(FLT64));
}
break;
default:
......@@ -379,7 +379,7 @@ int srvDefData(SRVREC *srvp, int prec, const void *data)
case SINGLE_PRECISION:
{
if ( dprec == prec )
memcpy(buffer, data, datasize*sizeof(REAL4));
memcpy(buffer, data, datasize*sizeof(FLT32));
else
for (i = 0; i < datasize; i++)
((float *) buffer)[i] = (float) ((double *) data)[i];
......@@ -389,7 +389,7 @@ int srvDefData(SRVREC *srvp, int prec, const void *data)
case DOUBLE_PRECISION:
{
if ( dprec == prec )
memcpy(buffer, data, datasize*sizeof(REAL8));
memcpy(buffer, data, datasize*sizeof(FLT64));
else
for (i = 0; i < datasize; i++)
((double *) buffer)[i] = (double) ((float *) data)[i];
......@@ -595,12 +595,12 @@ int srvWrite(int fileID, SRVREC *srvp)
{
case SINGLE_PRECISION:
{
binWriteReal4(fileID, byteswap, datasize, (REAL4 *) buffer);
binWriteFlt32(fileID, byteswap, datasize, (FLT32 *) buffer);
break;
}
case DOUBLE_PRECISION:
{
binWriteReal8(fileID, byteswap, datasize, (REAL8 *) buffer);
binWriteFlt64(fileID, byteswap, datasize, (FLT64 *) buffer);
break;
}
default:
......
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