Commit 0eb0da39 authored by Uwe Schulzweida's avatar Uwe Schulzweida

config/defaiult: added defaults for thunder

parent ac0e5ad3
2012-07-?? Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
2012-07-23 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CDI library version 1.5.6
* Version 1.5.6 released
......
CDO NEWS
--------
Version 1.5.6 (?? Jul 2012):
Version 1.5.6 (23 July 2012):
New features:
* Runstat: OpenMP parallelization over parameter nts
* import_binary: added support for 64-bit floats via extra OPTION keyword flt64
New operators:
* showunit: show unit of a parameter
Changed operators:
* Arith: added support for 3D masks
* mastrfu: use grid coordinates from input file
Fixed bugs:
* ymonsub: added support for time bounds
* Wrong netCDF output for unscaled uint8, int8, int16, int32 variables [Bug #2516]
Version 1.5.5 (15 May 2012):
......
......@@ -17,6 +17,19 @@ fi
set -x
#
case "${HOSTNAME}" in
icc)
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
--with-jasper=$HOME/local \
--with-grib_api=$HOME/local/gribapi-1.9.16cgribex \
--with-netcdf=$HOME/local \
--with-hdf5=$HOME/local \
--with-szlib=$HOME/local \
--with-proj=/opt/local \
--with-magics=/Users/m214003/local/magics-2.14.9 \
CC=icc CFLAGS="-g -D_REENTRANT -Wall -W -O3 -openmp -DHAVE_LIBXML -I/usr/include/libxml2 -I/opt/include" \
LIBS="-L/usr/lib -lxml2 -L/opt/local/lib -lopenjpeg"
;;
# i386-apple-darwin10
bailung*)
${CONFPATH}configure --prefix=$HOME/local \
......@@ -63,24 +76,27 @@ case "${HOSTNAME}" in
CC=gcc CFLAGS='-g -Wall -O2 -fopenmp'
# CC=suncc CFLAGS="-g -fast -xopenmp"
;;
# x86_64-etch-x64-linux
# squall*)
# ${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/etch-x64 \
# --enable-all-static \
# --with-netcdf=/sw/etch-x64/netcdf-4.0.1 \
# --with-hdf5=/sw/etch-x64/hdf5-1.8.2 \
# --with-szlib=/sw/etch-x64/szip-2.1-static \
# --with-proj=/sw/etch-x64/proj-4.7.0 \
# CC=gcc CFLAGS='-g -Wall -O2 -fopenmp'
# ;;
# x86_64-squeeze-x64-linux
thunder*)
${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/squeeze-x64 \
--with-jasper=/sw/squeeze-x64/jasper-1.900.1-static \
--with-grib_api=/sw/squeeze-x64/grib_api-1.9.9-static \
--with-netcdf=/sw/squeeze-x64/netcdf-4.2-static \
--with-hdf5=/sw/squeeze-x64/hdf5-1.8.8-static \
--with-szlib=/sw/squeeze-x64/szip-2.1 \
--with-proj=/sw/squeeze-x64/proj-4.7.0 \
CC=gcc CFLAGS='-g -Wall -O3 -fopenmp'
;;
# x86_64-lenny-linux-gnu
squall*)
${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/lenny-x64 \
--with-jasper=/sw/lenny-x64/jasper-1.900.1-static \
--with-grib_api=/sw/lenny-x64/grib_api-1.9.9-static \
--with-netcdf=/sw/lenny-x64/netcdf-4.2-static \
--with-hdf5=/sw/lenny-x64/hdf5-1.8.8-static \
--with-szlib=/sw/lenny-x64/szip-2.1 \
--with-proj=/sw/lenny-x64/proj-4.7.0 \
CC=gcc CFLAGS='-g -Wall -O2 -fopenmp'
CC=gcc CFLAGS='-g -Wall -O3 -fopenmp'
;;
# x86_64-archlinux
thingol*)
......@@ -105,19 +121,6 @@ case "${HOSTNAME}" in
--with-szlib=$HOME/local \
CC=colorgcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O2 -fopenmp"
;;
# i686-linux
etch-ia32 | gata)
${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/etch-ia32 \
--enable-maintainer-mode \
--with-jasper=/sw/etch-ia32/jasper-1.900.1 \
--with-grib_api=$HOME/local/etch-ia32/grib_api-1.9.9 \
--with-netcdf=/sw/etch-ia32/netcdf-4.1.1-gcc \
--with-hdf5=/sw/etch-ia32/hdf5-1.8.4-threadsafe \
--with-zlib=/sw/etch-ia32/zlib-1.2.3 \
--with-szlib=$HOME/local/etch-ia32 \
--with-proj=/sw/etch-ia32/proj-4.6.0 \
CC=gcc CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O2"
;;
# standard workstations at MPI-M x86_64-lenny
mpipc* )
${CONFPATH}configure \
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for cdo 1.5.6rc3.
# Generated by GNU Autoconf 2.69 for cdo 1.5.6.
#
# Report bugs to <http://code.zmaw.de/projects/cdo>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdo'
PACKAGE_TARNAME='cdo'
PACKAGE_VERSION='1.5.6rc3'
PACKAGE_STRING='cdo 1.5.6rc3'
PACKAGE_VERSION='1.5.6'
PACKAGE_STRING='cdo 1.5.6'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdo'
PACKAGE_URL=''
......@@ -1378,7 +1378,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 cdo 1.5.6rc3 to adapt to many kinds of systems.
\`configure' configures cdo 1.5.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1448,7 +1448,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdo 1.5.6rc3:";;
short | recursive ) echo "Configuration of cdo 1.5.6:";;
esac
cat <<\_ACEOF
......@@ -1589,7 +1589,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdo configure 1.5.6rc3
cdo configure 1.5.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2136,7 +2136,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 cdo $as_me 1.5.6rc3, which was
It was created by cdo $as_me 1.5.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -3040,7 +3040,7 @@ fi
# Define the identity of the package.
PACKAGE='cdo'
VERSION='1.5.6rc3'
VERSION='1.5.6'
cat >>confdefs.h <<_ACEOF
......@@ -19268,7 +19268,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 cdo $as_me 1.5.6rc3, which was
This file was extended by cdo $as_me 1.5.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -19334,7 +19334,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="\\
cdo config.status 1.5.6rc3
cdo config.status 1.5.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
# Process this file with autoconf to produce a configure script.
AC_INIT([cdo], [1.5.6rc3], [http://code.zmaw.de/projects/cdo])
AC_INIT([cdo], [1.5.6], [http://code.zmaw.de/projects/cdo])
CONFIG_ABORT=yes
AC_CONFIG_AUX_DIR(config)
......
......@@ -164,7 +164,7 @@ int GetMagicsParameterInfo( const char *user_name, char *param_value )
int ret_flag = 0;
#if defined (HAVE_LIBMAGICS)
CdoMagicsMapper target, *result;
target.cdo_name = user_name;
target.cdo_name = (char *) user_name;
if( once )
{
......
......@@ -901,6 +901,9 @@ int main(int argc, char *argv[])
#if defined (__GNUC__)
fprintf(stderr, "GNUC VERSION = %d\n", __GNUC__);
#endif
#if defined (__ICC)
fprintf(stderr, "ICC VERSION = %d\n", __ICC);
#endif
#if defined (__STDC__)
fprintf(stderr, "STD ANSI C = %d\n", __STDC__);
#endif
......
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