Change assertion failure to a error

This commit is contained in:
dmh 2014-07-23 11:25:49 -06:00
parent c47d2ab9b7
commit cd2574ba7c
4 changed files with 11 additions and 12 deletions

View File

@ -3,15 +3,12 @@ alias xx="cd ..;make; cd libdap2"
PARMS=""; ARGS=""; CON="" ; CE=""; OCON="" ; VAR=""; SHARP='#'
alias q0=;alias qq=;alias qv=;alias q=;alias qh=;alias qqh=;alias qall=;alias qv=;alias qo=;
#TOP="/home/dmh/mach/netcdf-c"
TOP="/cygdrive/f/git/netcdf-c"
TOP="/home/dmh/mach/netcdf-c"
#TOP="/cygdrive/f/git/netcdf-c"
F="http://www.monsoondata.org:9191/dods/foo"
#F="http://www.monsoondata.org:9191/dods/gfs"
F='http://carbon.dkrz.de/thredds/dodsC/cordex/output/EUR-11/KNMI/ICHEC-EC-EARTH/historical/r1i1p1/KNMI-RACMO22E/v1/day/tas/v20140313/tas_EUR-11_ICHEC-EC-EARTH_historical_r1i1p1_KNMI-RACMO22E_v1_day_19500101-19501231.nc'
#F="http://monsoondata.org:9090/dods/_expr_{gfs2/gfs.2014043000}{ave(t,lon=0,lon=360)}{0:0,-90:90,500:500,30apr2014:30apr2014}"
#VAR=SPEED
VAR=rlon
#PROG=./ncd
PROG="$TOP/ncdump/ncdump"

View File

@ -107,7 +107,7 @@ XFAILTESTS="ref_const_test $XFAILTESTS"
# Fails because ?
XFAILTESTS="ref_tst_chardata $XFAILTESTS"
# Fails because ncdump is crashing
XFAILTESTS="ref_tst_econst $XFAILTESTS"
#XFAILTESTS="ref_tst_econst $XFAILTESTS"
# Following are generally not run
# Because of the size of their output

View File

@ -1,12 +1,12 @@
# test: ../ncdump/cdl4/ref_const_test.cdl
# test: ../ncdump/cdl4/ref_tst_chardata.cdl
K="-k3"
F="test.cdl"
F="mrd.cdl"
#B="-B12"
DBG="-d"
#DBG="-D2"
#NCGEN="./.libs/ncgen"
NCGEN="./ncgen"
NCGEN="./.libs/ncgen"
#NCGEN="./ncgen"
alias q0="$NCGEN ${DBG} $K -lb $B $F"
alias qh="$NCGEN ${DBG} $K -lb $B -h $F"
alias qc="$NCGEN ${DBG} $K -lc $B $F"

View File

@ -1017,7 +1017,9 @@ thisunlim->name,
/*!lastunlim => data is list of sublists, recurse on each sublist*/
for(i=0;i<data->length;i++) {
NCConstant* con = data->data+i;
ASSERT(con->nctype == NC_COMPOUND);
if(con->nctype != NC_COMPOUND) {
semerror(con->lineno,"UNLIMITED dimension (other than first) must be enclosed in {}");
}
computeunlimitedsizes(dimset,nextunlim,con->value.compoundv,ischar);
}
} else { /* lastunlim */