Commit 5e6ca0ff authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Merge develop

parents 2ab52713 ea545fba
......@@ -56,6 +56,11 @@ config/test-driver
#---- Makefiles.in ---------------
Makefile.in
#----
.DS_Store
build
#=================================
#==== Documentation pdfs =========
......@@ -66,7 +71,7 @@ cdo_cmor.pdf
cdo_refcard.pdf
cdo_libdep.pdf
#==== Documentation pdfs =========
#==== Documentation temporary tex file =========
doc/tex/alphabetic_list.tex
doc/tex/catalog.tex
......
variables:
GIT_SUBMODULE_STRATEGY: recursive
stages:
- build
- check
build-gcc64:
stage: build
before_script:
- . /sw/rhel6-x64/etc/profile.mistral && module list
- module load libtool autoconf automake
- cd libcdi && git checkout develop && ./autogen.sh && cd ..
- autoreconf -vfi --no-recursive
script:
- module load gcc/6.4.0
- mkdir gcc64 && cd gcc64 && ../configure CC=/sw/rhel6-x64/gcc/gcc-6.4.0/bin/gcc CXX=/sw/rhel6-x64/gcc/gcc-6.4.0/bin/g++ FC=/sw/rhel6-x64/gcc/gcc-6.4.0/bin/gfortran --with-netcdf=/sw/rhel6-x64/netcdf/netcdf_c-4.6.1-gcc64 --with-magics=/sw/rhel6-x64/graphics/magicsxx-2.33.0-gfxonly-gcc48 --with-fftw3 --with-eccodes=/sw/rhel6-x64/eccodes/eccodes-2.6.0-gcc64 --with-udunits2=/sw/rhel6-x64/util/udunits-2.2.26-gcc64 CXXFLAGS="-I/sw/rhel6-x64/numerics/fftw-3.3.7-openmp-gcc64/include" LDFLAGS="-L/sw/rhel6-x64/numerics/fftw-3.3.7-openmp-gcc64/lib -Wl,-rpath,/sw/rhel6-x64/numerics/fftw-3.3.7-openmp-gcc64/lib -lfftw3 -Wl,-rpath,/sw/rhel6-x64/eccodes/eccodes-2.6.0-gcc64/lib -Wl,-rpath,/sw/rhel6-x64/graphics/magicsxx-2.33.0-gfxonly-gcc48/lib" --with-curl --with-ossp-uuid --with-proj=/sw/rhel6-x64/graphics/proj5-5.2.0-gcc64 && make -j 4
artifacts:
paths:
- /builds/mpim-sw/cdo
expire_in: 5min
tags:
- xen, mistral
only:
- develop
check-gcc64:
stage: check
needs: ["build-gcc64"]
before_script:
- . /sw/rhel6-x64/etc/profile.mistral && module list
script:
- module load gcc/6.4.0
- cd gcc64 && make check
tags:
- xen, mistral
only:
- develop
build-intel18:
stage: build
before_script:
- . /sw/rhel6-x64/etc/profile.mistral && module list
- module load libtool autoconf automake
- cd libcdi && git checkout develop && ./autogen.sh && cd ..
- autoreconf -vfi --no-recursive
script:
- module load gcc/6.4.0 intel
- mkdir intel18 && cd intel18 && ../configure CC=/sw/rhel6-x64/intel/intel-18.0.4/bin/icc CXX=/sw/rhel6-x64/intel/intel-18.0.4/bin/icpc FC=/sw/rhel6-x64/intel/intel-18.0.4/bin/ifort --with-netcdf=/sw/rhel6-x64/netcdf/netcdf_c-4.6.1-gcc64 --with-magics=/sw/rhel6-x64/graphics/magicsxx-2.33.0-gfxonly-gcc48 --with-fftw3 --with-eccodes=/sw/rhel6-x64/eccodes/eccodes-2.6.0-gcc64 --with-udunits2=/sw/rhel6-x64/util/udunits-2.2.26-gcc64 CXXFLAGS="-I/sw/rhel6-x64/numerics/fftw-3.3.7-openmp-gcc64/include" LDFLAGS="-L/sw/rhel6-x64/numerics/fftw-3.3.7-openmp-gcc64/lib -Wl,-rpath,/sw/rhel6-x64/numerics/fftw-3.3.7-openmp-gcc64/lib -lfftw3 -Wl,-rpath,/sw/rhel6-x64/eccodes/eccodes-2.6.0-gcc64/lib -Wl,-rpath,/sw/rhel6-x64/graphics/magicsxx-2.33.0-gfxonly-gcc48/lib" --with-curl --with-ossp-uuid --with-proj=/sw/rhel6-x64/graphics/proj5-5.2.0-gcc64 && make -j 4
artifacts:
paths:
- /builds/mpim-sw/cdo
expire_in: 5min
tags:
- xen, mistral
only:
- develop
check-intel18:
stage: check
needs: ["build-intel18"]
before_script:
- . /sw/rhel6-x64/etc/profile.mistral && module list
script:
- module load gcc/6.4.0 intel
- cd intel18 && make check
tags:
- xen, mistral
only:
- develop
[submodule "libcdi"]
path = libcdi
url = git@gitlab.dkrz.de:mpim-sw/libcdi.git
url = ../libcdi.git
[submodule "test/bandit_tests/bandit"]
path = test/bandit_tests/bandit
url = https://github.com/banditcpp/bandit.git
Uwe Schulzweida, <uwe.schulzweida AT mpimet.mpg.de>, is the main author.
Ralf Mueller, <ralf.mueller AT mpimet.mpg.de>
Oliver Heidmann, <oliver.heidmann AT mpimet.mpg.de>
Cedrick Ansorge, <cedrick.ansorge AT mpimet.mpg.de>
Luis Kornblueh, <luis.kornblueh AT mpimet.mpg.de>
Fabian Wachsmann <wachsmann@dkrz.de>
Modali Kameswarrao <kameswarrao.modali@mpimet.mpg.de>
Fabian Wachsmann <wachsmann AT dkrz.de>
Cedrick Ansorge, <cedrick.ansorge AT mpimet.mpg.de>
Modali Kameswarrao <kameswarrao.modali AT mpimet.mpg.de>
Ralf Quast, <ralf.quast AT brockmann-consult.de>
If you use the Climate Data Operators (CDO) to process data for an article in a scientific publication, please cite:
Schulzweida, Uwe. (2019, February 6). CDO User Guide (Version 1.9.6). Zenodo. http://doi.org/10.5281/zenodo.2558193
Schulzweida, Uwe. (2020, October 31). CDO User Guide (Version 1.9.9). Zenodo. http://doi.org/10.5281/zenodo.4246983
BibTeX:
@misc{schulzweida_uwe_2019_2558193,
@misc{schulzweida_uwe_2020_4246983,
author = {Schulzweida, Uwe},
title = {CDO User Guide},
month = feb,
year = 2019,
doi = {10.5281/zenodo.2558193},
url = {https://doi.org/10.5281/zenodo.2558193}
month = oct,
year = 2020,
publisher = {Zenodo},
version = {1.9.9},
doi = {10.5281/zenodo.4246983},
url = {https://doi.org/10.5281/zenodo.4246983}
}
2020-10-29 Uwe Schulzweida
* Using CDI library version 1.9.9
* Version 1.9.9 release
2020-10-28 Uwe Schulzweida
* New operator gheight: Geopotential height
2020-10-26 Uwe Schulzweida
* Ymonstat: added support for option timestat_date
2020-10-16 Uwe Schulzweida
* Added support for keyword np in grid description file (alias for numNPE) [Bug #9943]
2020-10-05 Uwe Schulzweida
* maggraph: stack smashing with more than 1 input file (bug fix)
2020-09-29 Uwe Schulzweida
* pass option --no_warnings to option -w (bug fix)
2020-09-18 Uwe Schulzweida
* New environment variable CDO_DOWNLOAD_PATH: Path where CDO stores downloads
* New environment variable CDO_ICON_GRIDS: Root directory of the ICON grids (e.g. /pool/data/ICON)
2020-09-16 Uwe Schulzweida
* afterburner: define Gaussian grid coordinates if needed (bug fix)
2020-09-15 Uwe Schulzweida
* intlevel: Added memory support for 32-bit float data.
* intlevel3d: Added memory support for 32-bit float data.
* intlevel3d: changed interface
2020-09-10 Uwe Schulzweida
* intyear: doesn't work; segmentation fault (bug fix)
2020-09-09 Uwe Schulzweida
* Set MAX_PROCESS to 65536
2020-08-26 Uwe Schulzweida
* setgridtype,regular: bug fix for regional reduced Gaussian grids
2020-08-21 Uwe Schulzweida
* New operator gh2hl: Interpolate 3D geometric height to height levels
2020-08-18 Uwe Schulzweida
* Vertintap: process only 3D variables on hybrid sigma height coordinates with correct number of levels (bug fix)
2020-08-18 Uwe Schulzweida
* Remapstat: Added memory support for 32-bit float data.
2020-08-16 Matthew Krupcale
* Fix yy_scan_string ODR violation [Bug #9854]
* Missing AC_CONFIG_SRCDIR [Bug #9853]
2020-08-15 Uwe Schulzweida
* New operator remapmean: arithmetic mean value (status: experimental)
2020-08-12 Uwe Schulzweida
* nanoflann: changed to version 1.3.2
2020-07-29 Uwe Schulzweida
* intgridbil: Added memory support for 32-bit float data.
2020-07-23 Uwe Schulzweida
* Runpctl: Added memory support for 32-bit float data.
* Pack: Added memory support for 32-bit float data.
* Timsort: Added memory support for 32-bit float data.
2020-07-22 Uwe Schulzweida
* New operator bottomvalue: Select values at the bottom
* New operator topvalue: Select values at the top
* Detrend: Added memory support for 32-bit float data.
* Duplicate: Added memory support for 32-bit float data.
* Filter: Added memory support for 32-bit float data.
* Fourier: Added memory support for 32-bit float data.
2020-07-21 Uwe Schulzweida
* Gridbox: Added memory support for 32-bit float data.
2020-07-20 Uwe Schulzweida
* Fldstat: Added memory support for 32-bit float data.
2020-07-15 Uwe Schulzweida
* Set maximum number of open files (mergetime, Ensstat, ...)
2020-07-03 Uwe Schulzweida
* sellonlatbox,-180,180,-90,90 "breaks" lon_bnds [Bug #9801]
2020-07-01 Uwe Schulzweida
* splitsel: added support for negative skip values [Feature #9798]
2020-06-25 Uwe Schulzweida
* Ensval: failed (bug fix)
* Ensval: processed only n-1 ensembles (bug fix)
2020-06-22 Uwe Schulzweida
* Select: added parameter dom (day of month, e.g. 29feb)
2020-06-18 Uwe Schulzweida
* Arith doesn't work for complex numbers (bug fix)
2020-06-13 Uwe Schulzweida
* Selbox: wrong coordinate name if input contains zonal mean and global fields (bug fix)
2020-05-29 Uwe Schulzweida
* Selbox: wrong result of grid cell area (if present) on curvilinear grids (bug fix)
2020-05-20 Uwe Schulzweida
* New module: Yeararith - yearly arithmetic (yearadd, yearsub, yearmul, yeardiv) [request: Ralf Mller]
2020-04-22 Uwe Schulzweida
* Collgrid: Added memory support for 32-bit float data.
2020-04-09 Uwe Schulzweida
* New operator isosurface: Extract isosurface
2020-03-26 Uwe Schulzweida
* New operator addtrend: Add trend
2020-03-25 Uwe Schulzweida
* Distgrid: Added memory support for 32-bit float data.
2020-03-24 Uwe Schulzweida
* Vertintml: Added memory support for 32-bit float data.
2020-03-21 Uwe Schulzweida
* Diff: Added memory support for 32-bit float data.
2020-03-17 Uwe Schulzweida
* Vertintap: Added memory support for 32-bit float data.
2020-03-17 Uwe Schulzweida
* Copy: Added memory support for 32-bit float data.
* Mergetime: Added memory support for 32-bit float data.
2020-03-16 Uwe Schulzweida
* Selbox: Added memory support for 32-bit float data.
* Cat: Added memory support for 32-bit float data.
2020-03-15 Uwe Schulzweida
* Merge: Added memory support for 32-bit float data.
2020-03-14 Uwe Schulzweida
* Info: Added memory support for 32-bit float data.
2020-03-10 Uwe Schulzweida
* merge: added single precision float data support with option --float
* vertintap: added single precision float data support with option --float
* pipe: addded single precision float support
2020-02-28 Uwe Schulzweida
* showattribute: added support for int and float arrays
2020-02-27 Uwe Schulzweida
* Changed option -W to -w
* showattribute: added wildcard support
2020-02-26 Uwe Schulzweida
* setattribute: delete empty attributes
2020-02-25 Uwe Schulzweida
* Treats global history attribute to a normal attribute
2020-02-24 Uwe Schulzweida
* Diff: added option maxcount=<num>: Stop after num different fields
2020-02-06 Uwe Schulzweida
* samplegridicon: bug fix
2020-01-23 Uwe Schulzweida
* intlevel3d: wrong result since v1.9.4 [Bug #9468]
2020-01-17 Uwe Schulzweida
* dv2uv, uv2dv: wrong result works only on first level since v1.9.8 [Bug #9441]
2020-01-14 Uwe Schulzweida
* Changed Warning to Abort if latitude orientation of input streams differ
2020-01-08 Uwe Schulzweida
* Magplot: curvilinear grids unsupported
* Magplot: added support for missing values
2020-01-07 Uwe Schulzweida
* Arith: Inconsistent missing value handling in v1.9.8 [Bug #9396]
2019-10-29 Uwe Schulzweida
* Using CDI library version 1.9.8
......@@ -13,7 +252,7 @@
2019-10-21 Uwe Schulzweida
* Expr: added function isMissing(x)
* Expr: added function isMissval(x)
2019-10-18 Uwe Schulzweida
......@@ -1214,7 +1453,7 @@
2015-10-11 Uwe Schulzweida
* removed obsolate option -p
* removed obsolete option -p
2015-10-08 Uwe Schulzweida
......
......@@ -3,12 +3,42 @@ CDO NEWS
Improvement
Version 1.9.9 (29 October 2020):
New features:
* New environment variable CDO_DOWNLOAD_PATH: Path where CDO stores downloads
* New environment variable CDO_ICON_GRIDS: Root directory of the ICON grids (e.g. /pool/data/ICON)
* splitsel: added support for negative skip values [Feature #9798]
* showattribute: added wildcard support
* Diff: added option maxcount=<num>: Stop after num different fields
* Select: added parameter dom (day of month, e.g. 29feb)
* Ymonstat: added support for option timestat_date
New operators:
* Yearly arithmetic: yearadd, yearsub, yearmul, yeardiv
* apply: Apply an operator on each input file
* gh2hl: Interpolate 3D geometric height to height levels
* pack: Pack data (NetCDF attribute add_offset/scale_factor)
* verifygrid: Verify grid coordinates
* addtrend: Add trend
* isosurface: Extract isosurface
Changed operators:
* intlevel3d: changed interface
Fixed bugs:
* Selbox: wrong result of grid cell area (if present) on curvilinear grids
* sellonlatbox,-180,180,-90,90 "breaks" lon_bnds [Bug #9801]
* Ensval: does not work
* intyear: doesn't work; segmentation fault
* intlevel3d: wrong result since v1.9.4 [Bug #9468]
* dv2uv, uv2dv: wrong result works only on first level since v1.9.8 [Bug #9441]
* Vertintap: process only 3D variables on hybrid sigma height coordinates with correct number of levels
* Arith: Inconsistent missing value handling in v1.9.8 [Bug #9396]
Version 1.9.8 (29 October 2019):
New features:
* Proj 4 to 6 API Migration
* smooth/smooth9: Added support for gridtype PROJECTION [Feature #9202]
* Expr: Added function rand(x) and isMissing(x)
* Expr: Added function rand(x) and isMissval(x)
* Remap: Added support for Gaussian reduced grids
* trend, detrend: Added parameter equal=false for unequal timesteps
* Option --no_remap_weights: Switch off generation of remap weights
......@@ -68,6 +98,7 @@ Version 1.9.6 (7 February 2019):
* Absolute time axis (-a) returns wrong units in operator chain for NetCDF [Bug #8777]
* Relative time axis (-r) returns wrong first timestep in operator chain for NetCDF
* Wrong result with fldmean on zonal mean data (bug introduce in 1.9.5) [Bug #8834]
* OPeNDAP support was broken in 1.9.5 [Bug #9761]
Version 1.9.5 (9 August 2018):
......@@ -256,6 +287,7 @@ Version 1.7.0 (28 October 2015):
* setmisstonn: Set missing value to nearest neightbor
* setmisstodis: Set missing value to the distance-weighted average of the nearest neighbors
* ap2pl: Interpolate 3D variables on hybrid sigma height coordinates to pressure levels
* gheight: Geopotential height
* vertstd1: Vertical standard deviation [Divisor is (n-1)]
* vertvar1: Vertical variance [Divisor is (n-1)]
* seasvar1: Seasonal variance [Divisor is (n-1)]
......
......@@ -26,8 +26,6 @@ Operator catalog:
Showinfo showcode Show code numbers
Showinfo showname Show variable names
Showinfo showstdname Show standard names
Showinfo showatts Show all attributes
Showinfo showattsglob Show all global attributes
Showinfo showlevel Show levels
Showinfo showltype Show GRIB level types
Showinfo showyear Show years
......@@ -36,7 +34,6 @@ Operator catalog:
Showinfo showtime Show time information
Showinfo showtimestamp Show timestamp
Showattribute showattribute Show a global attribute or a variable attribute
Showattribute showattsvar Show all variable attributes.
Filedes partab Parameter table
Filedes codetab Parameter code table
Filedes griddes Grid description
......@@ -45,10 +42,11 @@ Operator catalog:
-------------------------------------------------------------
File operations
-------------------------------------------------------------
Apply apply Apply an operator on each input file.
Apply apply Apply operators on each input file.
Copy copy Copy datasets
Copy cat Concatenate datasets
Tee tee Duplicate a data stream
Pack pack Pack data
Replace replace Replace variables
Duplicate duplicate Duplicates a dataset
Mergegrid mergegrid Merge grid
......@@ -226,6 +224,10 @@ Operator catalog:
Monarith monsub Subtract monthly time series
Monarith monmul Multiply monthly time series
Monarith mondiv Divide monthly time series
Yeararith yearadd Add yearly time series
Yeararith yearsub Subtract yearly time series
Yeararith yearmul Multiply yearly time series
Yeararith yeardiv Divide yearly time series
Yhourarith yhouradd Add multi-year hourly time series
Yhourarith yhoursub Subtract multi-year hourly time series
Yhourarith yhourmul Multiply multi-year hourly time series
......@@ -498,7 +500,8 @@ Operator catalog:
Regres regres Regression
Detrend detrend Detrend
Trend trend Trend
Subtrend subtrend Subtract trend
Trendarith addtrend Add trend
Trendarith subtrend Subtract trend
-------------------------------------------------------------
EOFs
-------------------------------------------------------------
......@@ -516,8 +519,8 @@ Operator catalog:
Remapbic genbic Generate bicubic interpolation weights
Remapnn remapnn Nearest neighbor remapping
Remapnn gennn Generate nearest neighbor remap weights
Remapdis remapdis Distance-weighted average remapping
Remapdis gendis Generate distance-weighted average remap weights
Remapdis remapdis Distance weighted average remapping
Remapdis gendis Generate distance weighted average remap weights
Remapcon remapcon First order conservative remapping
Remapcon gencon Generate 1st order conservative remap weights
Remapcon2 remapcon2 Second order conservative remapping
......@@ -529,10 +532,11 @@ Operator catalog:
Vertint ml2pl Model to pressure level interpolation
Vertint ml2hl Model to height level interpolation
Vertintap ap2pl Air pressure to pressure level interpolation
Vertintap ap2hl Air pressure to height level interpolation
Vertintgh gh2hl Geometric height to height level interpolation
Intlevel intlevel Linear level interpolation
Intlevel3d intlevel3d Linear level interpolation onto a 3d vertical coordinate
Intlevel3d intlevel3d Linear level interpolation onto a 3D vertical coordinate
Intlevel3d intlevelx3d like intlevel3d but with extrapolation
Isosurface isosurface Extract isosurface data
Inttime inttime Interpolation between timesteps
Inttime intntime Interpolation between timesteps
Intyear intyear Interpolation between two years
......@@ -590,6 +594,7 @@ Operator catalog:
Rotuv rotuvb Backward rotation
Mastrfu mastrfu Mass stream function
Derivepar sealevelpressure Sea level pressure
Derivepar gheight Geopotential height
Adisit adisit Potential temperature to in-situ temperature
Adisit adipot In-situ temperature to potential temperature
Rhopot rhopot Calculates potential density
......@@ -605,6 +610,7 @@ Operator catalog:
Strgal strgal Strong gale days index per time period
Hurr hurr Hurricane days index per time period
CMORlite cmorlite CMOR lite
Verifygrid verifygrid Verify grid coordinates
-------------------------------------------------------------
NCL
-------------------------------------------------------------
......@@ -626,18 +632,22 @@ Operator catalog:
Climate indices
-------------------------------------------------------------
EcaCdd eca_cdd Consecutive dry days index per time period
EcaCdd etccdi_cdd Consecutive dry days index per time period
EcaCfd eca_cfd Consecutive frost days index per time period
EcaCsu eca_csu Consecutive summer days index per time period
EcaCwd eca_cwd Consecutive wet days index per time period
EcaCwdi eca_cwdi Cold wave duration index wrt mean of reference period
EcaCwfi eca_cwfi Cold-spell days index wrt 10th percentile of reference period
EcaCwfi etccdi_csdi Cold-spell duration index
EcaEtr eca_etr Intra-period extreme temperature range
EcaFd eca_fd Frost days index per time period
EcaFd etccdi_fd Frost days index per time period
EcaGsl eca_gsl Growing season length index
EcaHd eca_hd Heating degree days per time period
EcaHwdi eca_hwdi Heat wave duration index wrt mean of reference period
EcaHwfi eca_hwfi Warm spell days index wrt 90th percentile of reference period
EcaId eca_id Ice days index per time period
EcaId etccdi_id Ice days index per time period
EcaR75p eca_r75p Moderate wet days wrt 75th percentile of reference period
EcaR75ptot eca_r75ptot Precipitation percent due to R75p days
EcaR90p eca_r90p Wet days wrt 90th percentile of reference period
......@@ -649,15 +659,26 @@ Operator catalog:
EcaPd eca_pd Precipitation days index per time period
EcaPd eca_r10mm Heavy precipitation days index per time period
EcaPd eca_r20mm Very heavy precipitation days index per time period
EcaPd etccdi_r1mm Precipitation days index per time period
EcaRr1 eca_rr1 Wet days index per time period
EcaRx1day eca_rx1day Highest one day precipitation amount per time period
EcaRx1day etccdi_rx1day Maximum 1-day Precipitation
EcaRx5day eca_rx5day Highest five-day precipitation amount per time period
EcaRx5day etccdi_rx5day Highest five-day precipitation amount per time period
EcaSdii eca_sdii Simple daily intensity index per time period
EcaSu eca_su Summer days index per time period
EcaSu etccdi_su Summer days index per time period
EcaTg10p eca_tg10p Cold days percent wrt 10th percentile of reference period
EcaTg90p eca_tg90p Warm days percent wrt 90th percentile of reference period
EcaTn10p eca_tn10p Cold nights percent wrt 10th percentile of reference period
EcaTn90p eca_tn90p Warm nights percent wrt 90th percentile of reference period
EcaTr eca_tr Tropical nights index per time period
EcaTr etccdi_tr Tropical nights index per time period
EcaTx10p eca_tx10p Very cold days percent wrt 10th percentile of reference period
EcaTx90p eca_tx90p Very warm days percent wrt 90th percentile of reference period
EcaEtccdi etccdi_tx90p Percentage of Days when Daily Maximum Temperature is Above the 90th Percentile
EcaEtccdi etccdi_tx10p Percentage of Days when Daily Maximum Temperature is Below the 10th Percentile
EcaEtccdi etccdi_tn90p Percentage of Days when Daily Minimum Temperature is Above the 90th Percentile
EcaEtccdi etccdi_tn10p Percentage of Days when Daily Minimum Temperature is Below the 10th Percentile
EcaEtccdi etccdi_r95p Annual Total Precipitation when Daily Precipitation Exceeds the 95th Percentile of Wet Day Precipitation
EcaEtccdi etccdi_r99p Annual Total Precipitation when Daily Precipitation Exceeds the 99th Percentile of Wet Day Precipitation
showattsvar[,var_nm] -> showattribute,var_nm@ (since 1.9.9)
showattsglob -> showattribute,* (since 1.9.9)
showatts -> showattribute (since 1.9.9)
remapscon -> remapcon (since 1.9.6)
genscon -> gencon (since 1.9.6)
......@@ -24,8 +24,7 @@ CDO - Climate Data Operators
Operators:
There are more than 400 operators available. Read OPEATORS for
a short overview of all operators.
There are more than 600 operators available. Read OPERATORS for a short overview of all operators.
Documentation:
......
......@@ -59,7 +59,6 @@
},
"features" : {
"enable_cdi_lib" : @ENABLE_CDI_LIB@,
"enable_data" : @ENABLE_DATA@,
"enable_fortran" : @ENABLE_FORTRAN@,
"fortran_works" : "@FORTRAN_WORKS@",
}
......
......@@ -26,8 +26,11 @@ Authors:
This program was developed at the Max-Planck-Institute for Meteorology.
Uwe Schulzweida, <uwe.schulzweida AT mpimet.mpg.de>, is the main author.
Ralf Mueller, <ralf.mueller AT mpimet.mpg.de>
Oliver Heidmann, <oliver.heidmann AT mpimet.mpg.de>
Luis Kornblueh, <luis.kornblueh AT mpimet.mpg.de>
Fabian Wachsmann <wachsmann AT dkrz.de>
Cedrick Ansorge, <cedrick.ansorge AT mpimet.mpg.de>
Modali Kameswarrao <kameswarrao.modali AT mpimet.mpg.de>
Ralf Quast, <ralf.quast AT brockmann-consult.de>
Send questions, comments and bug reports to <https://code.mpimet.mpg.de/projects/cdo>
......
......@@ -102,8 +102,11 @@ def scanFilesForOperator():
dict[file].append(x+y)
opertypes=[]
else:
dict[file] = temp
break
if file in dict:
for x in temp:
dict[file].append(x)
else:
dict[file] = temp
f.close()
......
......@@ -32,7 +32,7 @@ case "${HOSTNAME}" in
# i386-apple-darwin10
bailung*|d133*|d134*)
CDOLIBS="--with-fftw3 \