test/Remap.test.in: added test for remapycon

.gitattributes

@@ -650,11 +650,13 @@ test/data/n16_bil_ref -text
 test/data/n16_con_ref -text
 test/data/n16_laf_ref -text
 test/data/n16_nn_ref -text
+test/data/n16_ycon_ref -text
 test/data/n32_bic_ref -text
 test/data/n32_bil_ref -text
 test/data/n32_con_ref -text
 test/data/n32_laf_ref -text
 test/data/n32_nn_ref -text
+test/data/n32_ycon_ref -text
 test/data/pl_data.grb -text
 test/data/select1_ref -text
 test/data/select2_ref -text

test/Remap.test.in

 #! @SHELL@
-echo 1..20 # Number of tests to be executed.
+echo 1..26 # Number of tests to be executed.
 #
 test -n "$CDO"      || CDO=cdo
 test -n "$DATAPATH" || DATAPATH=./data
@@ -18,8 +18,8 @@ for GRIDTYPE in "regular" "curvilinear" "unstructured"; do
   if [ "$GRIDTYPE" != "regular" ]; then SETGRID="-setgridtype,$GRIDTYPE"; fi
   for GRID in $GRIDS; do
 # remaplaf: sort could give different results"
-    RMODS="bil bic nn con"
-    if [ "$GRIDTYPE" = "unstructured" ]; then RMODS="nn con"; fi
+    RMODS="bil bic nn con ycon"
+    if [ "$GRIDTYPE" = "unstructured" ]; then RMODS="nn con ycon"; fi
     for RMOD in $RMODS; do
       RSTAT=0
       OFILE=${GRID}_${RMOD}

test/data/Makefile.am

@@ -3,7 +3,8 @@ INPUTDATA = ts_mm_5years hl_l19.grb t21_geosp_tsurf.grb bathy4.grb pl_data.grb
 TIMSTAT_REF  = timmin_ref timmax_ref timsum_ref timavg_ref timmean_ref timstd_ref timstd1_ref timvar_ref timvar1_ref
 SPECTRAL_REF = sp2gp_ref sp2gpl_ref gp2sp_ref gp2spl_ref
 VERTINT_REF  = ml2pl_ref
-REMAP_REF    = n16_bic_ref n16_bil_ref n16_con_ref n16_laf_ref n16_nn_ref  n32_bic_ref n32_bil_ref n32_con_ref n32_laf_ref n32_nn_ref
+REMAP_REF    = n16_bic_ref n16_bil_ref n16_con_ref n16_ycon_ref n16_laf_ref n16_nn_ref \
+               n32_bic_ref n32_bil_ref n32_con_ref n32_ycon_ref n32_laf_ref n32_nn_ref
 SELECT_REF   = select1_ref select2_ref select3_ref select4_ref select5_ref
 
 EXTRA_DIST = $(INPUTDATA) $(TIMSTAT_REF) $(SPECTRAL_REF) $(VERTINT_REF) $(REMAP_REF) $(SELECT_REF)

test/data/Makefile.in

@@ -285,7 +285,9 @@ INPUTDATA = ts_mm_5years hl_l19.grb t21_geosp_tsurf.grb bathy4.grb pl_data.grb
 TIMSTAT_REF = timmin_ref timmax_ref timsum_ref timavg_ref timmean_ref timstd_ref timstd1_ref timvar_ref timvar1_ref
 SPECTRAL_REF = sp2gp_ref sp2gpl_ref gp2sp_ref gp2spl_ref
 VERTINT_REF = ml2pl_ref
-REMAP_REF = n16_bic_ref n16_bil_ref n16_con_ref n16_laf_ref n16_nn_ref  n32_bic_ref n32_bil_ref n32_con_ref n32_laf_ref n32_nn_ref
+REMAP_REF = n16_bic_ref n16_bil_ref n16_con_ref n16_ycon_ref n16_laf_ref n16_nn_ref \
+               n32_bic_ref n32_bil_ref n32_con_ref n32_ycon_ref n32_laf_ref n32_nn_ref
+
 SELECT_REF = select1_ref select2_ref select3_ref select4_ref select5_ref
 EXTRA_DIST = $(INPUTDATA) $(TIMSTAT_REF) $(SPECTRAL_REF) $(VERTINT_REF) $(REMAP_REF) $(SELECT_REF)
 all: all-am