Skip to content
GitLab
Commit aadd5e87 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

cmsaf fill_gridvals

parent 259d02d6
Hide whitespace changes
Inline Side-by-side
configure
View file @ aadd5e87
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for cdo 1.3.0beta3.
# Generated by GNU Autoconf 2.61 for cdo 1.3.0beta4.
#
# 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.3.0beta3'
PACKAGE_STRING='cdo 1.3.0beta3'
PACKAGE_VERSION='1.3.0beta4'
PACKAGE_STRING='cdo 1.3.0beta4'
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.3.0beta3 to adapt to many kinds of systems.
\`configure' configures cdo 1.3.0beta4 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.3.0beta3:";;
short | recursive ) echo "Configuration of cdo 1.3.0beta4:";;
esac
cat <<\_ACEOF
......@@ -1404,7 +1404,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cdo configure 1.3.0beta3
cdo configure 1.3.0beta4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1418,7 +1418,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.3.0beta3, which was
It was created by cdo $as_me 1.3.0beta4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
......@@ -2242,7 +2242,7 @@ fi
# Define the identity of the package.
PACKAGE='cdo'
VERSION='1.3.0beta3'
VERSION='1.3.0beta4'
cat >>confdefs.h <<_ACEOF
......@@ -7772,7 +7772,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.3.0beta3, which was
This file was extended by cdo $as_me 1.3.0beta4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -7825,7 +7825,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
cdo config.status 1.3.0beta3
cdo config.status 1.3.0beta4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......
configure.ac
View file @ aadd5e87
# Process this file with autoconf to produce a configure script.
AC_INIT(cdo, 1.3.0beta3, Uwe.Schulzweida@zmaw.de)
AC_INIT(cdo, 1.3.0beta4, Uwe.Schulzweida@zmaw.de)
CONFIG_ABORT=yes
......
src/griddes_h5.c
View file @ aadd5e87
......@@ -89,7 +89,7 @@ void fill_gridvals(int xsize, int ysize, double *xvals, double *yvals)
xmax = 180;
ymin = -90;
ymax = 90;
/*
for ( ii = 0; ii < xsize/2; ++ii )
{
index2 = ysize/2*xsize + ii;
......@@ -99,7 +99,7 @@ void fill_gridvals(int xsize, int ysize, double *xvals, double *yvals)
break;
}
}
*/
for ( ii = xsize-1; ii > xsize/2; --ii )
{
index2 = ysize/2*xsize + ii;
......@@ -109,7 +109,7 @@ void fill_gridvals(int xsize, int ysize, double *xvals, double *yvals)
break;
}
}
/*
for ( jj = 0; jj < ysize; ++jj )
{
index2 = jj*xsize + xsize/2;
......@@ -117,9 +117,7 @@ void fill_gridvals(int xsize, int ysize, double *xvals, double *yvals)
index2 = jj*xsize + xsize/2-1;
if ( xvals[index2] < -180 || xvals[index2] > 360 ) xvals[index2] = 0;
}
printf("x %g %g\n", xmin, xmax);
*/
for ( jj = 0; jj < ysize/2; ++jj )
{
index2 = jj*xsize + xsize/2;
......@@ -140,8 +138,6 @@ void fill_gridvals(int xsize, int ysize, double *xvals, double *yvals)
}
}
printf("y %g %g\n", ymin, ymax);
for ( i = 0; i < xsize*ysize; ++i )
{
if ( xvals[i] > -180 && xvals[i] < 360 )
......@@ -157,9 +153,6 @@ void fill_gridvals(int xsize, int ysize, double *xvals, double *yvals)
}
}
printf("x %g %g\n", xmin, xmax);
printf("y %g %g\n", ymin, ymax);
for ( j = 0; j < ysize; ++j )
for ( i = 0; i < xsize; ++i )
{
......@@ -193,31 +186,33 @@ void fill_gridvals(int xsize, int ysize, double *xvals, double *yvals)
}
}
*/
/*
if ( i < xsize/2 )
for ( ii = i+1; ii < xsize/2; ++ii )
{
index2 = j*xsize + ii;
if ( xvals[index2] > -180 && xvals[index2] < 360 )
{
xvals[index] = (xmin*(ii-i) + xvals[index2]*(i))/ii;
/*
if ( i%10 )
printf("%d %d %d %g %g %g\n", i, ii, ii-i, xvals[index], xmin, xvals[index2]);
*/
break;
}
}
{
xvals[index] = xmin;
for ( ii = i+1; ii < xsize/2; ++ii )
{
index2 = j*xsize + ii;
if ( xvals[index2] > -180 && xvals[index2] < 360 )
{
xvals[index] = (xmin*(ii-i) + xvals[index2]*(i))/ii;
break;
}
}
}
else
for ( ii = i-1; ii >= xsize/2; --ii )
{
index2 = j*xsize + ii;
if ( xvals[index2] > -180 && xvals[index2] < 360 )
{
xvals[index] = xvals[index2];
xvals[index] = (xmax*(i-ii) + xvals[index2]*((xsize-1)-i))/(xsize-1-ii);
break;
}
}
{
for ( ii = i-1; ii >= xsize/2; --ii )
{
index2 = j*xsize + ii;
if ( xvals[index2] > -180 && xvals[index2] < 360 )
{
xvals[index] = (xmax*(i-ii) + xvals[index2]*((xsize-1)-i))/(xsize-1-ii);
break;
}
}
}
*/
}
if ( yvals[index] < -90 || yvals[index] > 90 )
......@@ -316,9 +311,9 @@ int gridFromH5file(const char *gridfile)
/* Close the dataset. */
status = H5Dclose(lon_id);
status = H5Dclose(lat_id);
/*
fill_gridvals(grid.xsize, grid.ysize, grid.xvals, grid.yvals);
*/
grid.type = GRID_CURVILINEAR;
grid.prec = DATATYPE_FLT32;
......
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

Imprint | Privacy Policy