test/data: sinfo update.

test/data/gen_refdata.sh

@@ -5,6 +5,32 @@ CDO=cdo
 FORMAT="-f srv -b F32"
 ########################################################################
 #
+# Test GRIB files
+#
+IFILES="testfile01 testfile02 testfile03"
+for FILE in $IFILES; do
+  IFILE=grib_${FILE}.grb
+  OFILE=grib_${FILE}_sinfo_ref
+  $CDO sinfo $IFILE > $OFILE
+  OFILE=grib_${FILE}_info_ref
+  $CDO info $IFILE > $OFILE
+done
+#
+########################################################################
+#
+# Test netCDF files
+#
+IFILES="testfile01 testfile02"
+for FILE in $IFILES; do
+  IFILE=netcdf_${FILE}.nc
+  OFILE=netcdf_${FILE}_sinfon_ref
+  $CDO sinfon $IFILE > $OFILE
+  OFILE=netcdf_${FILE}_infon_ref
+  $CDO infon $IFILE > $OFILE
+done
+exit
+########################################################################
+#
 # Mergetime
 #
 $CDO $FORMAT settaxis,2001-01-01,,1year -const,1,r1x1 mergetime_y1
@@ -18,7 +44,7 @@ exit
 # Timstat Yearstat Monstat Daystat Runstat
 #
 IFILE=$HOME/data/cdt/cera/EH5_AMIP_1_TSURF_6H_1991-1995.grb
-OFILE=ts_6h_5years
+ OFILE=ts_6h_5years
 $CDO $FORMAT remapnn,lon=55_lat=10 $IFILE $OFILE
 #
 IFILE=$OFILE
@@ -234,32 +260,6 @@ $CDO $FORMAT cdiwrite,1,global_10,3,3,3 file_F32_srv_ref
 #
 ########################################################################
 #
-# Test GRIB files
-#
-IFILES="testfile01 testfile02"
-for FILE in $IFILES; do
-  IFILE=grib_${FILE}.grb
-  OFILE=grib_${FILE}_sinfon_ref
-  $CDO sinfo $IFILE > $OFILE
-  OFILE=grib_${FILE}_infon_ref
-  $CDO info $IFILE > $OFILE
-done
-#
-########################################################################
-#
-# Test netCDF files
-#
-IFILES="testfile01 testfile02"
-for FILE in $IFILES; do
-  IFILE=netcdf_${FILE}.nc
-  OFILE=netcdf_${FILE}_sinfon_ref
-  $CDO sinfon $IFILE > $OFILE
-  OFILE=netcdf_${FILE}_infon_ref
-  $CDO infon $IFILE > $OFILE
-done
-exit
-########################################################################
-#
 # Vertint
 #
 IFILE=ECHAM5_T21L19monavg.grb

test/data/grib_testfile01_sinfo_ref

    File format : GRIB
-    -1 : Institut Source   Steptype Levels Num    Points Num Dtype : Parameter ID
-     1 : unknown  unknown  instant       1   1      2592   1  P16  : 1             
+    -1 : Institut Source   T Steptype Levels Num    Points Num Dtype : Parameter ID
+     1 : unknown  unknown  v instant       1   1      2592   1  P16  : 1             
    Grid coordinates :
      1 : lonlat                   : points=2592 (72x36)
                               lon : -177.5 to 177.5 by 5 degrees_east  circular

test/data/grib_testfile02_sinfo_ref

    File format : GRIB
-    -1 : Institut Source   Steptype Levels Num    Points Num Dtype : Parameter ID
-     1 : unknown  unknown  instant       1   1         1   1  P0   : 1             
+    -1 : Institut Source   T Steptype Levels Num    Points Num Dtype : Parameter ID
+     1 : unknown  unknown  v instant       1   1         1   1  P0   : 1             
    Grid coordinates :
      1 : lonlat                   : points=1 (1x1)
                               lon : 0 degrees_east

test/data/grib_testfile03_sinfo_ref

    File format : GRIB
-    -1 : Institut Source   Steptype Levels Num    Points Num Dtype : Parameter ID
-     1 : ECMWF    unknown  instant       1   1     35718   1  P16  : 151.128       
+    -1 : Institut Source   T Steptype Levels Num    Points Num Dtype : Parameter ID
+     1 : ECMWF    unknown  v instant       1   1     35718   1  P16  : 151.128       
    Grid coordinates :
      1 : gaussian reduced         : points=35718  nlat=160  np=80
                               lat : 89.14152 to -89.14152 degrees_north

test/data/netcdf_testfile01_sinfon_ref

    File format : NetCDF
-    -1 : Institut Source   Steptype Levels Num    Points Num Dtype : Parameter name
-     1 : unknown  unknown  instant       1   1      2592   1  I16  : tem           
+    -1 : Institut Source   T Steptype Levels Num    Points Num Dtype : Parameter name
+     1 : unknown  unknown  v instant       1   1      2592   1  I16  : tem           
    Grid coordinates :
      1 : lonlat                   : points=2592 (72x36)
                               lon : -177.5 to 177.5 by 5 degrees_east  circular

test/data/netcdf_testfile02_sinfon_ref

    File format : NetCDF
-    -1 : Institut Source   Steptype Levels Num    Points Num Dtype : Parameter name
-     1 : unknown  unknown  instant       1   1         1   1  F32  : for           
+    -1 : Institut Source   T Steptype Levels Num    Points Num Dtype : Parameter name
+     1 : unknown  unknown  v instant       1   1         1   1  F32  : for           
    Grid coordinates :
      1 : lonlat                   : points=1 (1x1)
                               lon : 0 degrees_east