Commit 21f104ff authored by Fabian Wachsmann's avatar Fabian Wachsmann
Browse files

Merged with develop

parents 6f9e74b8 f8d885b7
......@@ -42,7 +42,9 @@ ltoptions.m4
ltsugar.m4
ltversion.m4
lt~obsolete.m4
#----- automake files ----
config/config.guess
config/config.sub
#---- Makefiles.in ---------------
Makefile.in
......
......@@ -12,13 +12,13 @@
},
"mistral": {
"hostname": "mistral.dkrz.de",
"dir": "/work/mh0287/users/ralf/builds/remote",
"dir": "/work/mh0287/users/ralf/builds/remote/cdo",
"envConfigFiles": ["/etc/profile",".profile"],
"CC": ["gcc","g++","icc","icpc"]
},
"cygwin": {
"hostname": "cdo4windows-cyg.mpimet.mpg.de",
"dir": "/home/mpimet/ralf/builds/remote",
"dir": "/home/mpimet/ralf/builds/remote/cdo",
"username": "mpimet",
"CC": ["gcc","g++"]
},
......@@ -30,7 +30,7 @@
},
"wanglung": {
"hostname": "wanglung.mpimet.mpg.de",
"dir": "/home/zmaw/m300064/builds/remote",
"dir": "/home/zmaw/m300064/builds/remote/cdo",
"username": "m300064",
"CC": ["icc","pgcc","cray","gcc"]
},
......@@ -150,6 +150,12 @@
"makeCall": "make -j 12",
"sync": true
},
"localIntel": {
"hostname": "luthien",
"configureCall": "/home/ram/src/cdo/configure --with-netcdf --with-eccodes CC=/home/ram/src/tools/spack/opt/spack/linux-arch-x86_64/gcc-7.2.0/intel-18.0.1-si3z4sjcsfivnzl6znctszuevsktcflf/compilers_and_libraries_2018.1.163/linux/bin/intel64/icc CXX=/home/ram/src/tools/spack/opt/spack/linux-arch-x86_64/gcc-7.2.0/intel-18.0.1-si3z4sjcsfivnzl6znctszuevsktcflf/compilers_and_libraries_2018.1.163/linux/bin/intel64/icpc FC=/home/ram/src/tools/spack/opt/spack/linux-arch-x86_64/gcc-7.2.0/intel-18.0.1-si3z4sjcsfivnzl6znctszuevsktcflf/compilers_and_libraries_2018.1.163/linux/bin/intel64/ifort",
"makeCall": "make -j 12",
"sync": false
},
"linux32bit": {
"hostname": "ubuntu-32bit",
"configureCall": "./configure --with-netcdf ",
......
2018-04-26 Uwe Schulzweida
2018-08-09 Uwe Schulzweida
* Using CDI library version 1.9.5
* Version 1.9.5 release
2018-05-14 Uwe Schulzweida
* New module: dhour<stat> - Multi-day hourly statistics
2018-05-11 Uwe Schulzweida
* Changed type of date from 32 to 64-bit integer
2018-05-09 Uwe Schulzweida
* Using CDI library version 1.9.4
* Version 1.9.4 release
2018-05-08 Uwe Schulzweida
* setattribute: added support for \n in text attributes
2018-05-03 Uwe Schulzweida
* Expr: added support for constant statements
2018-04-30 Uwe Schulzweida
* New operator yearminidx: Yearly minimum index
2018-04-28 Uwe Schulzweida
* New operator yearmaxidx: Yearly maximum index
* New operator selyearidx: Select index of year
2018-03-27 Uwe Schulzweida
* New operator complextopol: complex to polar
2018-03-26 Uwe Schulzweida
* New operator arg: argument or phase of the complex numbers
* New operator conj: complex conjugate
* add, sub, mul, div: added support for complex numbers
2018-03-22 Uwe Schulzweida
* diff: added support for complex numbers (only for the real part)
2018-03-17 Uwe Schulzweida
* remapbil, remapbic: optimized by changing point search from latbins to kdtree:nanoflann
......@@ -26,7 +70,7 @@
2018-02-05 Uwe Schulzweida
* change gridsize from 32 to 64 bit
* Large data support: changed type of gridsize from 32 to 64-bit integer
2018-01-29 Uwe Schulzweida
......
......@@ -4,8 +4,8 @@ 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
#
ACLOCAL_AMFLAGS = -I m4 -I libcdi/m4
#
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
#
CLEANFILES = `ls *~ 2> /dev/null`
CDO NEWS
--------
Version 1.9.4 (9 May 2018):
New features:
* Large data support: changed type of gridsize from 32 to 64-bit integer
* remapbil, remapbic, remapnn, remapdis: optimized by changing point search method
* Fldstat, Vertstat: added option weight=false to disable weighting
Fixed bugs:
* option -r doesn't work [Bug #8334]
* enspctl: changed parameter type from int to float [Bug #8386]
* segfault with chained operators on timeseries data [Bug #8230]
* setattribute: added support for \n in text attributes
* expr: removed character [LlDd] from definition of float constants
Version 1.9.3 (29 January 2018):
New features:
......
......@@ -285,7 +285,7 @@ Builder = Struct.new(:host,:hostname,:username,:compiler,:targetDir,:configureCa
: @userConfig["remoteUser"]),
cc,
[config["dir"],cc,getBranchName].join(File::SEPARATOR),
"autoreconf -v -i ; ./config/default CC=#{cc}",
"./config/default CC=#{cc}",
config["hostname"] == 'localhost',
"builder on #{config['hostname']}, CC=#{cc}",
config.has_key?("envConfigFiles") ? config["envConfigFiles"] : [])
......
This diff is collapsed.
This diff is collapsed.
......@@ -31,8 +31,7 @@ set -x
case "${HOSTNAME}" in
# i386-apple-darwin10
bailung*|d133*|d134*)
CDOLIBS="--enable-nearpt3 \
--with-fftw3 \
CDOLIBS="--with-fftw3 \
--with-eccodes=$HOME/local/eccodes-2.6.0 \
--with-netcdf=$HOME/local/netcdf-4.4.1.1 \
--with-hdf5=$HOME/local/hdf5-1.8.19-threadsafe \
......@@ -54,8 +53,8 @@ case "${HOSTNAME}" in
--enable-maintainer-mode \
$CDOLIBS \
LDFLAGS="-Wl,-rpath,$HOME/local/eccodes-2.6.0/lib" \
CXX=clang++ CXXFLAGS="-g -Wall -O3" \
CC=clang CFLAGS="-g -Wall -O3"
CXX=clang++ CXXFLAGS="-g -Wall -Wextra -O3" \
CC=clang CFLAGS="-g -Wall -Wextra -O3"
elif test "$COMP" = gnu4.9 ; then
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
......@@ -70,6 +69,13 @@ case "${HOSTNAME}" in
LDFLAGS="/opt/local/lib/gcc5/libstdc++.6.dylib -Wl,-rpath,$HOME/local/eccodes-2.6.0/lib" \
CXX=g++-mp-5 CXXFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native" \
CC=gcc-mp-5 CFLAGS="-g -Wall -W -Wfloat-equal -pedantic -O3 -march=native"
elif test "$COMP" = gnu_pic ; then
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
$CDOLIBS \
LDFLAGS="/opt/local/lib/gcc6/libstdc++.6.dylib -Wl,-rpath,$HOME/local/eccodes-2.6.0/lib" \
CXX=g++ CXXFLAGS="-g -fPIC" \
CC=gcc CFLAGS="-g -fPIC"
elif test "$COMP" = gnu ; then
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
......@@ -94,26 +100,25 @@ case "${HOSTNAME}" in
# --with-cmor=/Users/m214003/work/CMOR \
# --with-magics=$HOME/local/magics-2.25.3 \
# --with-curl=/opt/local"
CDOLIBS="--enable-nearpt3 \
--with-fftw3 \
CDOLIBS="--with-fftw3 \
--with-szlib=$HOME/local \
--with-eccodes=$HOME/local/eccodes-2.3.0 \
--with-netcdf=$HOME/local/netcdf-c-4.4.1.1 \
--with-hdf5=$HOME/local/hdf5-1.8.18 \
--with-libxml2=/opt/local \
--with-proj=/opt/local"
--with-proj=/opt/local/lib/proj5"
if test "$COMP" = intel ; then
${CONFPATH}configure --prefix=$HOME/local \
$CDOLIBS LDFLAGS="-Wl,-rpath,$HOME/local/eccodes-2.3.0/lib" \
CXX=icpc CXXFLAGS="-g -Wall -O2 -qopt-report=5 -march=native" \
$CDOLIBS LDFLAGS="-Wl,-rpath,$HOME/local/eccodes-2.3.0/lib -Wl,-rpath,/opt/intel/lib" \
CXX=icpc CXXFLAGS="-g -Wall -O2 -qopt-report=5 -march=native -DDISABLE_ISNAN" \
CC=icc CFLAGS="-g -Wall -O2 -qopt-report=5 -march=native"
elif test "$COMP" = clang ; then
${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
$CDOLIBS LDFLAGS="-Wl,-rpath,$HOME/local/eccodes-2.3.0/lib" \
CXX=clang++ CXXFLAGS="-g -Wall -pedantic -O3 -march=native" \
CC=clang CFLAGS="-g -Wall -pedantic -O3 -march=native"
CXX=clang++ CXXFLAGS="-g -Wall -Wextra -pedantic -O3 -march=native" \
CC=clang CFLAGS="-g -Wall -Wextra -pedantic -O3 -march=native"
elif test "$COMP" = clang4 ; then
${CONFPATH}configure \
$CDOLIBS \
......@@ -241,6 +246,14 @@ case "${HOSTNAME}" in
LDFLAGS="-Wl,-rpath,/sw/rhel6-x64/eccodes/eccodes-2.3.0-gcc48/lib" \
CXX=pgc++ CXXFLAGS="-g -fast" \
CC=pgcc CFLAGS="-g -fast"
elif test "$COMP" = gnu_pic ; then
${CONFPATH}configure --prefix=$HOME/local \
--with-fftw3 \
$CDOLIBS \
LDFLAGS="-Wl,-rpath,/sw/rhel6-x64/eccodes/eccodes-2.3.0-gcc48/lib" \
F77=gfortran FFLAGS="-g -O2" \
CXX=g++ CXXFLAGS='-g -Wall -O3 -march=native -mavx2 -fPIC' \
CC=gcc CFLAGS='-g -Wall -O3 -march=native -mavx2 -fPIC'
else
${CONFPATH}configure --prefix=$HOME/local \
--with-fftw3 \
......@@ -282,12 +295,11 @@ case "${HOSTNAME}" in
CC=icc CFLAGS="-g -O2 -Wall -fno-alias"
;;
# x86_64-archlinux
luthien*)
melian*)
case "$COMP" in
gcc|clang)
gcc)
${CONFPATH}configure --prefix=$HOME/local \
--program-suffix=-dev \
--enable-maintainer-mode \
--enable-data \
--with-magics \
--with-netcdf \
......@@ -299,32 +311,28 @@ case "${HOSTNAME}" in
--with-fftw3 \
--with-proj \
--with-pic \
CC=$COMP CPPFLAGS=-I/usr/include/magics CFLAGS="-g -Wall -O3" LIBS="-lopenjpeg" LDFLAGS='-lelf -v'
CC=gcc CXX=g++ CPPFLAGS=-I/usr/include/magics \
CFLAGS="-g -Wall -O3 -ftree-vectorize" CXXFLAGS="-g -Wall -O3 -ftree-vectorize" \
LIBS="-lopenjpeg"
;;
g++|clang++)
case "$COMP" in
g++)
CC=gcc
;;
clang++)
CC=clang
;;
esac
clang)
${CONFPATH}configure --prefix=$HOME/local \
--program-suffix=-dev \
--enable-maintainer-mode \
--enable-data \
--enable-cxx \
--with-magics \
--with-netcdf \
--with-hdf5 \
--with-szlib \
--with-grib_api \
--with-eccodes \
--with-udunits2 \
--with-grib_api \
--with-fftw3 \
--with-proj \
--with-pic \
CC=$CC CXX=$COMP CFLAGS="-g -Wall -O2" CXXFLAGS="-g -Wall -O2" LIBS=-lopenjpeg
;;
CC=clang CXX=clang++ CPPFLAGS=-I/usr/include/magics \
CFLAGS="-g -Wall -ftree-vectorize" CXXFLAGS="-g -Wall -ftree-vectorize" \
LIBS="-lopenjpeg"
;;
esac
;;
# standard workstations at MPI-M debian jessie
......@@ -400,4 +408,10 @@ case "${HOSTNAME}" in
--with-fftw3 \
CC=gcc CFLAGS='-g -Wall -O3'
;;
*)
echo "Could not find host!!!";
echo "hostname used is: '${HOSTNAME}'"
exit 1;
;;
esac
......@@ -4,7 +4,8 @@
# autoconf 2.68
# libtool 2.4.2
AC_INIT([cdo], [1.9.4rc1], [http://mpimet.mpg.de/cdo])
AC_PREREQ([2.68])
AC_INIT([cdo], [1.9.5rc1], [http://mpimet.mpg.de/cdo])
AC_DEFINE_UNQUOTED(CDO, ["$PACKAGE_VERSION"], [CDO version])
......@@ -186,9 +187,9 @@ AS_IF([test x$enable_data = 'xno'],[AC_SUBST([ENABLE_DATA],[false])],[AC_SUBST([
CFLAGS="$CFLAGS ${OPENMP_CFLAGS}"
CXXFLAGS="$CXXFLAGS ${OPENMP_CFLAGS}"
# ----------------------------------------------------------------------
# Add configure options
ACX_OPTIONS
ACX_CDO_OPTIONS
ACX_CDI_OPTIONS
# configure code from valgrind
......@@ -290,9 +291,10 @@ AC_CONFIG_FILES([test/EOF.test test/Select.test test/Spectral.test test/Vertint.
AC_CONFIG_FILES([test/Timstat.test test/Timstat2.test test/Timselstat.test test/Seasstat.test test/Timpctl.test test/Runstat.test test/Runpctl.test test/Multiyearstat.test test/Ydrunstat.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Gridboxstat.test test/Vertstat.test test/Fldstat.test test/Fldpctl.test test/Ensstat.test test/Enspctl.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Merstat.test test/Zonstat.test test/Mergetime.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Afterburner.test test/Detrend.test test/Arithc.test test/Arith.test test/Expr.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Afterburner.test test/Detrend.test test/Arithc.test test/Arith.test test/Ymonarith.test test/Expr.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Gradsdes.test test/Collgrid.test test/threads.test test/tsformat.test test/wildcard.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Setmiss.test test/Smooth.test test/MapReduce.test test/Ninfo.test],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([test/Filter.test ],[chmod a+x "$ac_file"])
AC_CONFIG_FILES([Makefile src/lib/ncl/Makefile src/lib/yac/Makefile src/Makefile contrib/Makefile test/Makefile test/data/Makefile test/bandit_tests/Makefile cdo.spec cdo.settings])
AC_OUTPUT
......
......@@ -48,10 +48,10 @@
\bibitem[GrADS]{GrADS} \ \\
\href{http://www.iges.org/grads/}
\href{http://cola.gmu.edu/grads/}
{Grid Analysis and Display System},
from the Center for Ocean-Land-Atmosphere Studies
(\href{http://www.iges.org/cola.html}{COLA})
(\href{http://cola.gmu.edu}{COLA})
\bibitem[GRIB]{GRIB} \ \\
......
......@@ -60,7 +60,9 @@ Implemented operators: {\htmlref{showunit}{showunit}}, {\htmlref{stdatm}{stdatm}
Implemented operators: {\htmlref{eof}{eof}}, {\htmlref{eof3d}{eof3d}}, {\htmlref{enscrps}{enscrps}}, {\htmlref{ensbrs}{ensbrs}},
{\htmlref{maskregion}{maskregion}}, {\htmlref{bandpass}{bandpass}}, {\htmlref{lowpass}{lowpass}}, {\htmlref{highpass}{highpass}}, {\htmlref{smooth9}{smooth9}}
\item[Oliver Heidmann]: He worked on the {\CDO} software package as a student assistant at MPI-M from 2015-2017.
\item[Oliver Heidmann]: He worked on the {\CDO} software package as a student assistant at MPI-M from 2015-2018.
\item[Karin Meier-Fleischer]: She is working in the {\CDO} user support since 2017.
\item[Fabian Wachsmann]: He is working on {\CDO} for the CMIP6 project and is responsible for the operator cmor.
......@@ -101,73 +103,74 @@ Very helpful is also the active participation in the user forum of some users.
Here is an incomplete list:
\texttt{
Jaison-Thomas Ambadan,
Harald Anlauf,
Andy Aschwanden,
Stefan Bauer,
Simon Blessing,
Renate Brokopf,
Michael Boettinger,
Tim Br\"ucher,
Reinhard Budich,
Martin Claus,
Traute Cr\"uger,
Irene Fischer-Bruns,
Chris Fletscher,
Helmut Frank,
Kristina Fr\"ohlich,
Oliver Fuhrer,
Monika Esch,
Pier Giuseppe Fogli,
Beate Gayer,
Veronika Gayler,
Marco Giorgetta,
David Gobbett,
Holger Goettel,
Helmut Haak,
Stefan Hagemann,
Angelika Heil,
Barbara Hennemuth,
Daniel Hernandez,
Nathanael Huebbe,
Thomas Jahns,
Frank Kaspar,
Daniel Klocke,
Edi Kirk,
Yvonne K\"ustermann,
Stefanie Legutke,
Leonidas Linardakis,
Stephan Lorenz,
Frank Lunkeit,
Karin Meier-Fleischer,
Uwe Mikolajewicz,
Laura Niederdrenk,
Dirk Notz,
Hans-J\"urgen Panitz,
Ronny Petrik,
Swantje Preuschmann,
Florian Prill,
Asela Rajapakse,
Daniel Reinert,
Hannes Reuter,
Mathis Rosenhauer,
Reiner Schnur,
Martin Schultz,
Dennis Shea,
Kevin Sieck,
Martin Stendel,
Bjorn Stevens,
Martina Stockhaus,
Claas Teichmann,
J\"org Trentmann,
\'Alvaro M. Valdebenito,
Geert Jan van Oldenborgh,
Jin-Song von Storch,
David Wang,
Joerg Wegner,
Heiner Widmann,
Claudia Wunram,
Klaus Wyser
\parbox{\textwidth}{
\mbox{Jaison-Thomas Ambadan},
\mbox{Harald Anlauf},
\mbox{Andy Aschwanden},
\mbox{Stefan Bauer},
\mbox{Simon Blessing},
\mbox{Renate Brokopf},
\mbox{Michael Boettinger},
\mbox{Tim Br\"ucher},
\mbox{Reinhard Budich},
\mbox{Martin Claus},
\mbox{Traute Cr\"uger},
\mbox{Irene Fischer-Bruns},
\mbox{Chris Fletscher},
\mbox{Helmut Frank},
\mbox{Kristina Fr\"ohlich},
\mbox{Oliver Fuhrer},
\mbox{Monika Esch},
\mbox{Pier Giuseppe Fogli},
\mbox{Beate Gayer},
\mbox{Veronika Gayler},
\mbox{Marco Giorgetta},
\mbox{David Gobbett},
\mbox{Holger Goettel},
\mbox{Helmut Haak},
\mbox{Stefan Hagemann},
\mbox{Angelika Heil},
\mbox{Barbara Hennemuth},
\mbox{Daniel Hernandez},
\mbox{Nathanael Huebbe},
\mbox{Thomas Jahns},
\mbox{Frank Kaspar},
\mbox{Daniel Klocke},
\mbox{Edi Kirk},
\mbox{Yvonne K\"ustermann},
\mbox{Stefanie Legutke},
\mbox{Leonidas Linardakis},
\mbox{Stephan Lorenz},
\mbox{Frank Lunkeit},
\mbox{Uwe Mikolajewicz},
\mbox{Laura Niederdrenk},
\mbox{Dirk Notz},
\mbox{Hans-J\"urgen Panitz},
\mbox{Ronny Petrik},
\mbox{Swantje Preuschmann},
\mbox{Florian Prill},
\mbox{Asela Rajapakse},
\mbox{Daniel Reinert},
\mbox{Hannes Reuter},
\mbox{Mathis Rosenhauer},
\mbox{Reiner Schnur},
\mbox{Martin Schultz},
\mbox{Dennis Shea},
\mbox{Kevin Sieck},
\mbox{Martin Stendel},
\mbox{Bjorn Stevens},
\mbox{Martina Stockhaus},
\mbox{Claas Teichmann},
\mbox{J\"org Trentmann},
\mbox{\'Alvaro M. Valdebenito},
\mbox{Geert Jan van Oldenborgh},
\mbox{Jin-Song von Storch},
\mbox{David Wang},
\mbox{Joerg Wegner},
\mbox{Heiner Widmann},
\mbox{Claudia Wunram},
\mbox{Klaus Wyser}
}
}
Please let me know if your name was omitted!
......@@ -342,7 +342,7 @@ attributes are available:
%\end{minipage}
Example {\CDO} descriptions of a curvilinear and an unstructured grid can be found
in \htmlref{Appendix C}{appendixgrid}.
in \htmlref{Appendix D}{appendixgrid}.
%#define GRID_GENERIC 1
%#define GRID_GAUSSIAN 2
......
......@@ -150,7 +150,9 @@ print TRCARD "\\vspace*{2mm}\n";
print TRCARD "\\subsection*{Operators}\n";
print TRCARD "\n";
#
print HELPFILE "/* Automatically created with makedoc, don't edit! */\n";
print HELPFILE "// Automatically created with makedoc, don't edit!\n";
print HELPFILE "\n";
print HELPFILE "// clang-format off\n";
#
$help_print = 1;
$oldchap = "oldchap";
......@@ -1076,6 +1078,8 @@ foreach my $line (sort(@oplist)){
print ABCLIST "\\end{longtable}\n";
print ABCLIST "\n";
print HELPFILE "// clang-format on\n";
close(HELPFILE);
close(TRFILE);
close(TCFILE);
......
libcdi @ 11520af9
Subproject commit 34895fc3ef6da9cfd5c365f438820f561cd407e4
Subproject commit 11520af9451f4c37d2dc5cc105e0acadba9ee43e
AC_DEFUN([ACX_OPTIONS],
AC_DEFUN([ACX_CDO_OPTIONS],
[
# ----------------------------------------------------------------------
# Checks for multithreaded compiling + linking
......@@ -247,10 +247,11 @@ AC_ARG_WITH([cmor],
[no],[AC_MSG_CHECKING([for cmor library])
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([cmor.h])
LIBS="${LIBS+${LIBS} }$UUID_C_LIB"
LIBS="${LIBS+${LIBS} }$UUID_C_LIB"
AC_SEARCH_LIBS([cmor_load_table],[cmor],[AC_DEFINE([HAVE_LIBCMOR],[1],[Define to 1 for CMOR support])],
[AC_MSG_ERROR([Could not link to cmor library!])])
AC_SUBST([CMOR_LIBS],[" -lcmor"])],
CMOR_LIBS="-lcmor $UUID_C_LIB"],
[*],[CMOR_ROOT=$with_cmor
AS_IF([test -d "$CMOR_ROOT"],
[LDFLAGS="$LDFLAGS -L$CMOR_ROOT/lib"
......@@ -260,7 +261,7 @@ AC_ARG_WITH([cmor],
[cmor],
[AC_DEFINE([HAVE_LIBCMOR],[1],[Define to 1 for CMOR support])],
[AC_MSG_ERROR([Could not link to cmor library!])])
CMOR_LIBS=" -L$CMOR_ROOT/lib -lcmor $UUID_C_LIB"],
CMOR_LIBS="-L$CMOR_ROOT/lib -lcmor $UUID_C_LIB"],
[AC_MSG_ERROR([$CMOR_ROOT is not a directory! CMOR suppressed])])])],
[AC_MSG_CHECKING([for the CMOR library])
AC_MSG_RESULT([suppressed])])
......
......@@ -36,7 +36,7 @@ BreakBeforeBinaryOperators: All
BreakBeforeBraces: GNU
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
ColumnLimit: 128
ColumnLimit: 132
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
......
......@@ -89,7 +89,7 @@ adipot(double t, double s, double p)
}
static void
calc_adisit(long gridsize, long nlevel, double *pressure, field_type tho, field_type sao, field_type tis)
calc_adisit(long gridsize, long nlevel, double *pressure, Field tho, Field sao, Field tis)
{
/* pressure units: hPa */
/* tho units: Celsius */
......@@ -117,7 +117,7 @@ calc_adisit(long gridsize, long nlevel, double *pressure, field_type tho, field_
}
static void
calc_adipot(long gridsize, long nlevel, double *pressure, field_type t, field_type s, field_type tpot)
calc_adipot(long gridsize, long nlevel, double *pressure, Field t, Field s, Field tpot)
{
/* pressure units: hPa */
/* t units: Celsius */
......@@ -149,7 +149,7 @@ Adisit(void *process)
{
int nrecs;
int varID, levelID;
int offset;
size_t offset;
int i;
size_t nmiss;
int thoID = -1, saoID = -1;
......@@ -234,7 +234,7 @@ Adisit(void *process)
for (i = 0; i < nlevel; ++i) cdoPrint("%5d %g", i + 1, pressure[i]);
}
field_type tho, sao, tis;
Field tho, sao, tis;
field_init(&tho);
field_init(&sao);
field_init(&tis);
......@@ -251,8 +251,7 @@ Adisit(void *process)
tis.missval = tho.missval;
int datatype = CDI_DATATYPE_FLT32;
if (vlistInqVarDatatype(vlistID1, thoID) == CDI_DATATYPE_FLT64
&& vlistInqVarDatatype(vlistID1, saoID) == CDI_DATATYPE_FLT64)
if (vlistInqVarDatatype(vlistID1, thoID) == CDI_DATATYPE_FLT64 && vlistInqVarDatatype(vlistID1, saoID) == CDI_DATATYPE_FLT64)
datatype = CDI_DATATYPE_FLT64;
int vlistID2 = vlistCreate();
......@@ -302,17 +301,10 @@ Adisit(void *process)
for (int recID = 0; recID < nrecs; ++recID)
{
pstreamInqRecord(streamID1, &varID, &levelID);
offset = gridsize * levelID;
if (varID == thoID)
{
pstreamReadRecord(streamID1, tho.ptr + offset, &tho.nmiss);
}
if (varID == saoID)