Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
a12931c6
Commit
a12931c6
authored
Oct 16, 2009
by
Uwe Schulzweida
Browse files
No commit message
No commit message
parent
9c0550be
Changes
5
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
a12931c6
2009-10-
08
Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
2009-10-
15
Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using GRIB library version 1.4.0.1
* IEG format: bug fix for lonlat grids [report: Philip Lorenz]
* Version 1.4.0.1 released
2009-10-06 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
...
...
config/default
View file @
a12931c6
...
...
@@ -29,9 +29,10 @@ case "${HOSTNAME}" in
;;
gata
)
./configure
--prefix
=
$HOME
/local/etch-ia32
\
--with-jasper
=
/usr
\
--with-jasper
=
$HOME
/local/etch-ia32
\
--with-grib_api
=
/scratch/local2/m214003/local
\
--with-netcdf
=
/client
\
--with-netcdf
=
/scratch/local2/m214003/local
\
--with-hdf5
=
/sw/etch-ia32/hdf5-1.8.2
\
--with-szlib
=
$HOME
/local/etch-ia32
\
CC
=
gcc
CFLAGS
=
"-g -O2 -Wall -W -Wfloat-equal -pedantic"
CFINT
=
-Df2cFortran
;;
...
...
configure
View file @
a12931c6
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for cdi 1.4.0.
# Generated by GNU Autoconf 2.61 for cdi 1.4.0.
1.
#
# Report bugs to <Uwe.Schulzweida@zmaw.de>.
#
...
...
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME
=
'cdi'
PACKAGE_TARNAME
=
'cdi'
PACKAGE_VERSION
=
'1.4.0'
PACKAGE_STRING
=
'cdi 1.4.0'
PACKAGE_VERSION
=
'1.4.0
.1
'
PACKAGE_STRING
=
'cdi 1.4.0
.1
'
PACKAGE_BUGREPORT
=
'Uwe.Schulzweida@zmaw.de'
# Factoring default headers for most tests.
...
...
@@ -1229,7 +1229,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.4.0 to adapt to many kinds of systems.
\`
configure' configures cdi 1.4.0
.1
to adapt to many kinds of systems.
Usage:
$0
[OPTION]... [VAR=VALUE]...
...
...
@@ -1300,7 +1300,7 @@ fi
if
test
-n
"
$ac_init_help
"
;
then
case
$ac_init_help
in
short
|
recursive
)
echo
"Configuration of cdi 1.4.0:"
;;
short
|
recursive
)
echo
"Configuration of cdi 1.4.0
.1
:"
;;
esac
cat
<<
\
_ACEOF
...
...
@@ -1420,7 +1420,7 @@ fi
test
-n
"
$ac_init_help
"
&&
exit
$ac_status
if
$ac_init_version
;
then
cat
<<
\
_ACEOF
cdi configure 1.4.0
cdi configure 1.4.0
.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
...
...
@@ -1434,7 +1434,7 @@ cat >config.log <<_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.4.0, which was
It was created by cdi
$as_me
1.4.0
.1
, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0
$@
...
...
@@ -2261,7 +2261,7 @@ fi
# Define the identity of the package.
PACKAGE
=
'cdi'
VERSION
=
'1.4.0'
VERSION
=
'1.4.0
.1
'
cat
>>
confdefs.h
<<
_ACEOF
...
...
@@ -7490,7 +7490,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by cdi
$as_me
1.4.0, which was
This file was extended by cdi
$as_me
1.4.0
.1
, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES =
$CONFIG_FILES
...
...
@@ -7543,7 +7543,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat
>>
$CONFIG_STATUS
<<
_ACEOF
ac_cs_version="
\\
cdi config.status 1.4.0
cdi config.status 1.4.0
.1
configured by
$0
, generated by GNU Autoconf 2.61,
with options
\\
"`echo "
$ac_configure_args
" | sed 's/^ //; s/[
\\
""
\`\$
]/
\\\\
&/g'`
\\
"
...
...
configure.ac
View file @
a12931c6
# Process this file with autoconf to produce a configure script.
AC_INIT(cdi, 1.4.0, Uwe.Schulzweida@zmaw.de)
AC_INIT(cdi, 1.4.0
.1
, Uwe.Schulzweida@zmaw.de)
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
...
...
src/stream_cdf.c
View file @
a12931c6
...
...
@@ -601,7 +601,45 @@ void cdfDefVarDeflate(int ncid, int ncvarid, int deflate_level)
if
(
lwarn
)
{
lwarn
=
FALSE
;
Warning
(
func
,
"Compression failed, netCDF4 not available!"
);
Warning
(
func
,
"Deflate compression failed, netCDF4 not available!"
);
}
#endif
}
#endif
#if defined (HAVE_LIBNETCDF)
static
void
cdfDefVarSzip
(
int
ncid
,
int
ncvarid
)
{
static
char
func
[]
=
"cdfDefVarSzip"
;
#if defined (NC_NETCDF4) && defined (NC_SZIP_NN_OPTION_MASK)
int
retval
;
/* Set options_mask and bits_per_pixel. */
int
options_mask
=
32
;
int
bits_per_pixel
=
16
;
if
((
retval
=
nc_def_var_szip
(
ncid
,
ncvarid
,
options_mask
,
bits_per_pixel
)))
{
if
(
retval
==
NC_EINVAL
)
{
static
int
lwarn
=
TRUE
;
if
(
lwarn
)
{
lwarn
=
FALSE
;
Warning
(
func
,
"netCDF4/Szip compression not compiled in!"
);
}
}
else
Error
(
func
,
"nc_def_var_szip failed, status = %d"
,
retval
);
}
#else
static
int
lwarn
=
TRUE
;
if
(
lwarn
)
{
lwarn
=
FALSE
;
Warning
(
func
,
"netCDF4/Szip compression not available!"
);
}
#endif
}
...
...
@@ -2631,7 +2669,35 @@ int cdfDefVar(int streamID, int varID)
if
(
lwarn
)
{
lwarn
=
FALSE
;
Warning
(
func
,
"Compression is only available for netCDF4!"
);
Warning
(
func
,
"Deflate compression is only available for netCDF4!"
);
}
}
}
if
(
streamptr
->
ztype
==
COMPRESS_SZIP
)
{
if
(
streamptr
->
filetype
==
FILETYPE_NC4
)
{
#if defined (NC_SZIP_NN_OPTION_MASK)
cdfDefVarSzip
(
fileID
,
ncvarid
);
#else
static
int
lwarn
=
TRUE
;
if
(
lwarn
)
{
lwarn
=
FALSE
;
Warning
(
func
,
"netCDF4/SZIP compression not available!"
);
}
#endif
}
else
{
static
int
lwarn
=
TRUE
;
if
(
lwarn
)
{
lwarn
=
FALSE
;
Warning
(
func
,
"SZIP compression is only available for netCDF4!"
);
}
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment