Replace psl_DJF_anom.srv by psl_DJF_anom.grb.

test/EOF.test.in

@@ -11,10 +11,10 @@ export CDO_WEIGHT_MODE=off
 #
 CDOOUT=cout$$
 CDOERR=cerr$$
-FORMAT=""
+FORMAT="-f srv -b 32"
 NTEST=1
 ######################################################
-IFILE=$DATAPATH/psl_DJF_anom.srv
+IFILE=$DATAPATH/psl_DJF_anom.grb
 RFILE1=$DATAPATH/eval_ref
 RFILE2=$DATAPATH/eof_ref
 RFILE3=$DATAPATH/pcoeff00000
@@ -56,7 +56,7 @@ for MODE in jacobi danielson_lanczos; do
   test $RSTAT -eq 0 || echo "not ok $NTEST - $CDOTEST"
 #
   let NTEST+=1
-  rm -f $OFILE1 $OFILE2 $OFILE3
+  rm -f $OFILE1 $OFILE2 ${OFILE3}00000
 done
 #
 rm -f $CDOOUT $CDOERR

test/data/Makefile.am

 INPUTDATA = ts_mm_5years ts_6h_1mon ts_1d_1year hl_l19.grb t21_geosp_tsurf.grb bathy4.grb pl_data pl_data.grb detrend_data \
             grib_testfile01.grb grib_testfile02.grb grib_testfile03.grb netcdf_testfile01.nc netcdf_testfile02.nc testfile01c.nc \
-            datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.srv
+            datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.grb
 
 FILE_REF     = file_F32_srv_ref
 GRIB_REF     = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_sinfo_ref grib_testfile02_info_ref grib_testfile03_sinfo_ref grib_testfile03_info_ref

test/data/Makefile.in

@@ -287,7 +287,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 INPUTDATA = ts_mm_5years ts_6h_1mon ts_1d_1year hl_l19.grb t21_geosp_tsurf.grb bathy4.grb pl_data pl_data.grb detrend_data \
             grib_testfile01.grb grib_testfile02.grb grib_testfile03.grb netcdf_testfile01.nc netcdf_testfile02.nc testfile01c.nc \
-            datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.srv
+            datar.nc datac.nc datau.nc datag.nc arith1.srv expr1.srv arithmask.srv psl_DJF_anom.grb
 
 FILE_REF = file_F32_srv_ref
 GRIB_REF = grib_testfile01_sinfo_ref grib_testfile01_info_ref grib_testfile02_sinfo_ref grib_testfile02_info_ref grib_testfile03_sinfo_ref grib_testfile03_info_ref

test/data/gen_refdata.sh

@@ -12,9 +12,9 @@ export CDO_FILE_SUFFIX=NULL
 #export CDO_SVD_MODE=danielson_lanczos
 export CDO_WEIGHT_MODE=off
 #
-IFILE=psl_DJF_anom.srv
-cdo eof,1 $IFILE eval_ref eof_ref
-cdo eofcoeff eof_ref $IFILE pcoeff
+IFILE=psl_DJF_anom.grb
+cdo $FORMAT eof,1 $IFILE eval_ref eof_ref
+cdo $FORMAT eofcoeff eof_ref $IFILE pcoeff
 exit
 ########################################################################
 #