Commit 06cb926d authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cat, copy: compare input files

parent 0ba84c0c
......@@ -7,6 +7,7 @@
* sellonlatbox: add support for grid units 'radians' [request: Jeff Daily]
* sellonlatbox: add support for GRID_CELL [request: Jeff Daily]
* Add option '-u' to determinate whether to overwrite existing files [request: David Wang]
* cat, copy: compare input files
* ifthen: bug fix for datasets with different missing values [report: Beate Geyer]
* runmean: bug fix for datasets with missing values [report: Carmen Ulmen]
* Version 1.2.1 released
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for cdo 1.2.1beta7.
# Generated by GNU Autoconf 2.61 for cdo 1.2.1beta8.
#
# Report bugs to <Uwe.Schulzweida@zmaw.de>.
#
......@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='cdo'
PACKAGE_TARNAME='cdo'
PACKAGE_VERSION='1.2.1beta7'
PACKAGE_STRING='cdo 1.2.1beta7'
PACKAGE_VERSION='1.2.1beta8'
PACKAGE_STRING='cdo 1.2.1beta8'
PACKAGE_BUGREPORT='Uwe.Schulzweida@zmaw.de'
# Factoring default headers for most tests.
......@@ -1222,7 +1222,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.2.1beta7 to adapt to many kinds of systems.
\`configure' configures cdo 1.2.1beta8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1293,7 +1293,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdo 1.2.1beta7:";;
short | recursive ) echo "Configuration of cdo 1.2.1beta8:";;
esac
cat <<\_ACEOF
......@@ -1398,7 +1398,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdo configure 1.2.1beta7
cdo configure 1.2.1beta8
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1412,7 +1412,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.2.1beta7, which was
It was created by cdo $as_me 1.2.1beta8, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
......@@ -2236,7 +2236,7 @@ fi
# Define the identity of the package.
PACKAGE='cdo'
VERSION='1.2.1beta7'
VERSION='1.2.1beta8'
cat >>confdefs.h <<_ACEOF
......@@ -7481,7 +7481,7 @@ exec 6>&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.2.1beta7, which was
This file was extended by cdo $as_me 1.2.1beta8, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -7534,7 +7534,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
cdo config.status 1.2.1beta7
cdo config.status 1.2.1beta8
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......
......@@ -5,7 +5,7 @@
@Section = Arithmetic
@Class = Arithmetic
@Arguments = ifile ofile
@Operators = abs int nint sqr sqrt exp ln log10 sin cos tan asin acos atan pow
@Operators = abs int nint pow sqr sqrt exp ln log10 sin cos tan asin acos atan
@BeginDescription
This module contains some standard mathematical functions.
......
......@@ -2,7 +2,7 @@
This file is part of CDO. CDO is a collection of Operators to
manipulate and analyse Climate model Data.
Copyright (C) 2003-2007 Uwe Schulzweida, Uwe.Schulzweida@zmaw.de
Copyright (C) 2003-2008 Uwe Schulzweida, Uwe.Schulzweida@zmaw.de
See COPYING file for copying and redistribution conditions.
This program is free software; you can redistribute it and/or modify
......@@ -86,6 +86,8 @@ void *Cat(void *argument)
vlistID2 = streamInqVlist(streamID2);
taxisID2 = vlistInqTaxis(vlistID2);
vlistCompare(vlistID1, vlistID2, func_sft);
tsID2 = vlistNtsteps(vlistID2);
if ( tsID2 == 0 ) tsID2 = 1; /* bug fix for constant data only */
}
......@@ -142,8 +144,7 @@ void *Cat(void *argument)
streamClose(streamID2);
if ( ! lcopy )
if ( array ) free(array);
if ( array ) free(array);
cdoFinish();
......
......@@ -83,12 +83,11 @@ void *Copy(void *argument)
gridsize = vlistGridsizeMax(vlistID1);
array = (double *) malloc(gridsize*sizeof(double));
}
/*
else
{
vlistCompare(vlistID1, vlistID2, func_hrd);
vlistCompare(vlistID1, vlistID2, func_sft);
/* vlistCompare(vlistID1, vlistID2, func_hrd); */
}
*/
tsID1 = 0;
while ( (nrecs = streamInqTimestep(streamID1, tsID1)) )
......
......@@ -1219,7 +1219,7 @@ void cdoFinish(void)
nvars = processInqVarNum();
ntimesteps = processInqTimesteps();
if ( ! cdoSilentMode )
if ( !cdoSilentMode )
{
if ( nvals > 0 )
{
......
Supports Markdown
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