Commit df3a14b8 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

pstreamDefTimestep: removed call to streamSync

parent 6b5fa721
2010-08-20 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* pstreamDefTimestep: removed call to streamSync (very slow on GPFS)
2010-08-05 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* changed percentile parameter type from integer to float [request: Nikolaus Groll]
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.64 for cdo 1.4.6rc2.
# Generated by GNU Autoconf 2.64 for cdo 1.4.6rc3.
#
# Report bugs to <http://code.zmaw.de/projects/cdo>.
#
......@@ -549,8 +549,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cdo'
PACKAGE_TARNAME='cdo'
PACKAGE_VERSION='1.4.6rc2'
PACKAGE_STRING='cdo 1.4.6rc2'
PACKAGE_VERSION='1.4.6rc3'
PACKAGE_STRING='cdo 1.4.6rc3'
PACKAGE_BUGREPORT='http://code.zmaw.de/projects/cdo'
PACKAGE_URL=''
......@@ -1316,7 +1316,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.4.6rc2 to adapt to many kinds of systems.
\`configure' configures cdo 1.4.6rc3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1386,7 +1386,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cdo 1.4.6rc2:";;
short | recursive ) echo "Configuration of cdo 1.4.6rc3:";;
esac
cat <<\_ACEOF
......@@ -1578,7 +1578,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdo configure 1.4.6rc2
cdo configure 1.4.6rc3
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
......@@ -2006,7 +2006,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.4.6rc2, which was
It was created by cdo $as_me 1.4.6rc3, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
......@@ -2890,7 +2890,7 @@ fi
# Define the identity of the package.
PACKAGE='cdo'
VERSION='1.4.6rc2'
VERSION='1.4.6rc3'
cat >>confdefs.h <<_ACEOF
......@@ -9312,7 +9312,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.4.6rc2, which was
This file was extended by cdo $as_me 1.4.6rc3, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -9376,7 +9376,7 @@ Report bugs to <http://code.zmaw.de/projects/cdo>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
cdo config.status 1.4.6rc2
cdo config.status 1.4.6rc3
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......
# Process this file with autoconf to produce a configure script.
AC_INIT([cdo], [1.4.6rc2], [http://code.zmaw.de/projects/cdo])
AC_INIT([cdo], [1.4.6rc3], [http://code.zmaw.de/projects/cdo])
CONFIG_ABORT=yes
......
......@@ -37,6 +37,21 @@
#define NMONTH 17
static
int cmpint(const void *s1, const void *s2)
{
int cmp = 0;
int *x = (int *) s1;
int *y = (int *) s2;
if ( *x < *y ) cmp = -1;
else if ( *x > *y ) cmp = 1;
return (cmp);
}
void *Ymonstat(void *argument)
{
static char func[] = "Ymonstat";
......@@ -126,6 +141,7 @@ void *Ymonstat(void *argument)
vdates[month] = vdate;
vtimes[month] = vtime;
// mon[month] = vdate;
if ( vars1[month] == NULL )
{
......@@ -241,10 +257,29 @@ void *Ymonstat(void *argument)
tsID++;
}
/* sort output time steps */
/*
nmon = 0;
for ( month = 0; month < NMONTH; month++ )
{
if ( nsets[month] == 0 )
for ( i = month+1; i < NMONTH; i++ ) mon[i-1] = mon[i];
else
nmon++;
}
qsort(mon, nmon, sizeof(int), cmpint);
for ( i = 0; i < nmon; i++ )
{
cdiDecodeDate(mon[i], &year, &month, &day);
mon[i] = month;
}
*/
for ( i = 0; i < nmon; i++ )
{
month = mon[i];
if ( nsets[month] == 0 ) cdoAbort("Internal problem, nsets[%d] not set!", month);
if ( nsets[month] == 0 ) cdoAbort("Internal problem, nsets[%d] not defined!", month);
if ( operfunc == func_mean || operfunc == func_avg )
for ( varID = 0; varID < nvars; varID++ )
......
......@@ -90,12 +90,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if `st_blksize' is a member of `struct stat'. */
/* Define to 1 if `struct stat' is a member of `st_blksize'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define to 1 if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H
......
......@@ -1317,7 +1317,8 @@ void pstreamDefTimestep(int pstreamID, int tsID)
}
if ( cdoTimer ) timer_start(timer_write);
if ( tsID > 0 ) streamSync(pstreamptr->fileID);
/* don't use sync -> very slow on GPFS */
// if ( tsID > 0 ) streamSync(pstreamptr->fileID);
streamDefTimestep(pstreamptr->fileID, tsID);
if ( cdoTimer ) timer_stop(timer_write);
}
......
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