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
0aeaebc9
Commit
0aeaebc9
authored
Jun 07, 2011
by
Deike Kleberg
Browse files
Merge from trunk.
parent
68e28e82
Changes
65
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
0aeaebc9
2011-06-01 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* CDI: changed compression type from Ztype to CompType
* CDI: changed compression level from Zlevel to CompLevel [report: Thomas Jahns]
2011-05-13 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* gridGenYvals: changed delta eps to 0.002 for gaussian grids [report: John Lillibridge]
* ruby/python interface: changed GRID_CELL to GRID_UNSTRUCTURED [report: Tim Cera]
2011-05-12 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* grid::compareXYvals: bug fix for generic grids [report: Felicia Brisc]
2011-04-28 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Added attribute standard_name to netCDF time var [request: Karin Meier-Fleischer]
* Added attribute standard_name to netCDF zaxes [request: Karin Meier-Fleischer]
* Added attribute positive to netCDF zaxes [request: Karin Meier-Fleischer]
2011-04-27 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Added support for FILETYPE_NC4C (netcdf4 classic)
* netcdf: Skiped time dependent variables if number of time steps is zero
2011-03-15 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CGRIBEX library version 1.5.0
...
...
Makefile.in
View file @
0aeaebc9
...
...
@@ -143,6 +143,7 @@ LTLIBOBJS = @LTLIBOBJS@
MAINT
=
@MAINT@
MAKEINFO
=
@MAKEINFO@
MKDIR_P
=
@MKDIR_P@
NC_CONFIG
=
@NC_CONFIG@
NETCDF_INCLUDE
=
@NETCDF_INCLUDE@
NETCDF_LDFLAGS
=
@NETCDF_LDFLAGS@
NM
=
@NM@
...
...
NEWS
View file @
0aeaebc9
CDI NEWS
--------
Version 1.5.1 (?? ??? 2011):
New features:
* Added support for FILETYPE_NC4C (netcdf4 classic)
Fixed bugs:
* ruby/python interface: changed GRID_CELL to GRID_UNSTRUCTURED
Version 1.5.0 (15 March 2011):
New features:
...
...
app/Makefile.in
View file @
0aeaebc9
...
...
@@ -150,6 +150,7 @@ LTLIBOBJS = @LTLIBOBJS@
MAINT
=
@MAINT@
MAKEINFO
=
@MAKEINFO@
MKDIR_P
=
@MKDIR_P@
NC_CONFIG
=
@NC_CONFIG@
NETCDF_INCLUDE
=
@NETCDF_INCLUDE@
NETCDF_LDFLAGS
=
@NETCDF_LDFLAGS@
NM
=
@NM@
...
...
app/cdi.c
View file @
0aeaebc9
...
...
@@ -35,9 +35,7 @@ int vlistInqVarMissvalUsed(int vlistID, int varID);
#include
"printinfo.h"
void
cdiDecodeDate
(
int
date
,
int
*
year
,
int
*
month
,
int
*
day
);
void
cdiDecodeTime
(
int
time
,
int
*
hour
,
int
*
minute
,
int
*
second
);
void
cdiDefTableID
(
int
tableID
);
int
getopt
(
int
argc
,
char
*
const
argv
[],
const
char
*
optstring
);
...
...
@@ -51,8 +49,8 @@ int DefaultFileType = CDI_UNDEFID;
int
DefaultDataType
=
CDI_UNDEFID
;
int
DefaultByteorder
=
CDI_UNDEFID
;
int
Z
type
=
COMPRESS_NONE
;
int
Z
level
=
0
;
int
comp
type
=
COMPRESS_NONE
;
// Compression type
int
comp
level
=
0
;
// Compression level
static
...
...
@@ -92,7 +90,7 @@ void usage(void)
fprintf
(
stderr
,
"
\n
"
);
fprintf
(
stderr
,
" Options:
\n
"
);
fprintf
(
stderr
,
" -d Print debugging information
\n
"
);
fprintf
(
stderr
,
" -f <format> Format of the output file. (grb, grb2, nc, nc2, nc4, src, ext or ieg)
\n
"
);
fprintf
(
stderr
,
" -f <format> Format of the output file. (grb, grb2, nc, nc2, nc4,
nc4c,
src, ext or ieg)
\n
"
);
fprintf
(
stderr
,
" -s give short information if ofile is missing
\n
"
);
fprintf
(
stderr
,
" -t <table> Parameter table name/file
\n
"
);
fprintf
(
stderr
,
" Predefined tables: "
);
...
...
@@ -231,9 +229,9 @@ void printShortinfo(int streamID, int vlistID, int vardis)
int
timeID
,
taxisID
;
int
nbyte
,
nbyte0
;
int
index
;
char
varname
[
128
];
char
longname
[
128
];
char
units
[
128
];
char
varname
[
CDI_MAX_NAME
];
char
longname
[
CDI_MAX_NAME
];
char
units
[
CDI_MAX_NAME
];
double
level
;
char
*
modelptr
,
*
instptr
;
int
datatype
;
...
...
@@ -308,7 +306,7 @@ void printShortinfo(int streamID, int vlistID, int vardis)
fprintf
(
stdout
,
" %-3s"
,
pstr
);
if
(
vlistInqVar
Zt
ype
(
vlistID
,
varID
)
==
COMPRESS_NONE
)
if
(
vlistInqVar
CompT
ype
(
vlistID
,
varID
)
==
COMPRESS_NONE
)
fprintf
(
stdout
,
" "
);
else
fprintf
(
stdout
,
"z"
);
...
...
@@ -586,6 +584,7 @@ void setDefaultFileType(char *filetypestr)
else
if
(
memcmp
(
filetypestr
,
"grb1"
,
4
)
==
0
)
{
ftstr
+=
4
;
DefaultFileType
=
FILETYPE_GRB
;
}
else
if
(
memcmp
(
filetypestr
,
"grb"
,
3
)
==
0
)
{
ftstr
+=
3
;
DefaultFileType
=
FILETYPE_GRB
;
}
else
if
(
memcmp
(
filetypestr
,
"nc2"
,
3
)
==
0
)
{
ftstr
+=
3
;
DefaultFileType
=
FILETYPE_NC2
;
}
else
if
(
memcmp
(
filetypestr
,
"nc4c"
,
4
)
==
0
)
{
ftstr
+=
4
;
DefaultFileType
=
FILETYPE_NC4C
;}
else
if
(
memcmp
(
filetypestr
,
"nc4"
,
3
)
==
0
)
{
ftstr
+=
3
;
DefaultFileType
=
FILETYPE_NC4
;
}
else
if
(
memcmp
(
filetypestr
,
"nc"
,
2
)
==
0
)
{
ftstr
+=
2
;
DefaultFileType
=
FILETYPE_NC
;
}
else
if
(
memcmp
(
filetypestr
,
"srv"
,
3
)
==
0
)
{
ftstr
+=
3
;
DefaultFileType
=
FILETYPE_SRV
;
}
...
...
@@ -594,7 +593,7 @@ void setDefaultFileType(char *filetypestr)
else
{
fprintf
(
stderr
,
"Unsupported filetype %s!
\n
"
,
filetypestr
);
fprintf
(
stderr
,
"Available filetypes: grb, grb2, nc, nc2, nc4, srv, ext and ieg
\n
"
);
fprintf
(
stderr
,
"Available filetypes: grb, grb2, nc, nc2, nc4,
nc4c,
srv, ext and ieg
\n
"
);
exit
(
EXIT_FAILURE
);
}
...
...
@@ -610,8 +609,8 @@ void setDefaultFileType(char *filetypestr)
{
fprintf
(
stderr
,
"Unexpected character >%c< in file type >%s<!
\n
"
,
*
ftstr
,
filetypestr
);
fprintf
(
stderr
,
"Use format[_nbits] with:
\n
"
);
fprintf
(
stderr
,
" format = grb, grb2, nc, nc2, nc4, srv, ext or ieg
\n
"
);
fprintf
(
stderr
,
" nbits = 32/64 for nc
,
nc2
,
nc4
,
srv
,
ext
,
ieg; 1 -
3
2 for grb
,
grb2
\n
"
);
fprintf
(
stderr
,
" format = grb, grb2, nc, nc2, nc4,
nc4c,
srv, ext or ieg
\n
"
);
fprintf
(
stderr
,
" nbits = 32/64 for nc
/
nc2
/nc4/
nc4
c/
srv
/
ext
/
ieg; 1 - 2
4
for grb
/
grb2
\n
"
);
exit
(
EXIT_FAILURE
);
}
}
...
...
@@ -643,21 +642,21 @@ void defineCompress(const char *arg)
if
(
strncmp
(
arg
,
"szip"
,
len
)
==
0
)
{
Z
type
=
COMPRESS_SZIP
;
comp
type
=
COMPRESS_SZIP
;
}
else
if
(
strncmp
(
arg
,
"jpeg"
,
len
)
==
0
)
{
Z
type
=
COMPRESS_JPEG
;
comp
type
=
COMPRESS_JPEG
;
}
else
if
(
strncmp
(
arg
,
"gzip"
,
len
)
==
0
)
{
Z
type
=
COMPRESS_GZIP
;
Z
level
=
6
;
comp
type
=
COMPRESS_GZIP
;
comp
level
=
6
;
}
else
if
(
strncmp
(
arg
,
"zip"
,
len
)
==
0
)
{
Z
type
=
COMPRESS_ZIP
;
Z
level
=
1
;
comp
type
=
COMPRESS_ZIP
;
comp
level
=
1
;
}
else
fprintf
(
stderr
,
"%s compression unsupported!
\n
"
,
arg
);
...
...
@@ -683,7 +682,7 @@ int main(int argc, char *argv[])
int
varID
;
int
itableID
=
CDI_UNDEFID
,
otableID
=
CDI_UNDEFID
;
int
Info
=
1
;
char
varname
[
128
];
char
varname
[
CDI_MAX_NAME
];
char
paramstr
[
32
];
Progname
=
strrchr
(
argv
[
0
],
'/'
);
...
...
@@ -756,6 +755,7 @@ int main(int argc, char *argv[])
if
(
rTable
)
{
itableID
=
tableInq
(
-
1
,
0
,
rTable
);
if
(
itableID
!=
CDI_UNDEFID
)
cdiDefTableID
(
itableID
);
otableID
=
itableID
;
}
...
...
@@ -810,7 +810,7 @@ int main(int argc, char *argv[])
taxisID
=
vlistInqTaxis
(
vlistID1
);
ntsteps
=
vlistNtsteps
(
vlistID1
);
if
(
Debug
)
fprintf
(
stderr
,
"nvars = %d
\n
"
,
nvars
);
if
(
Debug
)
fprintf
(
stderr
,
"nvars
= %d
\n
"
,
nvars
);
if
(
Debug
)
fprintf
(
stderr
,
"ntsteps = %d
\n
"
,
ntsteps
);
if
(
fname2
)
vlistID2
=
vlistDuplicate
(
vlistID1
);
...
...
@@ -842,10 +842,10 @@ int main(int argc, char *argv[])
if
(
DefaultByteorder
!=
CDI_UNDEFID
)
streamDefByteorder
(
streamID2
,
DefaultByteorder
);
if
(
Z
type
!=
COMPRESS_NONE
)
if
(
comp
type
!=
COMPRESS_NONE
)
{
streamDef
Zt
ype
(
streamID2
,
Z
type
);
streamDef
Zl
evel
(
streamID2
,
Z
level
);
streamDef
CompT
ype
(
streamID2
,
comp
type
);
streamDef
CompL
evel
(
streamID2
,
comp
level
);
}
streamDefVlist
(
streamID2
,
vlistID2
);
...
...
app/printinfo.h
View file @
0aeaebc9
...
...
@@ -52,6 +52,9 @@ void printFiletype(int streamID, int vlistID)
case
FILETYPE_NC4
:
printf
(
"netCDF4"
);
break
;
case
FILETYPE_NC4C
:
printf
(
"netCDF4 classic"
);
break
;
case
FILETYPE_SRV
:
printf
(
"SERVICE"
);
break
;
...
...
@@ -78,21 +81,21 @@ void printFiletype(int streamID, int vlistID)
}
}
if
(
filetype
==
FILETYPE_GRB
||
filetype
==
FILETYPE_NC4
)
if
(
filetype
==
FILETYPE_GRB
||
filetype
==
FILETYPE_NC4
||
filetype
==
FILETYPE_NC4C
)
{
int
nvars
,
varID
;
int
z
type
;
int
comp
type
;
nvars
=
vlistNvars
(
vlistID
);
for
(
varID
=
0
;
varID
<
nvars
;
varID
++
)
{
z
type
=
vlistInqVar
Zt
ype
(
vlistID
,
varID
);
if
(
z
type
)
comp
type
=
vlistInqVar
CompT
ype
(
vlistID
,
varID
);
if
(
comp
type
)
{
if
(
z
type
==
COMPRESS_SZIP
)
if
(
comp
type
==
COMPRESS_SZIP
)
printf
(
" SZIP"
);
else
if
(
z
type
==
COMPRESS_ZIP
)
else
if
(
comp
type
==
COMPRESS_ZIP
)
printf
(
" ZIP"
);
break
;
...
...
@@ -103,16 +106,16 @@ void printFiletype(int streamID, int vlistID)
if
(
filetype
==
FILETYPE_GRB2
)
{
int
nvars
,
varID
;
int
z
type
;
int
comp
type
;
nvars
=
vlistNvars
(
vlistID
);
for
(
varID
=
0
;
varID
<
nvars
;
varID
++
)
{
z
type
=
vlistInqVar
Zt
ype
(
vlistID
,
varID
);
if
(
z
type
)
comp
type
=
vlistInqVar
CompT
ype
(
vlistID
,
varID
);
if
(
comp
type
)
{
if
(
z
type
==
COMPRESS_JPEG
)
if
(
comp
type
==
COMPRESS_JPEG
)
printf
(
" JPEG"
);
break
;
...
...
@@ -129,7 +132,7 @@ void printGridInfo(int vlistID)
int
ngrids
,
index
;
int
gridID
,
gridtype
,
trunc
,
gridsize
,
xsize
,
ysize
;
int
nbyte0
;
char
xname
[
128
],
yname
[
128
],
xunits
[
128
],
yunits
[
128
];
char
xname
[
CDI_MAX_NAME
],
yname
[
CDI_MAX_NAME
],
xunits
[
CDI_MAX_NAME
],
yunits
[
CDI_MAX_NAME
];
ngrids
=
vlistNgrids
(
vlistID
);
for
(
index
=
0
;
index
<
ngrids
;
index
++
)
...
...
@@ -145,9 +148,7 @@ void printGridInfo(int vlistID)
gridInqXunits
(
gridID
,
xunits
);
gridInqYunits
(
gridID
,
yunits
);
/* nbyte0 = fprintf(stdout, " %4d : %-23s : ",*/
nbyte0
=
fprintf
(
stdout
,
" %4d : %-12s > "
,
gridID
+
1
,
gridNamePtr
(
gridtype
));
nbyte0
=
fprintf
(
stdout
,
" %4d : %-12s > "
,
index
+
1
,
gridNamePtr
(
gridtype
));
if
(
gridtype
==
GRID_LONLAT
||
gridtype
==
GRID_LCC2
||
...
...
config/default
View file @
0aeaebc9
...
...
@@ -15,6 +15,8 @@ case "${HOSTNAME}" in
hama
*
)
./configure
--prefix
=
$HOME
/local
\
--enable-maintainer-mode
\
--enable-swig
\
--enable-python
\
--with-jasper
=
/opt/local
\
--with-grib_api
=
$HOME
/local/gribapi-1.9.8
\
--with-netcdf
=
/opt/local
\
...
...
@@ -33,6 +35,8 @@ case "${HOSTNAME}" in
./configure
--prefix
=
$HOME
/local/etch-ia32
\
--enable-maintainer-mode
\
--enable-all-static
\
--enable-swig
\
--enable-python
\
--with-jasper
=
/sw/etch-ia32/jasper-1.900.1
\
--with-grib_api
=
$HOME
/local/etch-ia32/grib_api-1.9.8
\
--with-netcdf
=
/sw/etch-ia32/netcdf-4.0.1
\
...
...
configure
View file @
0aeaebc9
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for cdi 1.5.
0
.
# Generated by GNU Autoconf 2.65 for cdi 1.5.
1
.
#
# Report bugs to <http://code.zmaw.de/projects/cdi>.
#
...
...
@@ -562,8 +562,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdi'
PACKAGE_TARNAME='cdi'
PACKAGE_VERSION='1.5.
0
'
PACKAGE_STRING='cdi 1.5.
0
'
PACKAGE_VERSION='1.5.
1
'
PACKAGE_STRING='cdi 1.5.
1
'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdi'
PACKAGE_URL=''
...
...
@@ -638,6 +638,7 @@ ENABLE_GRIB
GRIB_API_INCLUDE
GRIB_API_LDFLAGS
JASPER_LDFLAGS
NC_CONFIG
NETCDF_INCLUDE
NETCDF_LDFLAGS
HDF5_INCLUDE
...
...
@@ -1367,7 +1368,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.5.
0
to adapt to many kinds of systems.
\`configure' configures cdi 1.5.
1
to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
...
...
@@ -1437,7 +1438,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdi 1.5.
0
:";;
short | recursive ) echo "Configuration of cdi 1.5.
1
:";;
esac
cat <<\_ACEOF
...
...
@@ -1585,7 +1586,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdi configure 1.5.
0
cdi configure 1.5.
1
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
...
...
@@ -2302,7 +2303,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.5.
0
, which was
It was created by cdi $as_me 1.5.
1
, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
...
...
@@ -3098,7 +3099,7 @@ fi
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.5.
0
'
VERSION='1.5.
1
'
cat >>confdefs.h <<_ACEOF
...
...
@@ -23321,7 +23322,72 @@ fi
NETCDF_LDFLAGS=" -lnetcdf"
NETCDF_INCLUDE=""
;; #(
# Extract the first word of "nc-config", so it can be a program name with args.
set dummy nc-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_NC_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NC_CONFIG"; then
ac_cv_prog_NC_CONFIG="$NC_CONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NC_CONFIG="nc-config"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
NC_CONFIG=$ac_cv_prog_NC_CONFIG
if test -n "$NC_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NC_CONFIG" >&5
$as_echo "$NC_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$NC_CONFIG" != "x"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc2 support" >&5
$as_echo_n "checking netcdf's nc2 support... " >&6; }
if test "x$($NC_CONFIG --has-nc2)" = "xyes"; then :
$as_echo "#define HAVE_NETCDF2 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc4 support" >&5
$as_echo_n "checking netcdf's nc4 support... " >&6; }
if test "x$($NC_CONFIG --has-nc4)" = "xyes"; then :
$as_echo "#define HAVE_NETCDF4 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
else
$as_echo Could not find nc-config! go on with default configuration
fi ;; #(
*) :
NETCDF_ROOT=$with_netcdf
if test -d "$NETCDF_ROOT"; then :
...
...
@@ -23403,6 +23469,77 @@ fi
NETCDF_INCLUDE=" -I$NETCDF_ROOT/include"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking nc-config script" >&5
$as_echo_n "checking nc-config script... " >&6; }
# Extract the first word of "nc-config", so it can be a program name with args.
set dummy nc-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_NC_CONFIG+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test -n "$NC_CONFIG"; then
ac_cv_prog_NC_CONFIG="$NC_CONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in "$NETCDF_ROOT/bin"
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_NC_CONFIG="$NETCDF_ROOT/bin/nc-config"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
NC_CONFIG=$ac_cv_prog_NC_CONFIG
if test -n "$NC_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $NC_CONFIG" >&5
$as_echo "$NC_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
$as_echo $NC_CONFIG
if test "x$NC_CONFIG" != "x"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
$as_echo "found" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc2 support" >&5
$as_echo_n "checking netcdf's nc2 support... " >&6; }
if test "x$($NC_CONFIG --has-nc2)" = "xyes"; then :
$as_echo "#define HAVE_NETCDF2 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking netcdf's nc4 support" >&5
$as_echo_n "checking netcdf's nc4 support... " >&6; }
if test "x$($NC_CONFIG --has-nc4)" = "xyes"; then :
$as_echo "#define HAVE_NETCDF4 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Could not find nc-config! go on with default configuration" >&5
$as_echo "Could not find nc-config! go on with default configuration" >&6; }
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: $NETCDF_ROOT is not a directory! NETCDF suppressed" >&5
$as_echo "$as_me: $NETCDF_ROOT is not a directory! NETCDF suppressed" >&6;}
...
...
@@ -24892,7 +25029,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.5.
0
, which was
This file was extended by cdi $as_me 1.5.
1
, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
...
...
@@ -24958,7 +25095,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
cdi config.status 1.5.
0
cdi config.status 1.5.
1
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
...
...
configure.ac
View file @
0aeaebc9
# Process this file with autoconf to produce a configure script.
AC_INIT([cdi], [1.5.
0
], [http://code.zmaw.de/projects/cdi])
AC_INIT([cdi], [1.5.
1
], [http://code.zmaw.de/projects/cdi])
echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
...
...
doc/tex/c_grid.tex
View file @
0aeaebc9
...
...
@@ -67,7 +67,7 @@ Here is an example using {\tt gridCreate} to create a regular lon/lat Grid:
\hspace*
{
4mm
}
\begin{minipage}
[]
{
15cm
}
\begin{deflist}
{
\tt
gridID
\
}
\item
[{\tt gridID}]
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
.
\end{deflist}
\end{minipage}
...
...
@@ -115,7 +115,7 @@ The function {\tt gridInqType} returns the type of a Grid.
\hspace*
{
4mm
}
\begin{minipage}
[]
{
15cm
}
\begin{deflist}
{
\tt
gridID
\
}
\item
[{\tt gridID}]
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
.
\end{deflist}
\end{minipage}
...
...
@@ -171,9 +171,9 @@ The function {\tt gridDefXsize} defines the number of values of a X-axis.
\hspace*
{
4mm
}
\begin{minipage}
[]
{
15cm
}
\begin{deflist}
{
\tt
gridID
\
}
\item
[{\tt gridID}]
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
.
\item
[{\tt xsize}]
Number of values of a X-axis
Number of values of a X-axis
.
\end{deflist}
\end{minipage}
...
...
@@ -194,7 +194,7 @@ The function {\tt gridInqXsize} returns the number of values of a X-axis.
\hspace*
{
4mm
}
\begin{minipage}
[]
{
15cm
}
\begin{deflist}
{
\tt
gridID
\
}
\item
[{\tt gridID}]
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
.
\end{deflist}
\end{minipage}
...
...
@@ -220,9 +220,9 @@ The function {\tt gridDefYsize} defines the number of values of a Y-axis.
\hspace*
{
4mm
}
\begin{minipage}
[]
{
15cm
}
\begin{deflist}
{
\tt
gridID
\
}
\item
[{\tt gridID}]
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
.
\item
[{\tt ysize}]
Number of values of a Y-axis
Number of values of a Y-axis
.
\end{deflist}
\end{minipage}
...
...
@@ -243,7 +243,7 @@ The function {\tt gridInqYsize} returns the number of values of a Y-axis.
\hspace*
{
4mm
}
\begin{minipage}
[]
{
15cm
}
\begin{deflist}
{
\tt
gridID
\
}
\item
[{\tt gridID}]
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
.
\end{deflist}
\end{minipage}
...
...
@@ -269,9 +269,9 @@ The function {\tt gridDefXvals} defines all values of the X-axis.
\hspace*
{
4mm
}
\begin{minipage}
[]
{
15cm
}
\begin{deflist}
{
\tt
gridID
\
}
\item
[{\tt gridID}]
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
.
\item
[{\tt xvals}]
X-values of the grid
X-values of the grid
.
\end{deflist}
\end{minipage}
...
...
@@ -292,9 +292,10 @@ The function {\tt gridInqXvals} returns all values of the X-axis.
\hspace*
{
4mm
}
\begin{minipage}
[]
{
15cm
}
\begin{deflist}
{
\tt
gridID
\
}
\item
[{\tt gridID}]
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
.
\item
[{\tt xvals}]
X-values of the grid
Pointer to the location into which the X-values are read.
The caller must allocate space for the returned values.
\end{deflist}
\end{minipage}
...
...
@@ -322,9 +323,9 @@ The function {\tt gridDefYvals} defines all values of the Y-axis.
\hspace*
{
4mm
}
\begin{minipage}
[]
{
15cm
}
\begin{deflist}
{
\tt
gridID
\
}
\item
[{\tt gridID}]
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
.
\item
[{\tt yvals}]
Y-values of the grid
Y-values of the grid
.
\end{deflist}
\end{minipage}
...
...
@@ -345,9 +346,10 @@ The function {\tt gridInqYvals} returns all values of the Y-axis.
\hspace*
{
4mm
}
\begin{minipage}
[]
{
15cm
}
\begin{deflist}
{
\tt
gridID
\
}
\item
[{\tt gridID}]
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
Grid ID, from a previous call to
{
\htmlref
{
\tt
gridCreate
}{
gridCreate
}}
.
\item
[{\tt yvals}]