Skip to content

GitLab

Commit 103369a9 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Merge branch 'develop' of git.mpimet.mpg.de:cdo into develop

parents 95d7bb27 e68ec7a9
Expand all Hide whitespace changes
Inline Side-by-side
.rake.json
View file @ 103369a9
......@@ -7,7 +7,7 @@
"breeze": {
"hostname": "breeze.mpimet.mpg.de",
"dir": "/home/mpim/m300064/builds/remote",
"envConfigFiles": ["/etc/profile",".profile"],
"envConfigFiles": ["/etc/profile","~/.profile"],
"CC": ["gcc","g++","clang","clang++","icc","icpc","pgcc"]
},
"mistral": {
......
Makefile.am
View file @ 103369a9
# Process this file with automake to produce Makefile.in
SUBDIRS = libcdi src/lib/ncl src contrib test/data test test/bandit_tests
SUBDIRS = libcdi src/lib/ncl src contrib test/data test
if MAINTAINER_MODE
SUBDIRS += test/bandit_tests
endif
#
EXTRA_DIST=config/default OPERATORS doc/cdo.pdf doc/cdo_cmor.pdf doc/cdo_eca.pdf doc/cdo_magics.pdf doc/cdo_refcard.pdf cdo.spec README
#
......
Makefile.in
View file @ 103369a9
# Makefile.in generated by automake 1.14 from Makefile.am.
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
......@@ -77,6 +77,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@MAINTAINER_MODE_TRUE@am__append_1 = test/bandit_tests
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
......@@ -164,7 +165,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DIST_SUBDIRS = libcdi src/lib/ncl src contrib test/data test \
test/bandit_tests
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -388,7 +390,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
# Process this file with automake to produce Makefile.in
SUBDIRS = libcdi src/lib/ncl src contrib test/data test test/bandit_tests
SUBDIRS = libcdi src/lib/ncl src contrib test/data test \
$(am__append_1)
#
EXTRA_DIST = config/default OPERATORS doc/cdo.pdf doc/cdo_cmor.pdf doc/cdo_eca.pdf doc/cdo_magics.pdf doc/cdo_refcard.pdf cdo.spec README
#
......@@ -684,9 +687,10 @@ distcheck: dist
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
&& ../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......
aclocal.m4
View file @ 103369a9
# generated automatically by aclocal 1.14 -*- Autoconf -*-
# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
......@@ -14,8 +14,8 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
[m4_warning([this file was generated for autoconf 2.68.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
......@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.14'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.14], [],
m4_if([$1], [1.14.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.14])dnl
[AM_AUTOMAKE_VERSION([1.14.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
......@@ -163,10 +163,9 @@ AC_SUBST([AR])dnl
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
[dnl Rely on autoconf to set up CDPATH properly.
AC_PREREQ([2.50])dnl
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
# Expand $ac_aux_dir to an absolute path.
am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
......@@ -633,7 +632,8 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
fi])
fi
])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
......
config/default
View file @ 103369a9
......@@ -178,12 +178,12 @@ case "${HOSTNAME}" in
;;
# jessie workstation x64
breeze*)
CDOLIBS="--with-grib_api=/sw/jessie-x64/grib_api-1.14.3-static-gccsys \
CDOLIBS="--with-eecodes=/sw/jessie-x64/eccodes/eccodes-2.4.1-gccsys \
--with-netcdf=/sw/jessie-x64/netcdf-4.3.3.1-gccsys \
--with-udunits2=/sw/jessie-x64/udunits-2.2.20-gccsys \
--with-proj=/sw/jessie-x64/proj4-4.9.3-gccsys LIBS=-lz"
if test "$COMP" = icpc ; then
${CONFPATH}configure --enable-cxx --prefix=$HOME/local --exec_prefix=$HOME/local/thunder \
${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/thunder \
--with-fftw3 \
$CDOLIBS \
CC=icc CXX=icpc CFLAGS="-g -Wall -O2 -qopt-report=5 -march=native"
......@@ -202,12 +202,12 @@ case "${HOSTNAME}" in
$CDOLIBS \
CC=clang CXX=clang++ CFLAGS="-g -O2"
elif test "$COMP" = clang++ ; then
${CONFPATH}configure --enable-cxx --prefix=$HOME/local --exec_prefix=$HOME/local/thunder \
${CONFPATH}configure --prefix=$HOME/local --exec_prefix=$HOME/local/thunder \
--with-fftw3 \
$CDOLIBS \
CC=clang CXX=clang++ CFLAGS="-g -O2"
elif test "$COMP" = g++ ; then
${CONFPATH}configure --enable-cxx \
${CONFPATH}configure \
$CDOLIBS \
CC=gcc CXX=g++ CFLAGS="-g -Wall -O3"
else
......@@ -295,7 +295,7 @@ case "${HOSTNAME}" in
--with-hdf5 \
--with-szlib \
--with-grib_api \
--with-udunits2 \
--with-eccodes \
--with-grib_api \
--with-fftw3 \
--with-proj \
......@@ -319,9 +319,8 @@ case "${HOSTNAME}" in
--with-netcdf \
--with-hdf5 \
--with-szlib \
--with-grib_api \
--with-eccodes \
--with-udunits2 \
--with-grib_api \
--with-fftw3 \
--with-proj \
--with-pic \
......
configure
View file @ 103369a9
This diff is collapsed.
contrib/Makefile.in
View file @ 103369a9
# Makefile.in generated by automake 1.14 from Makefile.am.
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
......
contrib/cdoCompletion.bash
View file @ 103369a9
complete -W "
--cmor \
--enableexcept \
--history \
--netcdf_hdr_pad, \
--no_warnings \
--operators \
--percentile \
--precision \
--reduce_dim \
--sortname \
--timestat_date \
-C, \
-L \
-M \
-O \
-P \
-Q \
-R, \
-S \
-V, \
......@@ -53,6 +56,7 @@ boxavg -boxavg \
cat -cat \
cdiread -cdiread \
cdiwrite -cdiwrite \
changemulti -changemulti \
chcode -chcode \
chlevel -chlevel \
chlevelc -chlevelc \
......@@ -65,6 +69,8 @@ chunit -chunit \
chvar -chvar \
cloudlayer -cloudlayer \
cmor -cmor \
cmorlite -cmorlite \
codetab -codetab \
collgrid -collgrid \
complextorect -complextorect \
consecsum -consecsum \
......@@ -83,6 +89,7 @@ daymax -daymax \
daymean -daymean \
daymin -daymin \
daypctl -daypctl \
dayrange -dayrange \
daystd -daystd \
daystd1 -daystd1 \
daysum -daysum \
......@@ -92,10 +99,13 @@ del29feb -del29feb \
delcode -delcode \
delday -delday \
delete -delete \
delgridcell -delgridcell \
delmulti -delmulti \
delname -delname \
delparam -delparam \
deltap -deltap \
deltap_fl -deltap_fl \
deltat -deltat \
delvar -delvar \
detrend -detrend \
diff -diff \
......@@ -109,6 +119,7 @@ divc -divc \
divcoslat -divcoslat \
divdpm -divdpm \
divdpy -divdpy \
dump_cmor_table -dump_cmor_table \
dumpmap -dumpmap \
duplicate -duplicate \
dv2ps -dv2ps \
......@@ -159,11 +170,13 @@ ensmax -ensmax \
ensmean -ensmean \
ensmin -ensmin \
enspctl -enspctl \
ensrange -ensrange \
ensrkhist_space -ensrkhist_space \
ensrkhist_time -ensrkhist_time \
ensrkhistspace -ensrkhistspace \
ensrkhisttime -ensrkhisttime \
ensroc -ensroc \
ensskew -ensskew \
ensstd -ensstd \
ensstd1 -ensstd1 \
enssum -enssum \
......@@ -179,6 +192,7 @@ eofspatial -eofspatial \
eoftime -eoftime \
eq -eq \
eqc -eqc \
estfreq -estfreq \
exp -exp \
export_e5ml -export_e5ml \
export_e5res -export_e5res \
......@@ -197,6 +211,7 @@ fldmax -fldmax \
fldmean -fldmean \
fldmin -fldmin \
fldpctl -fldpctl \
fldrange -fldrange \
fldrms -fldrms \
fldstd -fldstd \
fldstd1 -fldstd1 \
......@@ -220,8 +235,6 @@ genlevelbounds -genlevelbounds \
gennn -gennn \
genycon -genycon \
geopotheight -geopotheight \
ggstat -ggstat \
ggstats -ggstats \
gheight -gheight \
globavg -globavg \
gmtcells -gmtcells \
......@@ -237,6 +250,7 @@ gridboxavg -gridboxavg \
gridboxmax -gridboxmax \
gridboxmean -gridboxmean \
gridboxmin -gridboxmin \
gridboxrange -gridboxrange \
gridboxstd -gridboxstd \
gridboxstd1 -gridboxstd1 \
gridboxsum -gridboxsum \
......@@ -263,6 +277,7 @@ hourmax -hourmax \
hourmean -hourmean \
hourmin -hourmin \
hourpctl -hourpctl \
hourrange -hourrange \
hourstd -hourstd \
hourstd1 -hourstd1 \
hoursum -hoursum \
......@@ -296,14 +311,14 @@ int -int \
interpolate -interpolate \
intgrid -intgrid \
intgridbil -intgridbil \
intgridcon -intgridcon \
intgriddis -intgriddis \
intgridnn -intgridnn \
intgridtraj -intgridtraj \
intlevel -intlevel \
intlevel3d -intlevel3d \
intlevelx -intlevelx \
intlevelx3d -intlevelx3d \
intntime -intntime \
intpoint -intpoint \
inttime -inttime \
intyear -intyear \
invertlat -invertlat \
......@@ -343,6 +358,7 @@ mermax -mermax \
mermean -mermean \
mermin -mermin \
merpctl -merpctl \
merrange -merrange \
merstd -merstd \
merstd1 -merstd1 \
mersum -mersum \
......@@ -367,6 +383,7 @@ monmean -monmean \
monmin -monmin \
monmul -monmul \
monpctl -monpctl \
monrange -monrange \
monstd -monstd \
monstd1 -monstd1 \
monsub -monsub \
......@@ -382,7 +399,6 @@ muldoy -muldoy \
muldpm -muldpm \
muldpy -muldpy \
ncode -ncode \
ncode -ncode \
ncopy -ncopy \
ndate -ndate \
ne -ne \
......@@ -392,6 +408,7 @@ ngrids -ngrids \
nint -nint \
nlevel -nlevel \
nmon -nmon \
not -not \
npar -npar \
ntime -ntime \
nvar -nvar \
......@@ -426,8 +443,8 @@ pinfov -pinfov \
pow -pow \
pressure_fl -pressure_fl \
pressure_hl -pressure_hl \
projuvLatLon -projuvLatLon \
random -random \
read_cmor_table -read_cmor_table \
reci -reci \
reducegrid -reducegrid \
regres -regres \
......@@ -449,17 +466,22 @@ remapycon -remapycon \
replace -replace \
retocomplex -retocomplex \
rhopot -rhopot \
rotuvN -rotuvN \
rotuvNorth -rotuvNorth \
rotuvb -rotuvb \
runavg -runavg \
runmax -runmax \
runmean -runmean \
runmin -runmin \
runpctl -runpctl \
runrange -runrange \
runstd -runstd \
runstd1 -runstd1 \
runsum -runsum \
runvar -runvar \
runvar1 -runvar1 \
samplegrid -samplegrid \
samplegridicon -samplegridicon \
scatter -scatter \
sealevelpressure -sealevelpressure \
seasavg -seasavg \
......@@ -468,6 +490,7 @@ seasmax -seasmax \
seasmean -seasmean \
seasmin -seasmin \
seaspctl -seaspctl \
seasrange -seasrange \
seasstd -seasstd \
seasstd1 -seasstd1 \
seassum -seassum \
......@@ -483,8 +506,10 @@ seldate -seldate \
selday -selday \
select -select \
selgrid -selgrid \
selgridcell -selgridcell \
selgridname -selgridname \
selhour -selhour \
selindex -selindex \
selindexbox -selindexbox \
sellevel -sellevel \
sellevidx -sellevidx \
......@@ -492,6 +517,7 @@ sellonlatbox -sellonlatbox \
selltype -selltype \
selmon -selmon \
selmonth -selmonth \
selmulti -selmulti \
selname -selname \
seloperator -seloperator \
selparam -selparam \
......@@ -507,15 +533,15 @@ selvar -selvar \
selyear -selyear \
selzaxis -selzaxis \
selzaxisname -selzaxisname \
setattribute -setattribute \
setcalendar -setcalendar \
setcindexbox -setcindexbox \
setclonlatbox -setclonlatbox \
setcode -setcode \
setcodetab -setcodetab \
setctomiss -setctomiss \
setdate -setdate \
setday -setday \
setgatt -setgatt \
setgatts -setgatts \
setgrid -setgrid \
setgridarea -setgridarea \
setgridmask -setgridmask \
......@@ -525,6 +551,7 @@ setgriduri -setgriduri \
sethalo -sethalo \
setlevel -setlevel \
setltype -setltype \
setmiss -setmiss \
setmisstoc -setmisstoc \
setmisstodis -setmisstodis \
setmisstonn -setmisstonn \
......@@ -555,9 +582,16 @@ setyear -setyear \
setzaxis -setzaxis \
shaded -shaded \
shifttime -shifttime \
shiftx -shiftx \
shifty -shifty \
showattribute -showattribute \
showatts -showatts \
showattsglob -showattsglob \
showattsvar -showattsvar \
showcode -showcode \
showdate -showdate \
showformat -showformat \
showgrid -showgrid \
showlevel -showlevel \
showltype -showltype \
showmon -showmon \
......@@ -618,6 +652,7 @@ strgal -strgal \
strwin -strwin \
sub -sub \
subc -subc \
subgrid -subgrid \
subtrend -subtrend \
szip -szip \
tan -tan \
......@@ -628,16 +663,18 @@ timavg -timavg \
timcor -timcor \
timcount -timcount \
timcovar -timcovar \
timedt -timedt \
timcumsum -timcumsum \
timmax -timmax \
timmean -timmean \
timmin -timmin \
timpctl -timpctl \
timrange -timrange \
timselavg -timselavg \
timselmax -timselmax \
timselmean -timselmean \
timselmin -timselmin \
timselpctl -timselpctl \
timselrange -timselrange \
timselstd -timselstd \
timselstd1 -timselstd1 \
timselsum -timselsum \
......@@ -656,8 +693,12 @@ transxy -transxy \
trend -trend \
tstepcount -tstepcount \
unsetgridmask -unsetgridmask \
usegridnumber -usegridnumber \
uv2dv -uv2dv \
uv2dv_cfd -uv2dv_cfd \
uv2dvl -uv2dvl \
uv2vr_cfd -uv2vr_cfd \
uvDestag -uvDestag \
vardes -vardes \
varquot2test -varquot2test \
vct -vct \
......@@ -671,6 +712,7 @@ vertint -vertint \
vertmax -vertmax \
vertmean -vertmean \
vertmin -vertmin \
vertrange -vertrange \
vertstd -vertstd \
vertstd1 -vertstd1 \
vertsum -vertsum \
......@@ -681,6 +723,7 @@ vlist -vlist \
wct -wct \
writegrid -writegrid \
writerandom -writerandom \
xinfon -xinfon \
ydayadd -ydayadd \
ydayavg -ydayavg \
ydaydiv -ydaydiv \
......@@ -689,6 +732,7 @@ ydaymean -ydaymean \
ydaymin -ydaymin \
ydaymul -ydaymul \
ydaypctl -ydaypctl \
ydayrange -ydayrange \
ydaystd -ydaystd \
ydaystd1 -ydaystd1 \
ydaysub -ydaysub \
......@@ -713,6 +757,7 @@ yearmin -yearmin \
yearmonavg -yearmonavg \
yearmonmean -yearmonmean \
yearpctl -yearpctl \
yearrange -yearrange \
yearstd -yearstd \
yearstd1 -yearstd1 \
yearsum -yearsum \
......@@ -725,6 +770,7 @@ yhourmax -yhourmax \
yhourmean -yhourmean \
yhourmin -yhourmin \
yhourmul -yhourmul \
yhourrange -yhourrange \
yhourstd -yhourstd \
yhourstd1 -yhourstd1 \
yhoursub -yhoursub \
......@@ -739,6 +785,7 @@ ymonmean -ymonmean \
ymonmin -ymonmin \
ymonmul -ymonmul \
ymonpctl -ymonpctl \
ymonrange -ymonrange \
ymonstd -ymonstd \
ymonstd1 -ymonstd1 \
ymonsub -ymonsub \
......@@ -753,6 +800,7 @@ yseasmean -yseasmean \
yseasmin -yseasmin \
yseasmul -yseasmul \
yseaspctl -yseaspctl \
yseasrange -yseasrange \
yseasstd -yseasstd \
yseasstd1 -yseasstd1 \
yseassub -yseassub \
......
contrib/cdoCompletion.tcsh
View file @ 103369a9
set cdoCmpl = (\
-cmor \
-enableexcept \
-history \
-netcdf_hdr_pad, \
-no_warnings \
-operators \
-percentile \
-precision \
-reduce_dim \
-sortname \
-timestat_date \
C, \
L \
M \
O \
P \
Q \
R, \
S \
V, \
......@@ -53,6 +56,7 @@ boxavg \
cat \
cdiread \
cdiwrite \
changemulti \
chcode \
chlevel \
chlevelc \
......@@ -65,6 +69,8 @@ chunit \
chvar \
cloudlayer \
cmor \
cmorlite \
codetab \
collgrid \
complextorect \
consecsum \
......@@ -83,6 +89,7 @@ daymax \
daymean \
daymin \
daypctl \
dayrange \
daystd \
daystd1 \
daysum \
......@@ -92,10 +99,13 @@ del29feb \
delcode \
delday \
delete \
delgridcell \
delmulti \
delname \
delparam \
deltap \
deltap_fl \
deltat \
delvar \
detrend \
diff \
......@@ -109,6 +119,7 @@ divc \
divcoslat \
divdpm \
divdpy \
dump_cmor_table \
dumpmap \
duplicate \
dv2ps \
......@@ -159,11 +170,13 @@ ensmax \
ensmean \
ensmin \
enspctl \
ensrange \
ensrkhist_space \
ensrkhist_time \
ensrkhistspace \
ensrkhisttime \
ensroc \
ensskew \
ensstd \
ensstd1 \
enssum \
......@@ -179,6 +192,7 @@ eofspatial \
eoftime \
eq \
eqc \
estfreq \
exp \
export_e5ml \
export_e5res \
......@@ -197,6 +211,7 @@ fldmax \
fldmean \
fldmin \
fldpctl \
fldrange \
fldrms \
fldstd \
fldstd1 \
......@@ -220,8 +235,6 @@ genlevelbounds \
gennn \
genycon \
geopotheight \
ggstat \
ggstats \
gheight \
globavg \
gmtcells \
......@@ -237,6 +250,7 @@ gridboxavg \
gridboxmax \
gridboxmean \
gridboxmin \
gridboxrange \
gridboxstd \
gridboxstd1 \
gridboxsum \
......@@ -263,6 +277,7 @@ hourmax \
hourmean \
hourmin \
hourpctl \
hourrange \
hourstd \
hourstd1 \
hoursum \
......@@ -296,14 +311,14 @@ int \
interpolate \
intgrid \
intgridbil \
intgridcon \
intgriddis \
intgridnn \
intgridtraj \
intlevel \
intlevel3d \
intlevelx \
intlevelx3d \