Commit 10ea2dbc authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

fixed Remapgrid test

parent dc4e7b36
......@@ -31,26 +31,26 @@ function remapfunc()
{
RSTAT=0
REMAP=${1}
SRCGRID=`echo ${2} | sed -e "s|file:|${REFDATAPATH}/|"`
TGTGRID=`echo ${3} | sed -e "s|file:|${REFDATAPATH}/|"`
REMAP=${2}
SRCGRID=`echo ${3} | sed -e "s|file:|${REFDATAPATH}/|"`
TGTGRID=`echo ${4} | sed -e "s|file:|${REFDATAPATH}/|"`
REMAP_EXTRAPOLATE=off
SRCGRIDNAME=`echo ${2} | sed -e "s/file://"`
TGTGRIDNAME=`echo ${3} | sed -e "s/file://"`
CDOTEST="remap${REMAP:5} ${SRCGRIDNAME} to ${TGTGRIDNAME}"
SRCGRIDNAME=`echo ${3} | sed -e "s/file://"`
TGTGRIDNAME=`echo ${4} | sed -e "s/file://"`
CDOTEST="remap${2} ${SRCGRIDNAME} to ${TGTGRIDNAME}"
ABSLIM=$ABSLIMMAX
if [ $REMAP = remaplaf ]; then ABSLIM=$ABSLIMLAF; fi
if [ $REMAP = laf ]; then ABSLIM=$ABSLIMLAF; fi
RELLIM=$RELLIMMAX
if [ $REMAP = remaplaf ]; then RELLIM=$RELLIMLAF; fi
if [ $REMAP = laf ]; then RELLIM=$RELLIMLAF; fi
if [ "${HAS_NETCDF}" = yes ] ; then
OFILE=temp_${REMAP:5}_${SRCGRIDNAME}_to_${TGTGRIDNAME}$$
RFILE=$REFDATAPATH/temp_${REMAP:5}_${SRCGRIDNAME}_to_${TGTGRIDNAME}_ref
OFILE=temp_${2}_${SRCGRIDNAME}_to_${TGTGRIDNAME}$$
RFILE=$REFDATAPATH/temp_${2}_${SRCGRIDNAME}_to_${TGTGRIDNAME}_ref
CDOCOMMAND="$CDO $FORMAT ${REMAP},${TGTGRID} -temp,${SRCGRID} ${OFILE}"
CDOCOMMAND="$CDO $FORMAT $1${REMAP},${TGTGRID} -temp,${SRCGRID} ${OFILE}"
echo "Running test: $NTEST"
echo "$CDOCOMMAND"
......@@ -82,18 +82,19 @@ function remapfunc()
#################################################
# small remap tests
#
STATS="remapdis remapnn remapbil remapbic remapcon remapcon2 remapscon remaplaf"
OPERTYPES="remap"
STATS="dis nn bil bic con con2 scon laf"
#
for REMAP in $STATS; do
remapfunc $REMAP global_2 global_5
remapfunc $OPERTYPES $REMAP global_2 global_5
done
#
for REMAP in $STATS; do
remapfunc $REMAP global_5 global_2
remapfunc $OPERTYPES $REMAP global_5 global_2
done
#
for REMAP in $STATS; do
remapfunc $REMAP global_5 global_5
remapfunc $OPERTYPES $REMAP global_5 global_5
done
#
#################################################
......@@ -104,49 +105,48 @@ REFDATAPATH=$CDOTESTDATA/$REMAPGRIDDIR
#
if [ -d "$CDOTESTDATA/$REMAPGRIDDIR" ]; then
#
STATS="remapdis remapnn remapbil remapbic remapcon remapcon2 remapscon remaplaf"
for REMAP in remapdis remapnn remapcon remapscon remaplaf; do
remapfunc $REMAP file:R2B4.nc global_2
for REMAP in dis nn con scon laf; do
remapfunc $OPERTYPES $REMAP file:R2B4.nc global_2
done
#
for REMAP in $STATS; do
remapfunc $REMAP global_0.5 global_2
remapfunc $OPERTYPES $REMAP global_0.5 global_2
done
#
for REMAP in $STATS; do
remapfunc $REMAP global_2 global_2
remapfunc $OPERTYPES $REMAP global_2 global_2
done
#
for REMAP in $STATS; do
remapfunc $REMAP global_2 global_0.5
remapfunc $OPERTYPES $REMAP global_2 global_0.5
done
#
for REMAP in $STATS; do
remapfunc $REMAP global_2 file:R2B6.nc
remapfunc $OPERTYPES $REMAP global_2 file:R2B6.nc
done
#
for REMAP in $STATS; do
remapfunc $REMAP global_1 file:R2B6.nc
remapfunc $OPERTYPES $REMAP global_1 file:R2B6.nc
done
#
for REMAP in remapdis remapnn remapcon remapscon remaplaf; do
remapfunc $REMAP file:R2B6.nc global_1
for REMAP in dis nn con scon laf; do
remapfunc $OPERTYPES $REMAP file:R2B6.nc global_1
done
#
for REMAP in remapdis remapnn remapcon remaplaf; do
remapfunc $REMAP file:R2B6.nc file:R2B6.nc
for REMAP in dis nn con laf; do
remapfunc $OPERTYPES $REMAP file:R2B6.nc file:R2B6.nc
done
#
for REMAP in remapdis remapnn remapcon remaplaf; do
remapfunc $REMAP file:R2B4.nc file:R2B6.nc
for REMAP in dis nn con laf; do
remapfunc $OPERTYPES $REMAP file:R2B4.nc file:R2B6.nc
done
#
for REMAP in remapdis remapnn remapcon remaplaf; do
remapfunc $REMAP file:R2B6.nc file:R2B4.nc
remapfunc $OPERTYPES $REMAP file:R2B6.nc file:R2B4.nc
done
#
for REMAP in $STATS; do
remapfunc $REMAP file:TP10s.nc global_2
remapfunc $OPERTYPES $REMAP file:TP10s.nc global_2
done
#
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment