changed remapnn test to remapdis

.gitattributes

@@ -691,12 +691,14 @@ test/data/ml2pl_ref -text
 test/data/n16_bic_ref -text
 test/data/n16_bil_ref -text
 test/data/n16_con_ref -text
+test/data/n16_dis_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_dis_ref -text
 test/data/n32_laf_ref -text
 test/data/n32_nn_ref -text
 test/data/n32_ycon_ref -text

ChangeLog

@@ -2,6 +2,10 @@
 
 	* Version 1.6.8 released
 
+2015-01-31  Uwe Schulzweida
+
+	* changed remapnn test to remapdis
+
 2015-01-30  Uwe Schulzweida
 
         * cdoGenFileSuffix: filter wildcard characters

test/Genweights.test.in

@@ -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 ycon"
-    if [ "$GRIDTYPE" = "unstructured" ]; then RMODS="nn con ycon"; fi
+    RMODS="bil bic dis con ycon"
+    if [ "$GRIDTYPE" = "unstructured" ]; then RMODS="dis con ycon"; fi
     for RMOD in $RMODS; do
       RSTAT=0
       OFILE=${GRID}_${RMOD}

test/Remap.test.in

@@ -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 ycon"
-    if [ "$GRIDTYPE" = "unstructured" ]; then RMODS="nn con ycon"; fi
+    RMODS="bil bic dis con ycon"
+    if [ "$GRIDTYPE" = "unstructured" ]; then RMODS="dis con ycon"; fi
     for RMOD in $RMODS; do
       RSTAT=0
       OFILE=${GRID}_${RMOD}

test/data/Makefile.am

@@ -7,8 +7,8 @@ NETCDF_REF   = netcdf_testfile01_sinfon_ref netcdf_testfile01_infon_ref netcdf_t
 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_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
+REMAP_REF    = n16_bic_ref n16_bil_ref n16_con_ref n16_ycon_ref n16_laf_ref n16_nn_ref n16_dis_ref \
+               n32_bic_ref n32_bil_ref n32_con_ref n32_ycon_ref n32_laf_ref n32_nn_ref n32_dis_ref
 SELECT_REF   = select1_ref select2_ref select3_ref select4_ref select5_ref
 DETREND_REF  = detrend_ref
 

test/data/gen_refdata.sh

@@ -93,7 +93,7 @@ $CDO sp2gpl $IFILE $OFILE
 cdo -f grb setrtomiss,0,10000  -gridboxmean,8,8 -topo bathy4.grb
 #
 GRIDS="n16 n32"
-RMODS="bil bic nn con laf"
+RMODS="bil bic dis nn con laf"
 IFILE=bathy4.grb
 for GRID in $GRIDS; do
   for RMOD in $RMODS; do