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
60aaf07e
Commit
60aaf07e
authored
May 13, 2011
by
Uwe Schulzweida
Browse files
ruby/python interface: changed GRID_CELL to GRID_UNSTRUCTURED
parent
4a4b049a
Changes
10
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
60aaf07e
2011-05-13 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* 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]
...
...
NEWS
View file @
60aaf07e
...
...
@@ -5,6 +5,8 @@ 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):
...
...
config/default
View file @
60aaf07e
...
...
@@ -33,6 +33,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 @
60aaf07e
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.66 for cdi 1.5.
0
.
# Generated by GNU Autoconf 2.66 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=''
...
...
@@ -1367,7 +1367,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 +1437,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
...
...
@@ -1583,7 +1583,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.66
Copyright (C) 2010 Free Software Foundation, Inc.
...
...
@@ -2298,7 +2298,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.66. Invocation command line was
$ $0 $@
...
...
@@ -3230,7 +3230,7 @@ fi
# Define the identity of the package.
PACKAGE='cdi'
VERSION='1.5.
0
'
VERSION='1.5.
1
'
cat >>confdefs.h <<_ACEOF
...
...
@@ -24811,7 +24811,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.66. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
...
...
@@ -24877,7 +24877,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.66,
with options \\"\$ac_cs_config\\"
...
...
configure.ac
View file @
60aaf07e
# 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}"
...
...
interfaces/cdi.cpp
View file @
60aaf07e
...
...
@@ -93,7 +93,7 @@ void CdiGrid::getBounds()
hasBounds
=
(
gridInqXbounds
(
gridID
,
NULL
)
&&
gridInqYbounds
(
gridID
,
NULL
));
if
(
hasBounds
)
{
ncorner
=
(
gridInqType
(
gridID
)
==
GRID_
CELL
)
?
gridInqNvertex
(
gridID
)
:
4
;
ncorner
=
(
gridInqType
(
gridID
)
==
GRID_
UNSTRUCTURED
)
?
gridInqNvertex
(
gridID
)
:
4
;
ncorner
*=
size
;
xbnds
=
(
double
*
)
malloc
((
ncorner
*
size
)
*
sizeof
(
double
));
ybnds
=
(
double
*
)
malloc
((
ncorner
*
size
)
*
sizeof
(
double
));
...
...
interfaces/python/CdiLib.py
View file @
60aaf07e
...
...
@@ -124,7 +124,7 @@ GRID_SPECTRAL = _CdiLib.GRID_SPECTRAL
GRID_FOURIER
=
_CdiLib
.
GRID_FOURIER
GRID_GME
=
_CdiLib
.
GRID_GME
GRID_TRAJECTORY
=
_CdiLib
.
GRID_TRAJECTORY
GRID_
CELL
=
_CdiLib
.
GRID_
CELL
GRID_
UNSTRUCTURED
=
_CdiLib
.
GRID_
UNSTRUCTURED
GRID_CURVILINEAR
=
_CdiLib
.
GRID_CURVILINEAR
GRID_LCC
=
_CdiLib
.
GRID_LCC
GRID_LCC2
=
_CdiLib
.
GRID_LCC2
...
...
interfaces/python/cdilib_wrap.c
View file @
60aaf07e
...
...
@@ -13248,7 +13248,7 @@ SWIGEXPORT void SWIG_init(void) {
SWIG_Python_SetConstant
(
d
,
"GRID_FOURIER"
,
SWIG_From_int
((
int
)(
6
)));
SWIG_Python_SetConstant
(
d
,
"GRID_GME"
,
SWIG_From_int
((
int
)(
7
)));
SWIG_Python_SetConstant
(
d
,
"GRID_TRAJECTORY"
,
SWIG_From_int
((
int
)(
8
)));
SWIG_Python_SetConstant
(
d
,
"GRID_
CELL
"
,
SWIG_From_int
((
int
)(
9
)));
SWIG_Python_SetConstant
(
d
,
"GRID_
UNSTRUCTURED
"
,
SWIG_From_int
((
int
)(
9
)));
SWIG_Python_SetConstant
(
d
,
"GRID_CURVILINEAR"
,
SWIG_From_int
((
int
)(
10
)));
SWIG_Python_SetConstant
(
d
,
"GRID_LCC"
,
SWIG_From_int
((
int
)(
11
)));
SWIG_Python_SetConstant
(
d
,
"GRID_LCC2"
,
SWIG_From_int
((
int
)(
12
)));
...
...
interfaces/ruby/cdilib_wrap.c
View file @
60aaf07e
...
...
@@ -11859,7 +11859,7 @@ SWIGEXPORT void Init_CdiLib(void) {
rb_define_const
(
mCdiLib
,
"GRID_FOURIER"
,
SWIG_From_int
((
int
)(
6
)));
rb_define_const
(
mCdiLib
,
"GRID_GME"
,
SWIG_From_int
((
int
)(
7
)));
rb_define_const
(
mCdiLib
,
"GRID_TRAJECTORY"
,
SWIG_From_int
((
int
)(
8
)));
rb_define_const
(
mCdiLib
,
"GRID_
CELL
"
,
SWIG_From_int
((
int
)(
9
)));
rb_define_const
(
mCdiLib
,
"GRID_
UNSTRUCTURED
"
,
SWIG_From_int
((
int
)(
9
)));
rb_define_const
(
mCdiLib
,
"GRID_CURVILINEAR"
,
SWIG_From_int
((
int
)(
10
)));
rb_define_const
(
mCdiLib
,
"GRID_LCC"
,
SWIG_From_int
((
int
)(
11
)));
rb_define_const
(
mCdiLib
,
"GRID_LCC2"
,
SWIG_From_int
((
int
)(
12
)));
...
...
src/mo_cdi.f90
View file @
60aaf07e
...
...
@@ -89,7 +89,7 @@ module mo_cdi
integer
::
GRID_FOURIER
=
6
integer
::
GRID_GME
=
7
integer
::
GRID_TRAJECTORY
=
8
integer
::
GRID_
CELL
=
9
integer
::
GRID_
UNSTRUCTURED
=
9
integer
::
GRID_CURVILINEAR
=
10
integer
::
GRID_LCC
=
11
integer
::
GRID_LCC2
=
12
...
...
@@ -3077,7 +3077,7 @@ module mo_cdi
public
::
GRID_FOURIER
public
::
GRID_GME
public
::
GRID_TRAJECTORY
public
::
GRID_
CELL
public
::
GRID_
UNSTRUCTURED
public
::
GRID_CURVILINEAR
public
::
GRID_LCC
public
::
GRID_LCC2
...
...
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