Commit 1ba25a93 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Version 1.4.5.1 released

parent 43c2b095
......@@ -37,7 +37,7 @@ case "${HOSTNAME}" in
--with-zlib=/sw/etch-ia32/zlib-1.2.3 \
--with-szlib=$HOME/local/etch-ia32 \
LIBS=-ljpeg \
CC=gcc CFLAGS="-g -O2 -Wall -W -Wfloat-equal -pedantic" CFINT=-Df2cFortran
CC=gcc CFLAGS="-g -O2 -Wall -W -Wfloat-equal -pedantic"
;;
# sparc-sun-solaris2.8
xxf)
......
......@@ -99,13 +99,13 @@ cdiFortran.o: cdiFortran.c
source='$<' object='$@' libtool=no \
depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
$(CCDEPMODE) $(depcomp) \
$(COMPILE) $(CFINT) $(REAL4) -c `test -f '$<' || echo '$(srcdir)/'`$<
$(COMPILE) $(CFINT) -c `test -f '$<' || echo '$(srcdir)/'`$<
#
cdilib.c:
$(top_srcdir)/src/make_cdilib $(top_srcdir)/src
#
cdilib.o: cdilib.c
$(COMPILE) $(CFINT) $(REAL4) -c $<
$(COMPILE) $(CFINT) -c $<
#
all-local: $(LOCALTARGETS)
......
......@@ -678,13 +678,13 @@ cdiFortran.o: cdiFortran.c
source='$<' object='$@' libtool=no \
depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
$(CCDEPMODE) $(depcomp) \
$(COMPILE) $(CFINT) $(REAL4) -c `test -f '$<' || echo '$(srcdir)/'`$<
$(COMPILE) $(CFINT) -c `test -f '$<' || echo '$(srcdir)/'`$<
#
cdilib.c:
$(top_srcdir)/src/make_cdilib $(top_srcdir)/src
#
cdilib.o: cdilib.c
$(COMPILE) $(CFINT) $(REAL4) -c $<
$(COMPILE) $(CFINT) -c $<
#
all-local: $(LOCALTARGETS)
#
......
......@@ -3287,9 +3287,11 @@ int cdfReadVarSliceDP(int streamID, int varID, int levelID, double *data, int *n
{
if ( yid == dimids[ndims] && xid == dimids[ndims+1] && zid == dimids[ndims+2] )
swapyxz = TRUE;
if ( zid == dimids[ndims] && xid == dimids[ndims+1] && yid == dimids[ndims+2] )
swapxy = TRUE;
}
if ( swapyxz == FALSE && zid != UNDEFID && yid != UNDEFID )
if ( swapyxz == FALSE && swapxy == FALSE && zid != UNDEFID && yid != UNDEFID )
{
if ( zid == dimids[ndims] && yid == dimids[ndims+1] )
swapyz = FALSE;
......@@ -5190,13 +5192,13 @@ int cdfInqContents(int streamID)
if ( nxdims == 2 )
{
xdimid = xdimids[0];
ydimid = xdimids[1];
xdimid = xdimids[1];
ydimid = xdimids[0];
}
else if ( nydims == 2 )
{
xdimid = ydimids[0];
ydimid = ydimids[1];
xdimid = ydimids[1];
ydimid = ydimids[0];
}
else
{
......
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